[PATCH] output the number of files updated/merged/unresolved on update

Thomas Arendsen Hein thomas at intevation.de
Mon Mar 13 08:12:29 UTC 2006


* Benoit Boissinot <bboissin at ens-lyon.fr> [20060313 06:14]:
> On 12/28/05, Matt Mackall <mpm at selenic.com> wrote:
> > On Wed, Dec 28, 2005 at 06:19:20PM +0100, Benoit Boissinot wrote:
> > > # HG changeset patch
> > > # User Benoit Boissinot <benoit.boissinot at ens-lyon.org>
> > > # Node ID 5114d22bbd0ca5735ce45bca995b7763c7d38914
> > > # Parent  428e0a9c9968e3922f70f3fa50343779cbeb021e
> > > ui: output the number of file updated/merged/removed/... on update
> >
> > Nice, but slightly too cute:
> >
> > > +        stat = ((len(get), _("updated")),
> > > +                (len(merge) - len(unmerge), _("merged")),
> > > +                (len(remove), _("removed")),
> > > +                (len(unmerge), _("unresolved")))
> > > +        note = ", ".join([_("%d files %s") % s for s in stat if s[0] > 0])
> >
> > I'd rather not have the 0 values disappear, it creates headaches for
> > scripts that parse our output. That's also a reason not to do special
> > handling for "1 files".
> >
> updated patch below, is it ok for crew ?

Yes, looks fine now.

When trying to push it to crew, hg shouted at me with:
  abort: push creates new remote branches!
  (did you forget to merge? use push -f to force)

There currently are two heads and after the push (with -f) there
still are two heads. Strange.

Pushed-f to crew now.

Thomas

-- 
Email: thomas at intevation.de
http://intevation.de/~thomas/



More information about the Mercurial mailing list