diff options
-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
diff --git a/cmd.c b/cmd.c index 893ae25..605876b 100644 --- a/cmd.c +++ b/cmd.c | |||
@@ -90,7 +90,7 @@ static void repolist_fn(struct cgit_context *ctx) | |||
90 | 90 | ||
91 | static void patch_fn(struct cgit_context *ctx) | 91 | 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 | } |
95 | 95 | ||
96 | static void plain_fn(struct cgit_context *ctx) | 96 | static void plain_fn(struct cgit_context *ctx) |
diff --git a/ui-commit.c b/ui-commit.c index 2f4c6d4..b3a2063 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -60,7 +60,7 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
60 | tmp = sha1_to_hex(commit->object.sha1); | 60 | tmp = sha1_to_hex(commit->object.sha1); |
61 | cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, 0); | 61 | cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, 0); |
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(") ("); |
65 | if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) | 65 | if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) |
66 | cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, 1); | 66 | cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, 1); |
diff --git a/ui-patch.c b/ui-patch.c index 2a8f7a5..25dc9fe 100644 --- a/ui-patch.c +++ b/ui-patch.c | |||
@@ -77,7 +77,7 @@ static void filepair_cb(struct diff_filepair *pair) | |||
77 | html("Binary files differ\n"); | 77 | html("Binary files differ\n"); |
78 | } | 78 | } |
79 | 79 | ||
80 | void cgit_print_patch(char *hex) | 80 | void cgit_print_patch(char *hex, const char *prefix) |
81 | { | 81 | { |
82 | struct commit *commit; | 82 | struct commit *commit; |
83 | struct commitinfo *info; | 83 | struct commitinfo *info; |
@@ -122,7 +122,9 @@ void cgit_print_patch(char *hex) | |||
122 | html("\n"); | 122 | html("\n"); |
123 | } | 123 | } |
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"); |
127 | htmlf("cgit %s\n", CGIT_VERSION); | 129 | htmlf("cgit %s\n", CGIT_VERSION); |
128 | cgit_free_commitinfo(info); | 130 | cgit_free_commitinfo(info); |
diff --git a/ui-patch.h b/ui-patch.h index 9f68212..1641cea 100644 --- a/ui-patch.h +++ b/ui-patch.h | |||
@@ -1,6 +1,6 @@ | |||
1 | #ifndef UI_PATCH_H | 1 | #ifndef UI_PATCH_H |
2 | #define UI_PATCH_H | 2 | #define UI_PATCH_H |
3 | 3 | ||
4 | extern void cgit_print_patch(char *hex); | 4 | extern void cgit_print_patch(char *hex, const char *prefix); |
5 | 5 | ||
6 | #endif /* UI_PATCH_H */ | 6 | #endif /* UI_PATCH_H */ |
diff --git a/ui-shared.c b/ui-shared.c index 4fa506f..d5c4c10 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -388,9 +388,9 @@ void cgit_diff_link(const char *name, const char *title, const char *class, | |||
388 | } | 388 | } |
389 | 389 | ||
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 | } |
395 | 395 | ||
396 | void cgit_stats_link(const char *name, const char *title, const char *class, | 396 | void cgit_stats_link(const char *name, const char *title, const char *class, |
diff --git a/ui-shared.h b/ui-shared.h index 3df5464..c0e5c55 100644 --- a/ui-shared.h +++ b/ui-shared.h | |||
@@ -32,7 +32,7 @@ extern void cgit_commit_link(char *name, const char *title, | |||
32 | const char *rev, int toggle_ssdiff); | 32 | const char *rev, int toggle_ssdiff); |
33 | extern void cgit_patch_link(const char *name, const char *title, | 33 | 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, |
37 | const char *class, const char *head, | 37 | const char *class, const char *head, |
38 | const char *rev, const char *path); | 38 | const char *rev, const char *path); |