mercurial: comparison mercurial/filemerge.py

equal deleted inserted replaced

-:da38519cbd10
+:ba34141f8dbb
 return filectx.changectx()[filectx.path()]
 else:
 return filectx
-def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None):
+def _premerge(repo, fcd, fco, fca, toolconf, backup, labels=None):
 tool, toolpath, binary, symlink, scriptfn = toolconf
 if symlink or fcd.isabsent() or fco.isabsent():
 return 1
-unused, unused, unused, backup = files
 ui = repo.ui
 validkeep = [b'keep', b'keep-merge3', b'keep-mergediff']
 )
 return False
 return True
-def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, mode):
+def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, backup, labels, mode):
 """
 Uses the internal non-interactive simple merge algorithm for merging
 files. It will fail if there are any conflicts and leave markers in
 the partially merged file. Markers will have two sections, one for each side
 of merge, unless mode equals 'union' which suppresses the markers."""
 b"warning: conflicts while merging %s! "
 b"(edit, then use 'hg resolve --mark')\n"
 ),
 precheck=_mergecheck,
 )
-def _iunion(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
+def _iunion(repo, mynode, orig, fcd, fco, fca, toolconf, backup, labels=None):
 """
 Uses the internal non-interactive simple merge algorithm for merging
 files. It will use both left and right sides for conflict regions.
 No markers are inserted."""
 return _merge(
-repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, b'union'
+repo, mynode, orig, fcd, fco, fca, toolconf, backup, labels, b'union'
 )
 @internaltool(
 b'merge',
 b"warning: conflicts while merging %s! "
 b"(edit, then use 'hg resolve --mark')\n"
 ),
 precheck=_mergecheck,
 )
-def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
+def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, backup, labels=None):
 """
 Uses the internal non-interactive simple merge algorithm for merging
 files. It will fail if there are any conflicts and leave markers in
 the partially merged file. Markers will have two sections, one for each side
 of merge."""
 return _merge(
-repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, b'merge'
+repo, mynode, orig, fcd, fco, fca, toolconf, backup, labels, b'merge'
 )
 @internaltool(
 b'merge3',
 b"warning: conflicts while merging %s! "
 b"(edit, then use 'hg resolve --mark')\n"
 ),
 precheck=_mergecheck,
 )
-def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
+def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, backup, labels=None):
 """
 Uses the internal non-interactive simple merge algorithm for merging
 files. It will fail if there are any conflicts and leave markers in
 the partially merged file. Marker will have three sections, one from each
 side of the merge and one for the base content."""
 if not labels:
 labels = _defaultconflictlabels
 if len(labels) < 3:
 labels.append(b'base')
-return _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels)
+return _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, backup, labels)
 @internaltool(
 b'merge3-lie-about-conflicts',
 fullmerge,
 b"(edit, then use 'hg resolve --mark')\n"
 ),
 precheck=_mergecheck,
 )
 def _imerge_diff(
-repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None
+repo, mynode, orig, fcd, fco, fca, toolconf, backup, labels=None
 ):
 """
 Uses the internal non-interactive simple merge algorithm for merging
 files. It will fail if there are any conflicts and leave markers in
 the partially merged file. The marker will have two sections, one with the
 if not labels:
 labels = _defaultconflictlabels
 if len(labels) < 3:
 labels.append(b'base')
 return _merge(
-repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, b'mergediff'
+repo,
+mynode,
+orig,
+fcd,
+fco,
+fca,
+toolconf,
+backup,
+labels,
+b'mergediff',
 )
 def _imergeauto(
 repo,
 orig,
 fcd,
 fco,
 fca,
 toolconf,
-files,
+backup,
 labels=None,
 localorother=None,
 ):
 """
 Generic driver for _imergelocal and _imergeother
 b"automatic tag merging of %s failed! "
 b"(use 'hg resolve --tool :merge' or another merge "
 b"tool of your choice)\n"
 ),
 )
-def _itagmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
+def _itagmerge(
+repo, mynode, orig, fcd, fco, fca, toolconf, backup, labels=None
+):
 """
 Uses the internal tag merge algorithm (experimental).
 """
 success, status = tagmerge.merge(repo, fcd, fco, fca)
 return success, status, False
 @internaltool(b'dump', fullmerge, binary=True, symlink=True)
-def _idump(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
+def _idump(repo, mynode, orig, fcd, fco, fca, toolconf, backup, labels=None):
 """
 Creates three versions of the files to merge, containing the
 contents of local, other and base. These files can then be used to
 perform a merge manually. If the file to be merged is named
 ``a.txt``, these files will accordingly be named ``a.txt.local``,
 repo.wwrite(fd + b".base", fca.data(), fca.flags())
 return False, 1, False
 @internaltool(b'forcedump', mergeonly, binary=True, symlink=True)
-def _forcedump(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
+def _forcedump(
+repo, mynode, orig, fcd, fco, fca, toolconf, backup, labels=None
+):
 """
 Creates three versions of the files as same as :dump, but omits premerge.
 """
 return _idump(
-repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=labels
+repo, mynode, orig, fcd, fco, fca, toolconf, backup, labels=labels
 )
-def _xmergeimm(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
+def _xmergeimm(
+repo, mynode, orig, fcd, fco, fca, toolconf, backup, labels=None
+):
 # In-memory merge simply raises an exception on all external merge tools,
 # for now.
 #
 # It would be possible to run most tools with temporary files, but this
 # raises the question of what to do if the user only partially resolves the
 ui, tmpl, defaults=templatekw.keywords, resources=tres
 )
 ui.status(t.renderdefault(props))
-def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels):
+def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, backup, labels):
 tool, toolpath, binary, symlink, scriptfn = toolconf
 uipathfn = scmutil.getuipathfn(repo)
 if fcd.isabsent() or fco.isabsent():
 repo.ui.warn(
 _(b'warning: %s cannot merge change/delete conflict for %s\n')
 % (tool, uipathfn(fcd.path()))
 )
 return False, 1, None
-unused, unused, unused, backup = files
 localpath = _workingpath(repo, fcd)
 args = _toolstr(repo.ui, tool, b"args")
 with _maketempfiles(
 repo, fco, fca, repo.wvfs.join(backup.path()), b"$output" in args
 )
 ui.warn(onfailure % fduipath)
 return True, 1, False
 backup = _makebackup(repo, ui, wctx, fcd)
-files = (None, None, None, backup)
 r = 1
 try:
 internalmarkerstyle = ui.config(b'ui', b'mergemarkers')
 if isexternal:
 markerstyle = _toolstr(ui, tool, b'mergemarkers')
 premergelabels = _formatlabels(
 repo, fcd, fco, fca, premergelabels, tool=labeltool
 )
 r = _premerge(
-repo, fcd, fco, fca, toolconf, files, labels=premergelabels
+repo, fcd, fco, fca, toolconf, backup, labels=premergelabels
 )
 # we're done if premerge was successful (r is 0)
 if not r:
 return not r, r, False
 orig,
 fcd,
 fco,
 fca,
 toolconf,
-files,
+backup,
 labels=formattedlabels,
 )
 if needcheck:
-r = _check(repo, r, ui, tool, fcd, files)
+r = _check(repo, r, ui, tool, fcd, backup)
 if r:
 if onfailure:
 if wctx.isinmemory():
 raise error.InMemoryMergeConflictsError(
 re.MULTILINE,
 )
 )
-def _check(repo, r, ui, tool, fcd, files):
+def _check(repo, r, ui, tool, fcd, backup):
 fd = fcd.path()
 uipathfn = scmutil.getuipathfn(repo)
-unused, unused, unused, backup = files
 if not r and (
 _toolbool(ui, tool, b"checkconflicts")
 or b'conflicts' in _toollist(ui, tool, b"check")
 ):

changeset 48504	ba34141f8dbb
parent 48503	da38519cbd10
child 48505	40522aea2f27