D6878: hg: have `updatetotally` more thoroughly check updatecheck argument (API)
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Wed Sep 25 11:57:05 EDT 2019
Closed by commit rHGee1ef76d7339: hg: have `updatetotally` more thoroughly check updatecheck argument (API) (authored by durin42).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6878?vs=16606&id=16611
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6878/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6878
AFFECTED FILES
mercurial/hg.py
CHANGE DETAILS
diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -883,6 +883,12 @@
# naming conflict in updatetotally()
_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):
"""Update the working directory with extra care for non-file components
@@ -911,12 +917,12 @@
"""
if updatecheck is None:
updatecheck = ui.config('commands', 'update.check')
- if updatecheck not in (mergemod.UPDATECHECK_ABORT,
- mergemod.UPDATECHECK_NONE,
- mergemod.UPDATECHECK_LINEAR,
- mergemod.UPDATECHECK_NO_CONFLICT):
+ if updatecheck not in _VALID_UPDATECHECKS:
# If not configured, or invalid value configured
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():
movemarkfrom = None
warndest = False
To: durin42, #hg-reviewers, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list