[PATCH] summary: Clarify output for the commit summary

Adrian Buehlmann adrian at cadifra.com
Mon Oct 19 03:34:32 CDT 2009


On 19.10.2009 07:23, David Soria Parra wrote:
> # HG changeset patch
> # User David Soria Parra <dsp at php.net>
> # Date 1255929284 -7200
> # Node ID b7c25514a250a9c9bfb90abe1a75d9444eafb176
> # Parent  220d39af2e5779879dd9a7bf3af41d787b7ef9b6
> summary: Clarify output for the commit summary
> 
> It is not clear what is meant with '1 modified, 1 unknown'. We clarify
> this by adding 'file(s)'.
> 
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -2907,7 +2907,7 @@
>          if st[i]:
>              t.append('%d %s' % (len(st[i]), l))
>  
> -    t = ', '.join(t)
> +    t = ', '.join(t) + _(' files(s)')

This should be written as "files" not "file(s)"

See for example the output of "hg update" [1]

>  
>      if len(parents) > 1:
>          t += _(' (merge)')

[1]
$ hg up
5 files updated, 0 files merged, 0 files removed, 0 files unresolved


More information about the Mercurial-devel mailing list