From: Junio C Hamano <junkio@cox.net>
To: Paul Mackerras <paulus@samba.org>
Cc: git@vger.kernel.org
Subject: Re: Gitk strangeness..
Date: Mon, 27 Mar 2006 18:54:45 -0800 [thread overview]
Message-ID: <7vr74nmg7e.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <17448.40941.256361.866229@cargo.ozlabs.ibm.com> (Paul Mackerras's message of "Tue, 28 Mar 2006 13:31:09 +1100")
Paul Mackerras <paulus@samba.org> writes:
> The other option would be to make git-rev-list list the open-circle
> commits explicitly, with an indication that they are not in the
> requested set but are parents of commits in the requested set.
I might be off the mark, but are you thinking about something
like the attached patch?
> Do you think that having the open-circle commits in the graph is
> useful?
Of course.
-- >8 --
rev-list: --parents-with-boundary
The new flag acts like --parents, but uninteresting parents are
marked by prefied '-' sign.
$ git-rev-list --parents-with-boundary HEAD^^..HEAD
acb7257... 9c48666...
9c48666... -dff86e2..
---
diff --git a/rev-list.c b/rev-list.c
index 441c437..58fc449 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -39,6 +39,8 @@
static int bisect_list = 0;
static int verbose_header = 0;
static int abbrev = DEFAULT_ABBREV;
+#define SHOW_PARENTS 1
+#define SHOW_PARENTS_BOUNDARY 2
static int show_parents = 0;
static int show_timestamp = 0;
static int hdr_termination = 0;
@@ -59,7 +61,11 @@
parents = parents->next;
if (o->flags & TMP_MARK)
continue;
- printf(" %s", sha1_to_hex(o->sha1));
+ if (show_parents == SHOW_PARENTS_BOUNDARY &&
+ o->flags & UNINTERESTING)
+ printf(" -%s", sha1_to_hex(o->sha1));
+ else
+ printf(" %s", sha1_to_hex(o->sha1));
o->flags |= TMP_MARK;
}
/* TMP_MARK is a general purpose flag that can
@@ -337,7 +343,11 @@
continue;
}
if (!strcmp(arg, "--parents")) {
- show_parents = 1;
+ show_parents = SHOW_PARENTS;
+ continue;
+ }
+ if (!strcmp(arg, "--parents-with-boundary")) {
+ show_parents = SHOW_PARENTS_BOUNDARY;
continue;
}
if (!strcmp(arg, "--timestamp")) {
next prev parent reply other threads:[~2006-03-28 2:54 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-28 0:28 What's in git.git Junio C Hamano
2006-03-28 1:15 ` [PATCH] Add ALL_LDFLAGS to the git target Jason Riedy
2006-03-28 1:25 ` Junio C Hamano
2006-03-28 3:11 ` Jason Riedy
2006-03-28 6:21 ` Junio C Hamano
2006-03-28 19:46 ` Jason Riedy
2006-03-28 22:48 ` Mark Wooding
2006-03-28 23:03 ` Linus Torvalds
2006-03-28 23:20 ` Junio C Hamano
2006-03-28 23:59 ` Jason Riedy
2006-03-29 0:01 ` Junio C Hamano
2006-03-28 23:21 ` Mark Wooding
2006-03-29 0:16 ` [PATCH] Support for pickaxe matching regular expressions Petr Baudis
2006-03-29 13:09 ` Petr Baudis
2006-03-29 11:42 ` [PATCH] Add ALL_LDFLAGS to the git target Johannes Schindelin
2006-03-28 2:05 ` Gitk strangeness Linus Torvalds
2006-03-28 2:12 ` Junio C Hamano
2006-03-28 2:31 ` Paul Mackerras
2006-03-28 2:52 ` Linus Torvalds
2006-03-28 2:54 ` Junio C Hamano [this message]
2006-03-28 4:31 ` Paul Mackerras
2006-03-28 5:38 ` Junio C Hamano
2006-03-28 6:18 ` Paul Mackerras
2006-03-28 7:52 ` Junio C Hamano
2006-03-28 22:51 ` Paul Mackerras
2006-03-29 0:50 ` Junio C Hamano
2006-03-29 6:41 ` Junio C Hamano
2006-03-30 20:57 ` Alex Riesen
2006-03-30 22:33 ` Paul Mackerras
2006-03-30 23:46 ` Paul Mackerras
2006-03-31 1:50 ` Junio C Hamano
2006-03-31 6:27 ` Alex Riesen
2006-03-28 2:57 ` Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vr74nmg7e.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).