D6879: merge: check argument value with if/raise instead of an assert
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Wed Sep 25 15:57:30 UTC 2019
Closed by commit rHG71bb9363818c: merge: check argument value with if/raise instead of an assert (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/D6879?vs=16607&id=16612
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6879/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6879
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1998,10 +1998,15 @@
# updatecheck='abort' to better suppport some of these callers.
if updatecheck is None:
updatecheck = UPDATECHECK_LINEAR
- assert updatecheck in (UPDATECHECK_NONE,
+ if updatecheck not in (UPDATECHECK_NONE,
UPDATECHECK_LINEAR,
UPDATECHECK_NO_CONFLICT,
- )
+ ):
+ raise ValueError(r'Invalid updatecheck %r (can accept %r)' % (
+ updatecheck, (UPDATECHECK_NONE,
+ UPDATECHECK_LINEAR,
+ UPDATECHECK_NO_CONFLICT,
+ )))
# If we're doing a partial update, we need to skip updating
# the dirstate, so make a note of any partial-ness to the
# update here.
To: durin42, #hg-reviewers, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list