Most of the time, ref update lines are
variable-long-name -> fixed-remote/variable-long-name
With fetch.output set to "compact" such a line will be shown as
{ -> fixed-remote}/variable-long-name
This keeps the output aligned (because the variable part is always at
the end) and reduce duplication.
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]>
---
Documentation/config.txt | 4 +++
Documentation/git-fetch.txt | 8 ++++++
builtin/fetch.c | 67 ++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 78 insertions(+), 1 deletion(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2e1b2e4..a59aa32 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1220,6 +1220,10 @@ fetch.prune::
If true, fetch will automatically behave as if the `--prune`
option was given on the command line. See also `remote.<name>.prune`.
+fetch.output::
+ Valid values are "compact" or "full". See OUTPUT section in
+ linkgit:git-fetch[1] for detail.
+
format.attach::
Enable multipart/mixed attachments as the default for
'format-patch'. The value can also be a double quoted string
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 6c6b2c1..856796b 100644
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -113,6 +113,14 @@ representing the status of a single ref. Each line is of
the form:
<flag> <summary> <from> -> <to> (<reason>)
-------------------------------
+When configuration variable `fetch.output` contains `compact` and
+`from` and `to` share a common suffix, the line could be displayed in
+the form:
+
+-------------------------------
+ <flag> <summary> {<from> -> <to>}<common-suffix> (<reason>)
+-------------------------------
+
The status of up-to-date refs is shown only if --verbose option is
used.
diff --git a/builtin/fetch.c b/builtin/fetch.c
index c42795b..e2ca6bc 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -451,6 +451,7 @@ fail:
}
static int refcol_width = 10;
+static int compact_format;
static void adjust_refcol_width(const struct ref *ref)
{
@@ -480,6 +481,19 @@ static void adjust_refcol_width(const struct ref *ref)
static void prepare_format_display(struct ref *ref_map)
{
struct ref *rm;
+ const char *format = "full";
+
+ git_config_get_string_const("fetch.output", &format);
+ if (!strcasecmp(format, "full"))
+ compact_format = 0;
+ else if (!strcasecmp(format, "compact"))
+ compact_format = 1;
+ else
+ die(_("configuration fetch.output contains invalid value %s"),
+ format);
+
+ if (compact_format)
+ return;
for (rm = ref_map; rm; rm = rm->next) {
if (rm->status == REF_STATUS_REJECT_SHALLOW ||
@@ -491,12 +505,63 @@ static void prepare_format_display(struct ref *ref_map)
}
}
+static int common_suffix_length(const char *a, const char *b)
+{
+ const char *pa = a + strlen(a);
+ const char *pb = b + strlen(b);
+ int count = 0, final_count = 0;
+
+ while (pa > a && pb > b && pa[-1] == pb[-1]) {
+ pa--;
+ pb--;
+ count++;
+ if (*pa == '/' ||
+ /*
+ * if a and b are "abc" and "origin/abc" respectively,
+ * accept "a" as the suffix boundary too.
+ */
+ (pa == a && pb > b && pb[-1] == '/') ||
+ (pb == b && pa > a && pa[-1] == '/'))
+ final_count = count;
+ }
+
+ return final_count;
+}
+
+static void print_remote_to_local(struct strbuf *display,
+ const char *remote, const char *local)
+{
+ strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local);
+}
+
+static void print_compact(struct strbuf *display,
+ const char *remote, const char *local)
+{
+ int len = common_suffix_length(remote, local);
+
+ if (len) {
+ strbuf_addf(display, "{%.*s -> %.*s}%s",
+ (int)strlen(remote) - len, remote,
+ (int)strlen(local) - len, local,
+ remote + strlen(remote) - len);
+ return;
+ }
+ print_remote_to_local(display, remote, local);
+}
+
static void format_display(struct strbuf *display, char code,
const char *summary, const char *error,
const char *remote, const char *local)
{
strbuf_addf(display, "%c %-*s ", code, TRANSPORT_SUMMARY(summary));
- strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local);
+ switch (compact_format) {
+ case 0:
+ print_remote_to_local(display, remote, local);
+ break;
+ case 1:
+ print_compact(display, remote, local);
+ break;
+ }
if (error)
strbuf_addf(display, " (%s)", error);
}
--
2.8.2.524.g6ff3d78
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
