[Updated] [+ ] D8885: merge: use ACTION_* constants instead of values in _filternarrowactions()
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Thu Aug 6 11:15:59 UTC 2020
pulkit updated this revision to Diff 22306.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D8885?vs=22266&id=22306
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D8885/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D8885
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
@@ -530,8 +530,18 @@
Raise an exception if the merge cannot be completed because the repo is
narrowed.
"""
- nooptypes = {b'k'} # TODO: handle with nonconflicttypes
- nonconflicttypes = set(b'a am c cm f g gs r e'.split())
+ # TODO: handle with nonconflicttypes
+ nooptypes = {mergestatemod.ACTION_KEEP}
+ nonconflicttypes = {
+ mergestatemod.ACTION_ADD,
+ mergestatemod.ACTION_ADD_MODIFIED,
+ mergestatemod.ACTION_CREATED,
+ mergestatemod.ACTION_CREATED_MERGE,
+ mergestatemod.ACTION_FORGET,
+ mergestatemod.ACTION_GET,
+ mergestatemod.ACTION_REMOVE,
+ mergestatemod.ACTION_EXEC,
+ }
# We mutate the items in the dict during iteration, so iterate
# over a copy.
for f, action in list(mresult.actions.items()):
To: pulkit, #hg-reviewers
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200806/59c53878/attachment-0002.html>
More information about the Mercurial-patches
mailing list