[PATCH] in/out --summary
Alexis S. L. Carvalho
alexis at cecm.usp.br
Thu Feb 14 16:50:53 CST 2008
Thus spake Thomas Arendsen Hein:
> * Jesse Glick <jesse.glick at sun.com> [20080214 01:22]:
> > Thomas Arendsen Hein wrote:
> > > Additionally I think 'summary' isn't the correct term here. The
> > > patchutils command with the same feature is named 'combinediff', so
> > > maybe use that?
> >
> > Or --onediff? --singlediff?
>
> --onediff would make a good short option: -1 ;-)
>
> But I think dropping the 'diff' part altogether would be good: With
> --combined we could show one single combined patch with -p and maybe
> just a list of changed files (something like status or a
> diffstat-like thing) without.
Having a way to print the list of files sounds useful.
One problem with "combined" is that git uses "combined diff format" for
their "diff of a merge" format. --cumulative? --coalesced?
Any suggestions for error messages when we can't figure out which
revisions to diff? Right now I have:
$ hg out --summary ../a
comparing with ../a
searching for changes
there's more than one possible base revision.
please choose one using --base.
base revisions found:
changeset: 1:1638a5e33a45
user: Alexis S. L. Carvalho <alexis at cecm.usp.br>
date: Thu Feb 14 20:22:09 2008 -0200
summary: change foo
changeset: 2:b233f2314db2
parent: 0:dfe52311a539
user: Alexis S. L. Carvalho <alexis at cecm.usp.br>
date: Thu Feb 14 20:22:20 2008 -0200
summary: add bar
abort: unable to find a unique base revision
Which looks way too much like the regular output (not surprising, since
they're using the same changeset printer...).
Alexis
More information about the Mercurial-devel
mailing list