Mercurial: mercurial/merge.py comparison

comparison mercurial/merge.py @ 43106:d783f945a701

py3: finish porting iteritems() to pycompat and remove source transformer This commit finishes porting .iteritems() to pycompat.iteritems() for the mercurial package. The translation of .iteritems() to .items() was the last conversion performed by the source transformer. With the porting to pycompat complete, we no longer have a need for the source transformer. So the source transformer has been removed. Good riddance! The code base is now compatible with Python 2 and Python 3. For the record, as the person who introduced the source transformer, it brings me joy to delete it. It accomplished its goal to facilitate a port to Python 3 without overly burdening people on some painful low-level differences between Python 2 and 3. It is unfortunate we still have to wallpaper over many differences with the pycompat shim. But it is what it is. Differential Revision: https://phab.mercurial-scm.org/D7015

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Mon, 07 Oct 2019 00:04:04 -0400
parents	74802979dd9d
children	8ff1ecfadcd1

comparison

equal deleted inserted replaced

-:649d3ac37a12
+:d783f945a701
 # Write out state items. In all cases, the value of the state map entry
 # is written as the contents of the record. The record type depends on
 # the type of state that is stored, and capital-letter records are used
 # to prevent older versions of Mercurial that do not support the feature
 # from loading them.
-for filename, v in self._state.iteritems():
+for filename, v in pycompat.iteritems(self._state):
 if v[0] == MERGE_RECORD_DRIVER_RESOLVED:
 # Driver-resolved merge. These are stored in 'D' records.
 records.append(
 (RECORD_MERGE_DRIVER_MERGE, b'\0'.join([filename] + v))
 )
 (RECORD_CHANGEDELETE_CONFLICT, b'\0'.join([filename] + v))
 )
 else:
 # Normal files.  These are stored in 'F' records.
 records.append((RECORD_MERGED, b'\0'.join([filename] + v)))
-for filename, extras in sorted(self._stateextras.iteritems()):
+for filename, extras in sorted(pycompat.iteritems(self._stateextras)):
 rawextras = b'\0'.join(
-b'%s\0%s' % (k, v) for k, v in extras.iteritems()
+b'%s\0%s' % (k, v) for k, v in pycompat.iteritems(extras)
 )
 records.append(
 (RECORD_FILE_VALUES, b'%s\0%s' % (filename, rawextras))
 )
 if self._labels is not None:
 return self._mdstate
 def unresolved(self):
 """Obtain the paths of unresolved files."""
-for f, entry in self._state.iteritems():
+for f, entry in pycompat.iteritems(self._state):
 if entry[0] in (
 MERGE_RECORD_UNRESOLVED,
 MERGE_RECORD_UNRESOLVED_PATH,
 ):
 yield f
 ACTION_FORGET: [],
 ACTION_ADD: [],
 ACTION_ADD_MODIFIED: [],
 ACTION_GET: [],
 }
-for f, (r, action) in self._results.iteritems():
+for f, (r, action) in pycompat.iteritems(self._results):
 if action is not None:
 actions[action].append((f, None, b"merge result"))
 return actions
 def recordactions(self):
 abortconflicts.update(conflicts)
 elif config == b'warn':
 warnconflicts.update(conflicts)
 checkunknowndirs = _unknowndirschecker()
-for f, (m, args, msg) in actions.iteritems():
+for f, (m, args, msg) in pycompat.iteritems(actions):
 if m in (ACTION_CREATED, ACTION_DELETED_CHANGED):
 if _checkunknownfile(repo, wctx, mctx, f):
 fileconflicts.add(f)
 elif pathconfig and f not in wctx:
 path = checkunknowndirs(repo, wctx, f)
 ignoredconflicts = {c for c in allconflicts if repo.dirstate._ignore(c)}
 unknownconflicts = allconflicts - ignoredconflicts
 collectconflicts(ignoredconflicts, ignoredconfig)
 collectconflicts(unknownconflicts, unknownconfig)
 else:
-for f, (m, args, msg) in actions.iteritems():
+for f, (m, args, msg) in pycompat.iteritems(actions):
 if m == ACTION_CREATED_MERGE:
 fl2, anc = args
 different = _checkunknownfile(repo, wctx, mctx, f)
 if repo.dirstate._ignore(f):
 config = ignoredconfig
 if repo.wvfs.isfileorlink(f):
 repo.ui.warn(_(b"%s: replacing untracked file\n") % f)
 else:
 repo.ui.warn(_(b"%s: replacing untracked files in directory\n") % f)
-for f, (m, args, msg) in actions.iteritems():
+for f, (m, args, msg) in pycompat.iteritems(actions):
 if m == ACTION_CREATED:
 backup = (
 f in fileconflicts
 or f in pathconflicts
 or any(p in pathconflicts for p in util.finddirs(f))
 narrowmatch = repo.narrowmatch()
 if not narrowmatch.always():
 wmf = wmf.matches(narrowmatch)
 if actions:
 narrowactions = {}
-for m, actionsfortype in actions.iteritems():
+for m, actionsfortype in pycompat.iteritems(actions):
 narrowactions[m] = []
 for (f, args, msg) in actionsfortype:
 if narrowmatch(f):
 narrowactions[m].append((f, args, msg))
 actions = narrowactions
 # total m1-vs-m2 diff to just those files. This has significant
 # performance benefits in large repositories.
 relevantfiles = set(ma.diff(m2).keys())
 # For copied and moved files, we need to add the source file too.
-for copykey, copyvalue in copy.iteritems():
+for copykey, copyvalue in pycompat.iteritems(copy):
 if copyvalue in relevantfiles:
 relevantfiles.add(copykey)
 for movedirkey in movewithdir:
 relevantfiles.add(movedirkey)
 filesmatcher = scmutil.matchfiles(repo, relevantfiles)
 matcher = matchmod.intersectmatchers(matcher, filesmatcher)
 diff = m1.diff(m2, match=matcher)
 actions = {}
-for f, ((n1, fl1), (n2, fl2)) in diff.iteritems():
+for f, ((n1, fl1), (n2, fl2)) in pycompat.iteritems(diff):
 if n1 and n2:  # file exists on both local and remote side
 if f not in ma:
 fa = copy.get(f, None)
 if fa is not None:
 actions[f] = (
 if diverge is None or len(diverge1) < len(diverge):
 diverge = diverge1
 if renamedelete is None or len(renamedelete) < len(renamedelete1):
 renamedelete = renamedelete1
-for f, a in sorted(actions.iteritems()):
+for f, a in sorted(pycompat.iteritems(actions)):
 m, args, msg = a
 repo.ui.debug(b' %s: %s -> %s\n' % (f, msg, m))
 if f in fbids:
 d = fbids[f]
 if m in d:
 removed += msremoved
 extraactions = ms.actions()
 if extraactions:
 mfiles = set(a[0] for a in actions[ACTION_MERGE])
-for k, acts in extraactions.iteritems():
+for k, acts in pycompat.iteritems(extraactions):
 actions[k].extend(acts)
 if k == ACTION_GET and wantfiledata:
 # no filedata until mergestate is updated to provide it
 for a in acts:
 getfiledata[a[0]] = None
 matcher=matcher,
 mergeforce=mergeforce,
 )
 if updatecheck == UPDATECHECK_NO_CONFLICT:
-for f, (m, args, msg) in actionbyfile.iteritems():
+for f, (m, args, msg) in pycompat.iteritems(actionbyfile):
 if m not in (
 ACTION_GET,
 ACTION_KEEP,
 ACTION_EXEC,
 ACTION_REMOVE,
 else:
 del actionbyfile[f]
 # Convert to dictionary-of-lists format
 actions = emptyactions()
-for f, (m, args, msg) in actionbyfile.iteritems():
+for f, (m, args, msg) in pycompat.iteritems(actionbyfile):
 if m not in actions:
 actions[m] = []
 actions[m].append((f, args, msg))
 if not util.fscasesensitive(repo.path):
 _checkcollision(repo, p2.manifest(), None)
 else:
 _checkcollision(repo, wc.manifest(), actions)
 # divergent renames
-for f, fl in sorted(diverge.iteritems()):
+for f, fl in sorted(pycompat.iteritems(diverge)):
 repo.ui.warn(
 _(
 b"note: possible conflict - %s was renamed "
 b"multiple times to:\n"
 )
 )
 for nf in sorted(fl):
 repo.ui.warn(b" %s\n" % nf)
 # rename and delete
-for f, fl in sorted(renamedelete.iteritems()):
+for f, fl in sorted(pycompat.iteritems(renamedelete)):
 repo.ui.warn(
 _(
 b"note: possible conflict - %s was deleted "
 b"and renamed to:\n"
 )

Mercurial > hg

comparison mercurial/merge.py @ 43106:d783f945a701