This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6878

hg: have `updatetotally` more thoroughly check updatecheck argument (API)
ClosedPublic

Authored by durin42 on Sep 25 2019, 11:10 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGee1ef76d7339: hg: have `updatetotally` more thoroughly check updatecheck argument (API)
Summary

.. api::

`mercurial.hg.updatetotally` is now more thorough about checking
its `updatecheck` keyword argument. Previously invalid values
would have used the configured default updatecheck method, but now
will raise ValueError.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/hg.py (14 lines)

Diff 16611

mercurial/hg.py

repo.vfs.unlinkpath('graftstate', ignoremissing=True) repo.vfs.unlinkpath('graftstate', ignoremissing=True)
if show_stats: if show_stats:
_showstats(repo, stats, quietempty) _showstats(repo, stats, quietempty)
return stats.unresolvedcount > 0 return stats.unresolvedcount > 0
# naming conflict in updatetotally() # naming conflict in updatetotally()
_clean = clean _clean = clean
_VALID_UPDATECHECKS = {mergemod.UPDATECHECK_ABORT,
mergemod.UPDATECHECK_NONE,
mergemod.UPDATECHECK_LINEAR,
mergemod.UPDATECHECK_NO_CONFLICT,
}
def updatetotally(ui, repo, checkout, brev, clean=False, updatecheck=None): def updatetotally(ui, repo, checkout, brev, clean=False, updatecheck=None):
"""Update the working directory with extra care for non-file components """Update the working directory with extra care for non-file components
This takes care of non-file components below: This takes care of non-file components below:
:bookmark: might be advanced or (in)activated :bookmark: might be advanced or (in)activated
This takes arguments below: This takes arguments below:
* LINEAR: check that update is linear before merging working directory * LINEAR: check that update is linear before merging working directory
changes into destination changes into destination
* NO_CONFLICT: check that the update does not result in file merges * NO_CONFLICT: check that the update does not result in file merges
This returns whether conflict is detected at updating or not. This returns whether conflict is detected at updating or not.
""" """
if updatecheck is None: if updatecheck is None:
updatecheck = ui.config('commands', 'update.check') updatecheck = ui.config('commands', 'update.check')
if updatecheck not in (mergemod.UPDATECHECK_ABORT, if updatecheck not in _VALID_UPDATECHECKS:
mergemod.UPDATECHECK_NONE,
mergemod.UPDATECHECK_LINEAR,
mergemod.UPDATECHECK_NO_CONFLICT):
# If not configured, or invalid value configured # If not configured, or invalid value configured
updatecheck = mergemod.UPDATECHECK_LINEAR updatecheck = mergemod.UPDATECHECK_LINEAR
if updatecheck not in _VALID_UPDATECHECKS:
raise ValueError(r'Invalid updatecheck value %r (can accept %r)' % (
updatecheck, _VALID_UPDATECHECKS))
with repo.wlock(): with repo.wlock():
movemarkfrom = None movemarkfrom = None
warndest = False warndest = False
if checkout is None: if checkout is None:
updata = destutil.destupdate(repo, clean=clean) updata = destutil.destupdate(repo, clean=clean)
checkout, movemarkfrom, brev = updata checkout, movemarkfrom, brev = updata
warndest = True warndest = True