Mercurial > hg
changeset 23652:6fcc3669e483
merge: remove constant tuple element from 'aborts'
The second element of the tuples in the 'aborts' list is always 'ud',
so let's remove it.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 18 Nov 2014 20:29:25 -0800 |
| parents | 72da02d7f126 |
| children | 0297d8469350 |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Wed Nov 19 11:51:31 2014 -0800 +++ b/mercurial/merge.py Tue Nov 18 20:29:25 2014 -0800 @@ -516,12 +516,10 @@ for f, (m, args, msg) in actions.iteritems(): if m in ('c', 'dc'): if _checkunknownfile(repo, wctx, p2, f): - aborts.append((f, "ud")) + aborts.append(f) - for f, m in sorted(aborts): - if m == 'ud': - repo.ui.warn(_("%s: untracked file differs\n") % f) - else: assert False, m + for f in sorted(aborts): + repo.ui.warn(_("%s: untracked file differs\n") % f) if aborts: raise util.Abort(_("untracked files in working directory differ " "from files in requested revision"))