author | Johan Herland <johan@herland.net> | 2010-06-09 23:09:33 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 08:40:23 (UTC) |
commit | eac1b675414722ae90df75abc727b2795bc096f0 (patch) (unidiff) | |
tree | 4deb6c0ac103ab2f42750d6c7230d45366eb1732 | |
parent | ab42741c49d369e41c1e1915c6c024d79509f7d6 (diff) | |
download | cgit-eac1b675414722ae90df75abc727b2795bc096f0.zip cgit-eac1b675414722ae90df75abc727b2795bc096f0.tar.gz cgit-eac1b675414722ae90df75abc727b2795bc096f0.tar.bz2 |
ui-patch: Apply path limit to generated patch
Also indicate in the comment section of the patch that a path limit was
applied, too easily see when a generated patch is only partial.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cmd.c | 2 | ||||
-rw-r--r-- | ui-commit.c | 2 | ||||
-rw-r--r-- | ui-patch.c | 6 | ||||
-rw-r--r-- | ui-patch.h | 2 | ||||
-rw-r--r-- | ui-shared.c | 4 | ||||
-rw-r--r-- | ui-shared.h | 2 |
6 files changed, 10 insertions, 8 deletions
@@ -92,3 +92,3 @@ static void patch_fn(struct cgit_context *ctx) | |||
92 | { | 92 | { |
93 | cgit_print_patch(ctx->qry.sha1); | 93 | cgit_print_patch(ctx->qry.sha1, ctx->qry.path); |
94 | } | 94 | } |
diff --git a/ui-commit.c b/ui-commit.c index 2f4c6d4..b3a2063 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -62,3 +62,3 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
62 | html(" ("); | 62 | html(" ("); |
63 | cgit_patch_link("patch", NULL, NULL, NULL, tmp); | 63 | cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix); |
64 | html(") ("); | 64 | html(") ("); |
@@ -79,3 +79,3 @@ static void filepair_cb(struct diff_filepair *pair) | |||
79 | 79 | ||
80 | void cgit_print_patch(char *hex) | 80 | void cgit_print_patch(char *hex, const char *prefix) |
81 | { | 81 | { |
@@ -124,3 +124,5 @@ void cgit_print_patch(char *hex) | |||
124 | html("---\n"); | 124 | html("---\n"); |
125 | cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL); | 125 | if (prefix) |
126 | htmlf("(limited to '%s')\n\n", prefix); | ||
127 | cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix); | ||
126 | html("--\n"); | 128 | html("--\n"); |
@@ -3,3 +3,3 @@ | |||
3 | 3 | ||
4 | extern void cgit_print_patch(char *hex); | 4 | extern void cgit_print_patch(char *hex, const char *prefix); |
5 | 5 | ||
diff --git a/ui-shared.c b/ui-shared.c index 4fa506f..d5c4c10 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -390,5 +390,5 @@ void cgit_diff_link(const char *name, const char *title, const char *class, | |||
390 | void cgit_patch_link(const char *name, const char *title, const char *class, | 390 | void cgit_patch_link(const char *name, const char *title, const char *class, |
391 | const char *head, const char *rev) | 391 | const char *head, const char *rev, const char *path) |
392 | { | 392 | { |
393 | reporevlink("patch", name, title, class, head, rev, NULL); | 393 | reporevlink("patch", name, title, class, head, rev, path); |
394 | } | 394 | } |
diff --git a/ui-shared.h b/ui-shared.h index 3df5464..c0e5c55 100644 --- a/ui-shared.h +++ b/ui-shared.h | |||
@@ -34,3 +34,3 @@ extern void cgit_patch_link(const char *name, const char *title, | |||
34 | const char *class, const char *head, | 34 | const char *class, const char *head, |
35 | const char *rev); | 35 | const char *rev, const char *path); |
36 | extern void cgit_refs_link(const char *name, const char *title, | 36 | extern void cgit_refs_link(const char *name, const char *title, |