git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Mackerras <paulus@samba.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Marco Costalba <mcostalba@gmail.com>,
	Junio C Hamano <gitster@pobox.com>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 4/2] Fix parent rewriting in --early-output
Date: Tue, 13 Nov 2007 20:59:46 +1100	[thread overview]
Message-ID: <18233.30098.470244.421468@cargo.ozlabs.ibm.com> (raw)
In-Reply-To: <alpine.LFD.0.9999.0711122046570.2786@woody.linux-foundation.org>

Linus Torvalds writes:

> However, while the parent is now correctly rewritten, it looks like gitk 
> is confused by this. Gitk will remember the original parent information, 
> even if a replay has given new parenthood information. Since the partial 
> early-output information is triggered by timing, this means that gitk will 
> show some totally random parent that quite possibly won't even be part of 
> the final commit set at all!

Yep.  It will be a little complex to deal with that because there are
bits of state that I set up for the parents, and if they're the wrong
parents, I'll have to go back and undo that.

In fact it would be easier for me if, instead of getting the id of
some random ancestor commit, I got an explicit indication to say
"unknown parent", such as just a "-" in place of the id of the
unknown parent(s).  Would that be doable?  I could then just not do
the processing for any unknown parent, and make sure to do it when I
see the final version of the commit.

Also, I have just about worked out an efficient way to do the commit
reordering incrementally, which would let me not use --topo-order or
--date-order, and display commits as they come in.  I'll have to see
whether that turns out to be better overall than using --early-output.

Paul.

  parent reply	other threads:[~2007-11-13 10:00 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-28  1:39 New features in gitk Paul Mackerras
2007-10-28  5:34 ` Linus Torvalds
2007-10-28  7:11   ` Paul Mackerras
2007-10-28  7:36     ` Steffen Prohaska
2007-10-28 16:50     ` Linus Torvalds
2007-11-01 10:00       ` Paul Mackerras
2007-11-01 15:16         ` Linus Torvalds
2007-11-02 10:19           ` Paul Mackerras
2007-11-02 12:44             ` Marco Costalba
2007-11-02 15:42               ` Linus Torvalds
2007-11-02 16:50                 ` Marco Costalba
2007-11-02 18:16                 ` Linus Torvalds
2007-11-02 20:31                   ` [PATCH 0/2] History replay support Linus Torvalds
2007-11-02 20:32                     ` [PATCH 1/2] Simplify topo-sort logic Linus Torvalds
2007-11-02 20:35                     ` [PATCH 2/2] Support "history replay" for git log commands Linus Torvalds
2007-11-02 21:05                       ` Junio C Hamano
2007-11-02 21:17                         ` Linus Torvalds
2007-11-03  1:40                     ` [PATCH 0/2] History replay support Linus Torvalds
2007-11-03  7:56                       ` Marco Costalba
2007-11-03 18:11                       ` [REPLACEMENT PATCH 2/2] Add "--early-output" log flag for interactive GUI use Linus Torvalds
2007-11-03 19:52                         ` Marco Costalba
2007-11-04  3:06                         ` Paul Mackerras
2007-11-04  5:38                           ` Linus Torvalds
2007-11-04  7:10                             ` Paul Mackerras
2007-11-04  7:52                               ` Marco Costalba
2007-11-04 18:11                             ` Linus Torvalds
2007-11-04 20:12                               ` [PATCH 3/2] Enhance --early-output format Linus Torvalds
2007-11-05 20:24                                 ` Junio C Hamano
2007-11-05 20:47                                   ` Linus Torvalds
2007-11-05 21:22                                     ` Linus Torvalds
2007-11-05 21:35                                       ` Linus Torvalds
2007-11-13  4:58                                 ` [PATCH 4/2] Fix parent rewriting in --early-output Linus Torvalds
2007-11-13  5:43                                   ` Junio C Hamano
2007-11-13  6:46                                     ` Linus Torvalds
2007-11-13  7:16                                       ` Linus Torvalds
2007-11-13  7:53                                         ` Sven Verdoolaege
2007-11-13  8:48                                         ` Junio C Hamano
2007-11-13  8:01                                     ` Shawn O. Pearce
2007-11-13  8:24                                       ` Junio C Hamano
2007-11-13  9:59                                   ` Paul Mackerras [this message]
2007-11-13 18:53                                     ` Junio C Hamano
2007-11-13 21:55                                       ` Paul Mackerras
2007-11-16  7:30                                     ` Marco Costalba
2007-11-04  0:32                       ` [PATCH 0/2] History replay support Paul Mackerras
2007-11-02 18:17                 ` New features in gitk Johannes Schindelin
2007-11-02 15:03             ` Linus Torvalds
2007-11-01 11:37       ` Paul Mackerras
2007-11-01 15:47         ` Linus Torvalds
2007-11-01 16:21           ` Linus Torvalds
2007-10-28 18:32 ` Pierre Habouzit
2007-10-28 18:38   ` Mike Hommey
2007-10-28 23:13   ` Paul Mackerras
2007-10-29  6:20     ` Pierre Habouzit
2007-10-29  8:31       ` Jonathan del Strother
2007-10-29  6:24     ` Pierre Habouzit
2007-10-29 13:30 ` Han-Wen Nienhuys
2007-10-29 14:04 ` Michele Ballabio

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=18233.30098.470244.421468@cargo.ozlabs.ibm.com \
    --to=paulus@samba.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mcostalba@gmail.com \
    --cc=torvalds@linux-foundation.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.
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 NNTP newsgroup(s).