Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 11716:db426935fa94 stable
progress: use gerund (updating) for merge progress
| author | timeless <timeless@gmail.com> |
|---|---|
| date | Fri, 30 Jul 2010 10:32:24 +0300 |
| parents | 34e33d50c26b |
| children | a286a4ecbfeb 7d2aaeea67ed |
line wrap: on
line diff
--- a/mercurial/merge.py Sat Jul 10 21:23:00 2010 +0200 +++ b/mercurial/merge.py Fri Jul 30 10:32:24 2010 +0300 @@ -286,7 +286,7 @@ numupdates = len(action) for i, a in enumerate(action): f, m = a[:2] - u.progress('update', i + 1, item=f, total=numupdates, unit='files') + u.progress(_('updating'), i + 1, item=f, total=numupdates, unit='files') if f and f[0] == "/": continue if m == "r": # remove @@ -346,7 +346,7 @@ elif m == "e": # exec flags = a[2] util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags) - u.progress('update', None, total=numupdates, unit='files') + u.progress(_('updating'), None, total=numupdates, unit='files') return updated, merged, removed, unresolved