* [PATCH v2 1/2] ui-diff: Use diff_tree_sha1() for raw diff formatting
@ 2013-08-27 8:40 cgit
2013-08-27 8:40 ` [PATCH v2 2/2] ui-shared: Drop filepair_cb_raw() and helper cgit
2013-09-14 10:17 ` [PATCH v2 1/2] ui-diff: Use diff_tree_sha1() for raw diff formatting cgit
0 siblings, 2 replies; 4+ messages in thread
From: cgit @ 2013-08-27 8:40 UTC (permalink / raw)
Use Git's internal diff_tree_sha1() function for the /rawdiff/ command
instead of trying to recreate this functionality.
Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
---
ui-diff.c | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/ui-diff.c b/ui-diff.c
index 1209c47..7395c45 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -361,6 +361,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
const char *prefix, int show_ctrls, int raw)
{
struct commit *commit, *commit2;
+ const unsigned char *old_tree_sha1, *new_tree_sha1;
if (!new_rev)
new_rev = ctx.qry.head;
@@ -373,6 +374,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
cgit_print_error("Bad commit: %s", sha1_to_hex(new_rev_sha1));
return;
}
+ new_tree_sha1 = commit->tree->object.sha1;
if (old_rev) {
if (get_sha1(old_rev, old_rev_sha1)) {
@@ -391,13 +393,30 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
cgit_print_error("Bad commit: %s", sha1_to_hex(old_rev_sha1));
return;
}
+ old_tree_sha1 = commit2->tree->object.sha1;
+ } else {
+ old_tree_sha1 = NULL;
}
if (raw) {
+ struct diff_options diffopt;
+
+ diff_setup(&diffopt);
+ diffopt.output_format = DIFF_FORMAT_PATCH;
+ DIFF_OPT_SET(&diffopt, RECURSIVE);
+ diff_setup_done(&diffopt);
+
ctx.page.mimetype = "text/plain";
cgit_print_http_headers(&ctx);
- cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb_raw,
- prefix, 0);
+ if (old_tree_sha1) {
+ diff_tree_sha1(old_tree_sha1, new_tree_sha1, "",
+ &diffopt);
+ } else {
+ diff_root_tree_sha1(new_tree_sha1, "", &diffopt);
+ }
+ diffcore_std(&diffopt);
+ diff_flush(&diffopt);
+
return;
}
--
1.8.4.rc3.500.gc3113b0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] ui-shared: Drop filepair_cb_raw() and helper
2013-08-27 8:40 [PATCH v2 1/2] ui-diff: Use diff_tree_sha1() for raw diff formatting cgit
@ 2013-08-27 8:40 ` cgit
2013-09-14 17:32 ` Jason
2013-09-14 10:17 ` [PATCH v2 1/2] ui-diff: Use diff_tree_sha1() for raw diff formatting cgit
1 sibling, 1 reply; 4+ messages in thread
From: cgit @ 2013-08-27 8:40 UTC (permalink / raw)
Remove filepair_cb_raw() and all related functions. These are no longer
needed. We now use Git's internal functions for raw diff formatting
everywhere.
Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
---
ui-shared.c | 72 -------------------------------------------------------------
ui-shared.h | 1 -
2 files changed, 73 deletions(-)
diff --git a/ui-shared.c b/ui-shared.c
index 1e19421..7ab2ab1 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -950,75 +950,3 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
}
strbuf_release(&filename);
}
-
-static void print_line_raw(char *line, int len)
-{
- char c = line[len-1];
-
- line[len-1] = '\0';
- htmlf("%s\n", line);
- line[len-1] = c;
-}
-
-static void header_raw(unsigned char *sha1, char *path1, int mode1,
- unsigned char *sha2, char *path2, int mode2)
-{
- char *abbrev1, *abbrev2;
- int subproject;
-
- subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
- htmlf("diff --git a/%s b/%s\n", path1, path2);
-
- if (mode1 == 0)
- htmlf("new file mode %.6o\n", mode2);
-
- if (mode2 == 0)
- htmlf("deleted file mode %.6o\n", mode1);
-
- if (!subproject) {
- abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
- abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
- htmlf("index %s..%s", abbrev1, abbrev2);
- free(abbrev1);
- free(abbrev2);
- if (mode1 != 0 && mode2 != 0) {
- htmlf(" %.6o", mode1);
- if (mode2 != mode1)
- htmlf("..%.6o", mode2);
- }
-
- if (is_null_sha1(sha1)) {
- path1 = "dev/null";
- htmlf("\n--- /%s\n", path1);
- } else
- htmlf("\n--- a/%s\n", path1);
-
- if (is_null_sha1(sha2)) {
- path2 = "dev/null";
- htmlf("+++ /%s\n", path2);
- } else
- htmlf("+++ b/%s\n", path2);
- }
-}
-
-void filepair_cb_raw(struct diff_filepair *pair)
-{
- unsigned long old_size = 0;
- unsigned long new_size = 0;
- int binary = 0;
-
- header_raw(pair->one->sha1, pair->one->path, pair->one->mode,
- pair->two->sha1, pair->two->path, pair->two->mode);
- if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
- if (S_ISGITLINK(pair->one->mode))
- print_line_raw(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
- if (S_ISGITLINK(pair->two->mode))
- print_line_raw(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
- return;
- }
- if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
- &new_size, &binary, 0, 0, print_line_raw))
- html("Error running diff");
- if (binary)
- html("Binary files differ\n");
-}
diff --git a/ui-shared.h b/ui-shared.h
index a337dce..5987e77 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -67,5 +67,4 @@ extern void cgit_print_snapshot_links(const char *repo, const char *head,
const char *hex, int snapshots);
extern void cgit_add_hidden_formfields(int incl_head, int incl_search,
const char *page);
-extern void filepair_cb_raw(struct diff_filepair *pair);
#endif /* UI_SHARED_H */
--
1.8.4.rc3.500.gc3113b0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 1/2] ui-diff: Use diff_tree_sha1() for raw diff formatting
2013-08-27 8:40 [PATCH v2 1/2] ui-diff: Use diff_tree_sha1() for raw diff formatting cgit
2013-08-27 8:40 ` [PATCH v2 2/2] ui-shared: Drop filepair_cb_raw() and helper cgit
@ 2013-09-14 10:17 ` cgit
1 sibling, 0 replies; 4+ messages in thread
From: cgit @ 2013-09-14 10:17 UTC (permalink / raw)
On Tue, Aug 27, 2013 at 10:40:50AM +0200, Lukas Fleischer wrote:
> Use Git's internal diff_tree_sha1() function for the /rawdiff/ command
> instead of trying to recreate this functionality.
>
> Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
> ---
> ui-diff.c | 23 +++++++++++++++++++++--
> 1 file changed, 21 insertions(+), 2 deletions(-)
>
Any comments on this series?
> [...]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] ui-shared: Drop filepair_cb_raw() and helper
2013-08-27 8:40 ` [PATCH v2 2/2] ui-shared: Drop filepair_cb_raw() and helper cgit
@ 2013-09-14 17:32 ` Jason
0 siblings, 0 replies; 4+ messages in thread
From: Jason @ 2013-09-14 17:32 UTC (permalink / raw)
Excellent. Merged this series to wip.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-09-14 17:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-27 8:40 [PATCH v2 1/2] ui-diff: Use diff_tree_sha1() for raw diff formatting cgit
2013-08-27 8:40 ` [PATCH v2 2/2] ui-shared: Drop filepair_cb_raw() and helper cgit
2013-09-14 17:32 ` Jason
2013-09-14 10:17 ` [PATCH v2 1/2] ui-diff: Use diff_tree_sha1() for raw diff formatting cgit
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).