Re: [RFC/PATCH] shortstatus v1

From: Jeff King <peff@peff.net>
Date: Feb 10, 2009, 18:10 UTC
Message-ID: <20090210181052.GA19634@coredump.intra.peff.net>
In-Reply-To: <7vwsbynv0o.fsf@gitster.siamese.dyndns.org>

On Tue, Feb 10, 2009 at 07:58:47AM -0800, Junio C Hamano wrote:

Show 16 quoted lines

> >   2. Why do staged changes get a letter marking what happened, but
> >      unstaged changes do not?
> 
> Bug?   FWIW, the original patch from October shows:
> 
>     M changed
> M   M changed-again
> M     changed-staged
>     D deleted
> D     deleted-staged
> 
> (where changed-again has both staged changes and further changes in the
> work tree).
> 
> The gap between these two are to show the rename similarity index, which
> we could do without.

OK, that makes more sense. And your example shows a good answer to my earlier question: why is just sorting the output of the the three commands (diff, diff --cached, and ls-files -o) not as nice. The answer is that we need to actually combine lines when files are appear in multiple places.

> The output mimicked what was in Shawn's "repo" tool announcement IIRC.
> 
> My patch was supposed to give interested parties hint to base a patch like
> Tuncer's on (I think this answers your last question, too).

I went back and read some of the background. I think having this work with the wt-status machinery is reasonable, then. My concerns with Tuncer's patch are still:

  - this should not be part of builtin-commit.c; it doesn't use any of
    the same code except that which has already been lib-ified in
    wt-status.[ch].

  - I don't think the "mini" status is really related to this. The novel
    thing here is collating the outputs into a single sorted list. But
    the "mini" output is not about that at all:

      1. It doesn't care about full output, so it should be able to exit
         early from the diff, avoid rename detection, etc, so that it is
         as quick as possible.

      2. It doesn't collate the output at all. It is about three
         separate symbols for the three separate lists.

-Peff

> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html