Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 26629:ae5f7be2b4ab
destupdate: include the 'check' logic
After moving logic from 'merge.update' into 'destutil.destupdate', we are now
moving logic from 'command.update' in 'destutil.destupdate'. This will make the
function actually useful in predicting (and altering) the update behavior.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 29 Sep 2015 00:18:49 -0700 |
| parents | 45b86dbabbda |
| children | 92d67e5729b9 |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Oct 05 03:50:47 2015 -0700 +++ b/mercurial/commands.py Tue Sep 29 00:18:49 2015 -0700 @@ -6595,10 +6595,8 @@ if check: cmdutil.bailifchanged(repo, merge=False) - if rev is None: - rev = repo[repo[None].branch()].rev() - elif rev is None: - rev = destutil.destupdate(repo, clean=clean) + if rev is None: + rev = destutil.destupdate(repo, clean=clean, check=check) repo.ui.setconfig('ui', 'forcemerge', tool, 'update')