mercurial: comparison mercurial/merge.py

equal deleted inserted replaced

-:bca57ad9e630
+:1b8fd4af3318
 RECORD_FILE_VALUES = b'f'
 RECORD_LABELS = b'l'
 RECORD_OVERRIDE = b't'
 RECORD_UNSUPPORTED_MANDATORY = b'X'
 RECORD_UNSUPPORTED_ADVISORY = b'x'
+RECORD_RESOLVED_OTHER = b'R'
 MERGE_DRIVER_STATE_UNMARKED = b'u'
 MERGE_DRIVER_STATE_MARKED = b'm'
 MERGE_DRIVER_STATE_SUCCESS = b's'
 MERGE_RECORD_UNRESOLVED = b'u'
 MERGE_RECORD_RESOLVED = b'r'
 MERGE_RECORD_UNRESOLVED_PATH = b'pu'
 MERGE_RECORD_RESOLVED_PATH = b'pr'
 MERGE_RECORD_DRIVER_RESOLVED = b'd'
+# represents that the file was automatically merged in favor
+# of other version. This info is used on commit.
+MERGE_RECORD_MERGED_OTHER = b'o'
 ACTION_FORGET = b'f'
 ACTION_REMOVE = b'r'
 ACTION_ADD = b'a'
 ACTION_GET = b'g'
 ACTION_LOCAL_DIR_RENAME_GET = b'dg'
 ACTION_DIR_RENAME_MOVE_LOCAL = b'dm'
 ACTION_KEEP = b'k'
 ACTION_EXEC = b'e'
 ACTION_CREATED_MERGE = b'cm'
+# GET the other/remote side and store this info in mergestate
+ACTION_GET_OTHER_AND_STORE = b'gs'
 class mergestate(object):
 '''track 3-way merge state of individual files
 elif rtype in (
 RECORD_MERGED,
 RECORD_CHANGEDELETE_CONFLICT,
 RECORD_PATH_CONFLICT,
 RECORD_MERGE_DRIVER_MERGE,
+RECORD_RESOLVED_OTHER,
 ):
 bits = record.split(b'\0')
 self._state[bits[0]] = bits[1:]
 elif rtype == RECORD_FILE_VALUES:
 filename, rawextras = record.split(b'\0', 1)
 # Path conflicts. These are stored in 'P' records.  The current
 # resolution state ('pu' or 'pr') is stored within the record.
 records.append(
 (RECORD_PATH_CONFLICT, b'\0'.join([filename] + v))
 )
+elif v[0] == MERGE_RECORD_MERGED_OTHER:
+records.append(
+(RECORD_RESOLVED_OTHER, b'\0'.join([filename] + v))
+)
 elif v[1] == nullhex or v[6] == nullhex:
 # Change/Delete or Delete/Change conflicts. These are stored in
 # 'C' records. v[1] is the local file, and is nullhex when the
 # file is deleted locally ('dc'). v[6] is the remote file, and
 # is nullhex when the file is deleted remotely ('cd').
 forigin: origin of the file ('l' or 'r' for local/remote)
 """
 self._state[path] = [MERGE_RECORD_UNRESOLVED_PATH, frename, forigin]
 self._dirty = True
+def addmergedother(self, path):
+self._state[path] = [MERGE_RECORD_MERGED_OTHER, nullhex, nullhex]
+self._dirty = True
 def __contains__(self, dfile):
 return dfile in self._state
 def __getitem__(self, dfile):
 return self._state[dfile][0]
 return self._stateextras.setdefault(filename, {})
 def _resolve(self, preresolve, dfile, wctx):
 """rerun merge process for file path `dfile`"""
 if self[dfile] in (MERGE_RECORD_RESOLVED, MERGE_RECORD_DRIVER_RESOLVED):
+return True, 0
+if self._state[dfile][0] == MERGE_RECORD_MERGED_OTHER:
 return True, 0
 stateentry = self._state[dfile]
 state, localkey, lfile, afile, anode, ofile, onode, flags = stateentry
 octx = self._repo[self._other]
 extras = self.extras(dfile)
 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 r e'.split())
+nonconflicttypes = set(b'a am c cm f g gs r e'.split())
 # We mutate the items in the dict during iteration, so iterate
 # over a copy.
 for f, action in list(actions.items()):
 if narrowmatch(f):
 pass
 (fl2,),
 b'update permissions',
 )
 else:
 actions[f] = (
-ACTION_GET,
+ACTION_GET_OTHER_AND_STORE
+if branchmerge
+else ACTION_GET,
 (fl2, False),
 b'remote is newer',
 )
 elif nol and n2 == a:  # remote only changed 'x'
 actions[f] = (ACTION_EXEC, (fl2,), b'update permissions')
 elif nol and n1 == a:  # local only changed 'x'
-actions[f] = (ACTION_GET, (fl1, False), b'remote is newer')
+actions[f] = (
+ACTION_GET_OTHER_AND_STORE
+if branchmerge
+else ACTION_GET,
+(fl1, False),
+b'remote is newer',
+)
 else:  # both changed something
 actions[f] = (
 ACTION_MERGE,
 (f, f, f, False, pa.node()),
 b'versions differ',
 if renamedelete is None or len(renamedelete) < len(renamedelete1):
 renamedelete = renamedelete1
 for f, a in sorted(pycompat.iteritems(actions)):
 m, args, msg = a
+if m == ACTION_GET_OTHER_AND_STORE:
+m = ACTION_GET
 repo.ui.debug(b' %s: %s -> %s\n' % (f, msg, m))
 if f in fbids:
 d = fbids[f]
 if m in d:
 d[m].append(a)
 ACTION_MERGE,
 ACTION_EXEC,
 ACTION_KEEP,
 ACTION_PATH_CONFLICT,
 ACTION_PATH_CONFLICT_RESOLVE,
+ACTION_GET_OTHER_AND_STORE,
 )
 }
 def applyupdates(
 _prefetchfiles(repo, mctx, actions)
 updated, merged, removed = 0, 0, 0
 ms = mergestate.clean(repo, wctx.p1().node(), mctx.node(), labels)
+# add ACTION_GET_OTHER_AND_STORE to mergestate
+for e in actions[ACTION_GET_OTHER_AND_STORE]:
+ms.addmergedother(e[0])
 moves = []
 for m, l in actions.items():
 l.sort()
 # 'cd' and 'dc' actions are treated like other merge conflicts
 ACTION_GET,
 ACTION_KEEP,
 ACTION_EXEC,
 ACTION_REMOVE,
 ACTION_PATH_CONFLICT_RESOLVE,
+ACTION_GET_OTHER_AND_STORE,
 ):
 msg = _(b"conflicting changes")
 hint = _(b"commit or update --clean to discard changes")
 raise error.Abort(msg, hint=hint)
 for f, (m, args, msg) in pycompat.iteritems(actionbyfile):
 if m not in actions:
 actions[m] = []
 actions[m].append((f, args, msg))
+# ACTION_GET_OTHER_AND_STORE is a ACTION_GET + store in mergestate
+for e in actions[ACTION_GET_OTHER_AND_STORE]:
+actions[ACTION_GET].append(e)
 if not util.fscasesensitive(repo.path):
 # check collision between files only in p2 for clean update
 if not branchmerge and (
 force or not wc.dirty(missing=True, branch=False)
 ):

changeset 44687	1b8fd4af3318
parent 44452	9d2b2df2c2ba
child 44856	b7808443ed6a