author | Lars Hjemli <hjemli@gmail.com> | 2007-12-10 20:47:29 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-12-11 01:43:24 (UTC) |
commit | 620bb3e5e4ff87da740fe7232ba74330b5f862d4 (patch) (unidiff) | |
tree | 152cc090cfc56c387393f6aa6666b9d87ad4a23a /ui-patch.c | |
parent | afcdd083dab81afef744e261d81a452698188c30 (diff) | |
download | cgit-620bb3e5e4ff87da740fe7232ba74330b5f862d4.zip cgit-620bb3e5e4ff87da740fe7232ba74330b5f862d4.tar.gz cgit-620bb3e5e4ff87da740fe7232ba74330b5f862d4.tar.bz2 |
Add plain patch view
The new view mimics the output from `git format-patch`, making it possible
to cherry-pick directly from cgit with something like `curl $url | git am`.
Inspired by a patch to `git-apply` by Mike Hommey:
http://thread.gmane.org/gmane.comp.version-control.git/67611/focus=67610
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-patch.c | 105 |
1 files changed, 105 insertions, 0 deletions
diff --git a/ui-patch.c b/ui-patch.c new file mode 100644 index 0000000..ef79c7c --- a/dev/null +++ b/ui-patch.c | |||
@@ -0,0 +1,105 @@ | |||
1 | /* ui-patch.c: generate patch view | ||
2 | * | ||
3 | * Copyright (C) 2007 Lars Hjemli | ||
4 | * | ||
5 | * Licensed under GNU General Public License v2 | ||
6 | * (see COPYING for full license text) | ||
7 | */ | ||
8 | |||
9 | #include "cgit.h" | ||
10 | |||
11 | static void print_line(char *line, int len) | ||
12 | { | ||
13 | char c = line[len-1]; | ||
14 | |||
15 | line[len-1] = '\0'; | ||
16 | htmlf("%s\n", line); | ||
17 | line[len-1] = c; | ||
18 | } | ||
19 | |||
20 | static void header(unsigned char *sha1, char *path1, int mode1, | ||
21 | unsigned char *sha2, char *path2, int mode2) | ||
22 | { | ||
23 | char *abbrev1, *abbrev2; | ||
24 | int subproject; | ||
25 | |||
26 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); | ||
27 | htmlf("diff --git a/%s b/%s\n", path1, path2); | ||
28 | |||
29 | if (is_null_sha1(sha1)) | ||
30 | path1 = "dev/null"; | ||
31 | if (is_null_sha1(sha2)) | ||
32 | path2 = "dev/null"; | ||
33 | |||
34 | if (mode1 == 0) | ||
35 | htmlf("new file mode %.6o\n", mode2); | ||
36 | |||
37 | if (mode2 == 0) | ||
38 | htmlf("deleted file mode %.6o\n", mode1); | ||
39 | |||
40 | if (!subproject) { | ||
41 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); | ||
42 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); | ||
43 | htmlf("index %s..%s", abbrev1, abbrev2); | ||
44 | free(abbrev1); | ||
45 | free(abbrev2); | ||
46 | if (mode1 != 0 && mode2 != 0) { | ||
47 | htmlf(" %.6o", mode1); | ||
48 | if (mode2 != mode1) | ||
49 | htmlf("..%.6o", mode2); | ||
50 | } | ||
51 | htmlf("\n--- a/%s\n", path1); | ||
52 | htmlf("+++ b/%s\n", path2); | ||
53 | } | ||
54 | } | ||
55 | |||
56 | static void filepair_cb(struct diff_filepair *pair) | ||
57 | { | ||
58 | header(pair->one->sha1, pair->one->path, pair->one->mode, | ||
59 | pair->two->sha1, pair->two->path, pair->two->mode); | ||
60 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { | ||
61 | if (S_ISGITLINK(pair->one->mode)) | ||
62 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); | ||
63 | if (S_ISGITLINK(pair->two->mode)) | ||
64 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); | ||
65 | return; | ||
66 | } | ||
67 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) | ||
68 | html("Error running diff"); | ||
69 | } | ||
70 | |||
71 | void cgit_print_patch(char *hex, struct cacheitem *item) | ||
72 | { | ||
73 | struct commit *commit; | ||
74 | struct commitinfo *info; | ||
75 | unsigned char sha1[20], old_sha1[20]; | ||
76 | char *patchname; | ||
77 | |||
78 | if (!hex) | ||
79 | hex = cgit_query_head; | ||
80 | |||
81 | if (get_sha1(hex, sha1)) { | ||
82 | cgit_print_error(fmt("Bad object id: %s", hex)); | ||
83 | return; | ||
84 | } | ||
85 | commit = lookup_commit_reference(sha1); | ||
86 | if (!commit) { | ||
87 | cgit_print_error(fmt("Bad commit reference: %s", hex)); | ||
88 | return; | ||
89 | } | ||
90 | info = cgit_parse_commit(commit); | ||
91 | hashcpy(old_sha1, commit->parents->item->object.sha1); | ||
92 | |||
93 | patchname = fmt("%s.patch", sha1_to_hex(sha1)); | ||
94 | cgit_print_snapshot_start("text/plain", patchname, item); | ||
95 | htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); | ||
96 | htmlf("From: %s%s\n", info->author, info->author_email); | ||
97 | html("Date: "); | ||
98 | cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n"); | ||
99 | htmlf("Subject: %s\n\n%s", info->subject, info->msg); | ||
100 | html("---\n"); | ||
101 | cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL); | ||
102 | html("--\n"); | ||
103 | htmlf("cgit %s\n", CGIT_VERSION); | ||
104 | cgit_free_commitinfo(info); | ||
105 | } | ||