Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 45579:c1b603cdc95a
merge: add a higher-level update() for the common `hg update` use case
This is different from the `update()` function that I just made
private. The new function is specifically for the normal `hg update`
use case. It doesn't do a merge and it doesn't do a clean (forced)
update.
Differential Revision: https://phab.mercurial-scm.org/D9066
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 21 Sep 2020 09:57:29 -0700 |
| parents | 2c86b9587740 |
| children | 76d79b80d953 |
line wrap: on
line diff
--- a/mercurial/merge.py Wed Sep 23 15:16:35 2020 +0200 +++ b/mercurial/merge.py Mon Sep 21 09:57:29 2020 -0700 @@ -2056,6 +2056,28 @@ ) +def update(ctx, updatecheck=None, wc=None): + """Do a regular update to the given commit, aborting if there are conflicts. + + The 'updatecheck' argument can be used to control what to do in case of + conflicts. + + Note: This is a new, higher-level update() than the one that used to exist + in this module. That function is now called _update(). You can hopefully + replace your callers to use this new update(), or clean_update(), merge(), + revert_to(), or graft(). + """ + return _update( + ctx.repo(), + ctx.rev(), + branchmerge=False, + force=False, + labels=[b'working copy', b'destination'], + updatecheck=updatecheck, + wc=wc, + ) + + def clean_update(ctx, wc=None): """Do a clean update to the given commit.