{"thread":{"id":"19340","subject":"[PATCH 1/3] Change prettify_ref to prettify_refname","startedAt":"2009-05-13T21:22:03Z","lastAt":"2009-05-13T21:34:41Z","messageCount":7,"participants":["Felipe Contreras","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"113848","messageId":"1242249726-8514-1-git-send-email-felipe.contreras@gmail.com","threadId":"19340","inReplyTo":null,"subject":"[PATCH 0/3] log: prettier decorations","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2009-05-13T21:22:03Z","receivedAt":"2009-05-13T21:22:03Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Hi,\n\nThis patch series simply improves log decorations so that they look like:\n\n(tag: v1.6.3.1, origin/maint, master)\n\nInstead of:\n\n(tag: refs/tags/v1.6.3.1, refs/remotes/origin/maint, refs/heads/master)\n\nIn order to do that I had to change prettify_ref to prettify_refname because\nadd_ref_decoration doesn't have the ref object.\n\nFelipe Contreras (3):\n Change prettify_ref to prettify_refname\n Prettify log decorations even more\n Fix test for new log decorate\n\n builtin-fetch.c | 2 +-\n builtin-send-pack.c | 4 ++--\n log-tree.c | 1 +\n refs.c | 3 +--\n refs.h | 2 +-\n t/t4013/diff.log_--decorate_--all | 6 +++---\n transport.c | 4 ++--\n 7 files changed, 11 insertions(+), 11 deletions(-)\n"},{"id":"113846","messageId":"1242249726-8514-2-git-send-email-felipe.contreras@gmail.com","threadId":"19340","inReplyTo":"1242249726-8514-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 1/3] Change prettify_ref to prettify_refname","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2009-05-13T21:22:04Z","receivedAt":"2009-05-13T21:22:04Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"In preparation to be used when the ref object is not available\n\nSigned-off-by: Felipe Contreras \n---\n builtin-fetch.c | 2 +-\n builtin-send-pack.c | 4 ++--\n refs.c | 3 +--\n refs.h | 2 +-\n transport.c | 4 ++--\n 5 files changed, 7 insertions(+), 8 deletions(-)\n\ndiff --git a/builtin-fetch.c b/builtin-fetch.c\nindex 3c998ea..ebd0c08 100644\n--- a/builtin-fetch.c\n+++ b/builtin-fetch.c\n@@ -197,7 +197,7 @@ static int update_local_ref(struct ref *ref,\n \tstruct commit *current = NULL, *updated;\n \tenum object_type type;\n \tstruct branch *current_branch = branch_get(NULL);\n-\tconst char *pretty_ref = prettify_ref(ref);\n+\tconst char *pretty_ref = prettify_refname(ref->name);\n \n \t*display = 0;\n \ttype = sha1_object_info(ref->new_sha1, NULL);\ndiff --git a/builtin-send-pack.c b/builtin-send-pack.c\nindex d5a1c48..b2279b0 100644\n--- a/builtin-send-pack.c\n+++ b/builtin-send-pack.c\n@@ -174,9 +174,9 @@ static void print_ref_status(char flag, const char *summary, struct ref *to, str\n {\n \tfprintf(stderr, \" %c %-*s \", flag, SUMMARY_WIDTH, summary);\n \tif (from)\n-\t\tfprintf(stderr, \"%s -> %s\", prettify_ref(from), prettify_ref(to));\n+\t\tfprintf(stderr, \"%s -> %s\", prettify_refname(from->name), prettify_refname(to->name));\n \telse\n-\t\tfputs(prettify_ref(to), stderr);\n+\t\tfputs(prettify_refname(to->name), stderr);\n \tif (msg) {\n \t\tfputs(\" (\", stderr);\n \t\tfputs(msg, stderr);\ndiff --git a/refs.c b/refs.c\nindex e65a3b4..e74461e 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -750,9 +750,8 @@ int check_ref_format(const char *ref)\n \t}\n }\n \n-const char *prettify_ref(const struct ref *ref)\n+const char *prettify_refname(const char *name)\n {\n-\tconst char *name = ref->name;\n \treturn name + (\n \t\t!prefixcmp(name, \"refs/heads/\") ? 11 :\n \t\t!prefixcmp(name, \"refs/tags/\") ? 10 :\ndiff --git a/refs.h b/refs.h\nindex 29d17a4..c11f6a6 100644\n--- a/refs.h\n+++ b/refs.h\n@@ -80,7 +80,7 @@ extern int for_each_reflog(each_ref_fn, void *);\n #define CHECK_REF_FORMAT_WILDCARD (-3)\n extern int check_ref_format(const char *target);\n \n-extern const char *prettify_ref(const struct ref *ref);\n+extern const char *prettify_refname(const char *refname);\n extern char *shorten_unambiguous_ref(const char *ref, int strict);\n \n /** rename ref, return 0 on success **/\ndiff --git a/transport.c b/transport.c\nindex 3dfb03c..38c7f57 100644\n--- a/transport.c\n+++ b/transport.c\n@@ -732,9 +732,9 @@ static void print_ref_status(char flag, const char *summary, struct ref *to, str\n {\n \tfprintf(stderr, \" %c %-*s \", flag, SUMMARY_WIDTH, summary);\n \tif (from)\n-\t\tfprintf(stderr, \"%s -> %s\", prettify_ref(from), prettify_ref(to));\n+\t\tfprintf(stderr, \"%s -> %s\", prettify_refname(from->name), prettify_refname(to->name));\n \telse\n-\t\tfputs(prettify_ref(to), stderr);\n+\t\tfputs(prettify_refname(to->name), stderr);\n \tif (msg) {\n \t\tfputs(\" (\", stderr);\n \t\tfputs(msg, stderr);\n-- \n1.6.3.1\n"},{"id":"113847","messageId":"1242249726-8514-3-git-send-email-felipe.contreras@gmail.com","threadId":"19340","inReplyTo":"1242249726-8514-2-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 2/3] Prettify log decorations even more","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2009-05-13T21:22:05Z","receivedAt":"2009-05-13T21:22:05Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"\"tag: v1.6.2.5\" looks much better than \"tag: refs/tags/v1.6.2.5\".\n\nSigned-off-by: Felipe Contreras \n---\n log-tree.c | 1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/log-tree.c b/log-tree.c\nindex 5bd29e6..59d63eb 100644\n--- a/log-tree.c\n+++ b/log-tree.c\n@@ -25,6 +25,7 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in\n \tstruct object *obj = parse_object(sha1);\n \tif (!obj)\n \t\treturn 0;\n+\trefname = prettify_refname(refname);\n \tadd_name_decoration(\"\", refname, obj);\n \twhile (obj->type == OBJ_TAG) {\n \t\tobj = ((struct tag *)obj)->tagged;\n-- \n1.6.3.1\n"},{"id":"113849","messageId":"1242249726-8514-4-git-send-email-felipe.contreras@gmail.com","threadId":"19340","inReplyTo":"1242249726-8514-3-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 3/3] Fix test for new log decorate","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2009-05-13T21:22:06Z","receivedAt":"2009-05-13T21:22:06Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras \n---\n t/t4013/diff.log_--decorate_--all | 6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all\nindex 12da8ac..954210e 100644\n--- a/t/t4013/diff.log_--decorate_--all\n+++ b/t/t4013/diff.log_--decorate_--all\n@@ -1,12 +1,12 @@\n $ git log --decorate --all\n-commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (refs/heads/master)\n+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (master)\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \n Date: Mon Jun 26 00:04:00 2006 +0000\n \n Merge branch 'side'\n \n-commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (refs/heads/side)\n+commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (side)\n Author: A U Thor \n Date: Mon Jun 26 00:03:00 2006 +0000\n \n@@ -26,7 +26,7 @@ Date: Mon Jun 26 00:01:00 2006 +0000\n \n This is the second commit.\n \n-commit 444ac553ac7612cc88969031b02b3767fb8a353a (refs/heads/initial)\n+commit 444ac553ac7612cc88969031b02b3767fb8a353a (initial)\n Author: A U Thor \n Date: Mon Jun 26 00:00:00 2006 +0000\n \n-- \n1.6.3.1\n"},{"id":"113850","messageId":"20090513212812.GA21268@coredump.intra.peff.net","threadId":"19340","inReplyTo":"1242249726-8514-1-git-send-email-felipe.contreras@gmail.com","subject":"Re: [PATCH 0/3] log: prettier decorations","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-05-13T21:28:12Z","receivedAt":"2009-05-13T21:28:12Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, May 14, 2009 at 12:22:03AM +0300, Felipe Contreras wrote:\n\n> In order to do that I had to change prettify_ref to prettify_refname because\n> add_ref_decoration doesn't have the ref object.\n\nThanks, this 1/3 looks fine to me.\n\nBut:\n\n> Felipe Contreras (3):\n> Change prettify_ref to prettify_refname\n> Prettify log decorations even more\n> Fix test for new log decorate\n\nShouldn't 2/3 and 3/3 just be squashed together? It looks like 3/3 fixes\ntests broken in 2/3, so you are hurting bisectability if they don't\nhappen together.\n\nOther than that, I think the intent of the change and the implementation\nlook fine.\n\n-Peff\n"},{"id":"113853","messageId":"1242250373-9120-1-git-send-email-felipe.contreras@gmail.com","threadId":"19340","inReplyTo":"20090513212812.GA21268@coredump.intra.peff.net","subject":"[PATCH 2/2] Prettify log decorations even more","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2009-05-13T21:32:53Z","receivedAt":"2009-05-13T21:32:53Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"\"tag: v1.6.2.5\" looks much better than \"tag: refs/tags/v1.6.2.5\".\n\nSigned-off-by: Felipe Contreras \n---\n log-tree.c | 1 +\n t/t4013/diff.log_--decorate_--all | 6 +++---\n 2 files changed, 4 insertions(+), 3 deletions(-)\n\ndiff --git a/log-tree.c b/log-tree.c\nindex 5bd29e6..59d63eb 100644\n--- a/log-tree.c\n+++ b/log-tree.c\n@@ -25,6 +25,7 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in\n \tstruct object *obj = parse_object(sha1);\n \tif (!obj)\n \t\treturn 0;\n+\trefname = prettify_refname(refname);\n \tadd_name_decoration(\"\", refname, obj);\n \twhile (obj->type == OBJ_TAG) {\n \t\tobj = ((struct tag *)obj)->tagged;\ndiff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all\nindex 12da8ac..954210e 100644\n--- a/t/t4013/diff.log_--decorate_--all\n+++ b/t/t4013/diff.log_--decorate_--all\n@@ -1,12 +1,12 @@\n $ git log --decorate --all\n-commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (refs/heads/master)\n+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (master)\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \n Date: Mon Jun 26 00:04:00 2006 +0000\n \n Merge branch 'side'\n \n-commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (refs/heads/side)\n+commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (side)\n Author: A U Thor \n Date: Mon Jun 26 00:03:00 2006 +0000\n \n@@ -26,7 +26,7 @@ Date: Mon Jun 26 00:01:00 2006 +0000\n \n This is the second commit.\n \n-commit 444ac553ac7612cc88969031b02b3767fb8a353a (refs/heads/initial)\n+commit 444ac553ac7612cc88969031b02b3767fb8a353a (initial)\n Author: A U Thor \n Date: Mon Jun 26 00:00:00 2006 +0000\n \n-- \n1.6.3.1\n"},{"id":"113854","messageId":"94a0d4530905131434q17743408p5bc4b1c2fc332ea@mail.gmail.com","threadId":"19340","inReplyTo":"20090513212812.GA21268@coredump.intra.peff.net","subject":"Re: [PATCH 0/3] log: prettier decorations","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2009-05-13T21:34:41Z","receivedAt":"2009-05-13T21:34:41Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Thu, May 14, 2009 at 12:28 AM, Jeff King wrote:\n> On Thu, May 14, 2009 at 12:22:03AM +0300, Felipe Contreras wrote:\n>\n>> In order to do that I had to change prettify_ref to prettify_refname because\n>> add_ref_decoration doesn't have the ref object.\n>\n> Thanks, this 1/3 looks fine to me.\n>\n> But:\n>\n>> Felipe Contreras (3):\n>>   Change prettify_ref to prettify_refname\n>>   Prettify log decorations even more\n>>   Fix test for new log decorate\n>\n> Shouldn't 2/3 and 3/3 just be squashed together? It looks like 3/3 fixes\n> tests broken in 2/3, so you are hurting bisectability if they don't\n> happen together.\n\nYeah, I thought so too. Maybe I should trust my instinct a bit more =P\n\n> Other than that, I think the intent of the change and the implementation\n> look fine.\n\nCool. I squashed them and re-sent.\n\n-- \nFelipe Contreras\n"}]}