Mercurial > public > mercurial-scm > hg-stable
diff mercurial/mergestate.py @ 45478:bb9888d32601
merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent
There are files which were deleted/not present in working copy parent but were
present on other side of merge. On merge, we might decide to keep them deleted.
We want to track such cases more closely, rather all kind of cases which results
from some kind of merging logic.
We do have `ACTION_KEEP` but having a dedicated action for the absent case is
more cleaner.
Initially I named the action as `ACTION_KEEP_DELETED` but later realized that
file can be not-present because of other reasons than deletion like rename,
hence decided to use more generic name `ACTION_KEEP_ABSENT`.
Differential Revision: https://phab.mercurial-scm.org/D8974
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Tue, 01 Sep 2020 17:08:26 +0530 |
| parents | 05d19ca33b33 |
| children | aad11a26a054 |
line wrap: on
line diff
--- a/mercurial/mergestate.py Mon Sep 14 13:51:39 2020 +0530 +++ b/mercurial/mergestate.py Tue Sep 01 17:08:26 2020 +0530 @@ -120,6 +120,10 @@ ACTION_LOCAL_DIR_RENAME_GET = b'dg' ACTION_DIR_RENAME_MOVE_LOCAL = b'dm' ACTION_KEEP = b'k' +# the file was absent on local side before merge and we should +# keep it absent (absent means file not present, it can be a result +# of file deletion, rename etc.) +ACTION_KEEP_ABSENT = b'ka' ACTION_EXEC = b'e' ACTION_CREATED_MERGE = b'cm' @@ -837,6 +841,10 @@ for f, args, msg in actions.get(ACTION_KEEP, []): pass + # keep deleted + for f, args, msg in actions.get(ACTION_KEEP_ABSENT, []): + pass + # get for f, args, msg in actions.get(ACTION_GET, []): if branchmerge: