Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 23351:1cbc00ff2373
update: remove unnecessary check for unknown files with --check
As far as I and the test suite can tell, the checks in manifestmerge()
already report the errors (whether or not --check is given), so we
don't need to call merge.checkunknown(). Since this is the last call
to the method, also remove the method.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 18 Nov 2014 16:14:32 -0800 |
| parents | 4165cfd67519 |
| children | b913c394386f |
comparison
equal
deleted
inserted
replaced
| 23350:e63941631a3f | 23351:1cbc00ff2373 |
|---|---|
| 6183 c = repo[None] | 6183 c = repo[None] |
| 6184 if c.dirty(merge=False, branch=False, missing=True): | 6184 if c.dirty(merge=False, branch=False, missing=True): |
| 6185 raise util.Abort(_("uncommitted changes")) | 6185 raise util.Abort(_("uncommitted changes")) |
| 6186 if rev is None: | 6186 if rev is None: |
| 6187 rev = repo[repo[None].branch()].rev() | 6187 rev = repo[repo[None].branch()].rev() |
| 6188 mergemod.checkunknown(repo, repo[None], repo[rev]) | |
| 6189 | 6188 |
| 6190 repo.ui.setconfig('ui', 'forcemerge', tool, 'update') | 6189 repo.ui.setconfig('ui', 'forcemerge', tool, 'update') |
| 6191 | 6190 |
| 6192 if clean: | 6191 if clean: |
| 6193 ret = hg.clean(repo, rev) | 6192 ret = hg.clean(repo, rev) |