mercurial: comparison mercurial/merge.py

equal deleted inserted replaced

-:e8ea403b1c46
+:288de6f5d724
 # Copyright 2006, 2007 Olivia Mackall <olivia@selenic.com>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
-from __future__ import absolute_import
 import collections
-import errno
 import struct
 from .i18n import _
 from .node import nullrev
 from .thirdparty import attr
 and repo.dirstate.normalize(f) not in repo.dirstate
 and mctx[f2].cmp(wctx[f])
 )
-class _unknowndirschecker(object):
+class _unknowndirschecker:
 """
 Look for any unknown files or directories that may have a path conflict
 with a file.  If any path prefix of the file exists as a file or link,
 then it conflicts.  If the file itself is a directory that contains any
 file that is not tracked, then it conflicts.
 else:
 msg = _(b'conflict in file \'%s\' is outside narrow clone')
 raise error.StateError(msg % f)
-class mergeresult(object):
+class mergeresult:
 """An object representing result of merging manifests.
 It has information about what actions need to be performed on dirstate
 mapping of divergent renames and other such cases."""
 if sort:
 for f in sorted(self._actionmapping[a]):
 args, msg = self._actionmapping[a][f]
 yield f, args, msg
 else:
-for f, (args, msg) in pycompat.iteritems(
+for f, (args, msg) in self._actionmapping[a].items():
-self._actionmapping[a]
-):
 yield f, args, msg
 def len(self, actions=None):
 """returns number of files which needs actions
 return sum(len(self._actionmapping[a]) for a in actions)
 def filemap(self, sort=False):
 if sorted:
-for key, val in sorted(pycompat.iteritems(self._filemapping)):
+for key, val in sorted(self._filemapping.items()):
 yield key, val
 else:
-for key, val in pycompat.iteritems(self._filemapping):
+for key, val in self._filemapping.items():
 yield key, val
 def addcommitinfo(self, filename, key, value):
 """adds key-value information about filename which will be required
 while committing this merge"""
 @property
 def actionsdict(self):
 """returns a dictionary of actions to be perfomed with action as key
 and a list of files and related arguments as values"""
 res = collections.defaultdict(list)
-for a, d in pycompat.iteritems(self._actionmapping):
+for a, d in self._actionmapping.items():
-for f, (args, msg) in pycompat.iteritems(d):
+for f, (args, msg) in d.items():
 res[a].append((f, args, msg))
 return res
 def setactions(self, actions):
 self._filemapping = actions
 self._actionmapping = collections.defaultdict(dict)
-for f, (act, data, msg) in pycompat.iteritems(self._filemapping):
+for f, (act, data, msg) in self._filemapping.items():
 self._actionmapping[act][f] = data, msg
 def hasconflicts(self):
 """tells whether this merge resulted in some actions which can
 result in conflicts or not"""
 # 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 pycompat.iteritems(branch_copies1.copy):
+for copykey, copyvalue in branch_copies1.copy.items():
 if copyvalue in relevantfiles:
 relevantfiles.add(copykey)
 for movedirkey in branch_copies1.movewithdir:
 relevantfiles.add(movedirkey)
 filesmatcher = scmutil.matchfiles(repo, relevantfiles)
 matcher = matchmod.intersectmatchers(matcher, filesmatcher)
 diff = m1.diff(m2, match=matcher)
-for f, ((n1, fl1), (n2, fl2)) in pycompat.iteritems(diff):
+for f, ((n1, fl1), (n2, fl2)) in diff.items():
 if n1 and n2:  # file exists on both local and remote side
 if f not in ma:
 # TODO: what if they're renamed from different sources?
 fa = branch_copies1.copy.get(
 f, None
 def _getcwd():
 try:
 return encoding.getcwd()
-except OSError as err:
+except FileNotFoundError:
-if err.errno == errno.ENOENT:
+return None
-return None
-raise
 def batchremove(repo, wctx, actions):
 """apply removes to the working directory
 ],
 )
 @attr.s(frozen=True)
-class updateresult(object):
+class updateresult:
 updatedcount = attr.ib()
 mergedcount = attr.ib()
 removedcount = attr.ib()
 unresolvedcount = attr.ib()
 updated, merged, removed = 0, 0, 0
 ms = wctx.mergestate(clean=True)
 ms.start(wctx.p1().node(), mctx.node(), labels)
-for f, op in pycompat.iteritems(mresult.commitinfo):
+for f, op in mresult.commitinfo.items():
 # the other side of filenode was choosen while merging, store this in
 # mergestate so that it can be reused on commit
 ms.addcommitinfo(f, op)
 num_no_op = mresult.len(mergestatemod.MergeAction.NO_OP_ACTIONS)
 _checkcollision(repo, p2.manifest(), None)
 else:
 _checkcollision(repo, wc.manifest(), mresult)
 # divergent renames
-for f, fl in sorted(pycompat.iteritems(mresult.diverge)):
+for f, fl in sorted(mresult.diverge.items()):
 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(pycompat.iteritems(mresult.renamedelete)):
+for f, fl in sorted(mresult.renamedelete.items()):
 repo.ui.warn(
 _(
 b"note: possible conflict - %s was deleted "
 b"and renamed to:\n"
 )
 labels=labels,
 )
 if updatedirstate:
 if extraactions:
-for k, acts in pycompat.iteritems(extraactions):
+for k, acts in extraactions.items():
 for a in acts:
 mresult.addfile(a[0], k, *a[1:])
 if k == mergestatemod.ACTION_GET and wantfiledata:
 # no filedata until mergestate is updated to provide it
 for a in acts:
 # the dirstate content anyway, no need to put cache
 # information.
 getfiledata = None
 else:
 now_sec = now[0]
-for f, m in pycompat.iteritems(getfiledata):
+for f, m in getfiledata.items():
 if m is not None and m[2][0] >= now_sec:
 ambiguous_mtime[f] = (m[0], m[1], None)
-for f, m in pycompat.iteritems(ambiguous_mtime):
+for f, m in ambiguous_mtime.items():
 getfiledata[f] = m
 repo.setparents(fp1, fp2)
 mergestatemod.recordupdates(
 repo, mresult.actionsdict, branchmerge, getfiledata

branch	stable
changeset 49366	288de6f5d724
parent 49306	2e726c934fcd
parent 49344	0cc5f74ff7f0
child 49883	becd16690cbe