Mercurial > hg
comparison mercurial/mergestate.py @ 45277:c515c54f6530
merge: remove no longer required ACTION_GET_OTHER_AND_STORE
In 1b8fd4af33189c84feadb47c74d659ec31cde3b9 I (ab)used merge actions to pass
info from manifestmerge() to applyupdates() and store info in mergestate.
In previous patches, we introduced a separate return value from manifestmerge()
and calculateupdates() and an argument to applyupdates() which achieved the same
thing.
Let's remove this no longer required messy code.
Differential Revision: https://phab.mercurial-scm.org/D8744
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Tue, 14 Jul 2020 16:40:28 +0530 |
parents | a5be403dd7a0 |
children | fa18b02df8dd |
comparison
equal
deleted
inserted
replaced
45276:cb6a72dc0511 | 45277:c515c54f6530 |
---|---|
111 ACTION_LOCAL_DIR_RENAME_GET = b'dg' | 111 ACTION_LOCAL_DIR_RENAME_GET = b'dg' |
112 ACTION_DIR_RENAME_MOVE_LOCAL = b'dm' | 112 ACTION_DIR_RENAME_MOVE_LOCAL = b'dm' |
113 ACTION_KEEP = b'k' | 113 ACTION_KEEP = b'k' |
114 ACTION_EXEC = b'e' | 114 ACTION_EXEC = b'e' |
115 ACTION_CREATED_MERGE = b'cm' | 115 ACTION_CREATED_MERGE = b'cm' |
116 # GET the other/remote side and store this info in mergestate | |
117 ACTION_GET_OTHER_AND_STORE = b'gs' | |
118 | 116 |
119 | 117 |
120 class mergestate(object): | 118 class mergestate(object): |
121 '''track 3-way merge state of individual files | 119 '''track 3-way merge state of individual files |
122 | 120 |