This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12014

filemerge: remove unused arguments from `_merge()`
ClosedPublic

Authored by martinvonz on Jan 21 2022, 6:31 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGf970bc616ebc: filemerge: remove unused arguments from `_merge()`

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jan 21 2022, 6:31 PM
Alphare accepted this revision.Jan 24 2022, 4:54 AM
This revision is now accepted and ready to land.Jan 24 2022, 4:54 AM
martinvonz added a commit: rHGf970bc616ebc: filemerge: remove unused arguments from `_merge()`.Jan 24 2022, 12:29 PM
Closed by commit rHGf970bc616ebc: filemerge: remove unused arguments from `_merge()` (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (26 lines)

Diff 31827

mercurial/filemerge.py

b'conflict for %s\n' b'conflict for %s\n'
) )
% (tool, uipathfn(fcd.path())) % (tool, uipathfn(fcd.path()))
) )
return False return False
return True return True
def _merge(repo, mynode, fcd, fco, fca, toolconf, backup, labels, mode): def _merge(repo, fcd, fco, fca, labels, mode):
""" """
Uses the internal non-interactive simple merge algorithm for merging Uses the internal non-interactive simple merge algorithm for merging
files. It will fail if there are any conflicts and leave markers in 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 the partially merged file. Markers will have two sections, one for each side
of merge, unless mode equals 'union' which suppresses the markers.""" of merge, unless mode equals 'union' which suppresses the markers."""
ui = repo.ui ui = repo.ui
local = simplemerge.MergeInput(fcd) local = simplemerge.MergeInput(fcd)
), ),
precheck=_mergecheck, precheck=_mergecheck,
) )
def _iunion(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None): def _iunion(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None):
""" """
Uses the internal non-interactive simple merge algorithm for merging Uses the internal non-interactive simple merge algorithm for merging
files. It will use both left and right sides for conflict regions. files. It will use both left and right sides for conflict regions.
No markers are inserted.""" No markers are inserted."""
return _merge( return _merge(repo, fcd, fco, fca, labels, b'union')
repo, mynode, fcd, fco, fca, toolconf, backup, labels, b'union'
)
@internaltool( @internaltool(
b'merge', b'merge',
fullmerge, fullmerge,
_( _(
b"warning: conflicts while merging %s! " b"warning: conflicts while merging %s! "
b"(edit, then use 'hg resolve --mark')\n" b"(edit, then use 'hg resolve --mark')\n"
), ),
precheck=_mergecheck, precheck=_mergecheck,
) )
def _imerge(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None): def _imerge(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None):
""" """
Uses the internal non-interactive simple merge algorithm for merging Uses the internal non-interactive simple merge algorithm for merging
files. It will fail if there are any conflicts and leave markers in 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 the partially merged file. Markers will have two sections, one for each side
of merge.""" of merge."""
return _merge( return _merge(repo, fcd, fco, fca, labels, b'merge')
repo, mynode, fcd, fco, fca, toolconf, backup, labels, b'merge'
)
@internaltool( @internaltool(
b'merge3', b'merge3',
fullmerge, fullmerge,
_( _(
b"warning: conflicts while merging %s! " b"warning: conflicts while merging %s! "
b"(edit, then use 'hg resolve --mark')\n" b"(edit, then use 'hg resolve --mark')\n"
), ),
precheck=_mergecheck, precheck=_mergecheck,
) )
def _imerge3(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None): def _imerge3(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None):
""" """
Uses the internal non-interactive simple merge algorithm for merging Uses the internal non-interactive simple merge algorithm for merging
files. It will fail if there are any conflicts and leave markers in 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 the partially merged file. Marker will have three sections, one from each
side of the merge and one for the base content.""" side of the merge and one for the base content."""
if not labels: if not labels:
labels = _defaultconflictlabels labels = _defaultconflictlabels
if len(labels) < 3: if len(labels) < 3:
labels.append(b'base') labels.append(b'base')
return _merge( return _merge(repo, fcd, fco, fca, labels, b'merge3')
repo, mynode, fcd, fco, fca, toolconf, backup, labels, b'merge3'
)
@internaltool( @internaltool(
b'merge3-lie-about-conflicts', b'merge3-lie-about-conflicts',
fullmerge, fullmerge,
b'', b'',
precheck=_mergecheck, precheck=_mergecheck,
) )
files. It will fail if there are any conflicts and leave markers in 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 the partially merged file. The marker will have two sections, one with the
content from one side of the merge, and one with a diff from the base content from one side of the merge, and one with a diff from the base
content to the content on the other side. (experimental)""" content to the content on the other side. (experimental)"""
if not labels: if not labels:
labels = _defaultconflictlabels labels = _defaultconflictlabels
if len(labels) < 3: if len(labels) < 3:
labels.append(b'base') labels.append(b'base')
return _merge( return _merge(repo, fcd, fco, fca, labels, b'mergediff')
repo, mynode, fcd, fco, fca, toolconf, backup, labels, b'mergediff'
)
@internaltool(b'merge-local', mergeonly, precheck=_mergecheck) @internaltool(b'merge-local', mergeonly, precheck=_mergecheck)
def _imergelocal(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None): def _imergelocal(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None):
""" """
Like :merge, but resolve all conflicts non-interactively in favor Like :merge, but resolve all conflicts non-interactively in favor
of the local `p1()` changes.""" of the local `p1()` changes."""
return _merge( return _merge(repo, fcd, fco, fca, labels, b'local')
repo, mynode, fcd, fco, fca, toolconf, backup, labels, b'local'
)
@internaltool(b'merge-other', mergeonly, precheck=_mergecheck) @internaltool(b'merge-other', mergeonly, precheck=_mergecheck)
def _imergeother(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None): def _imergeother(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None):
""" """
Like :merge, but resolve all conflicts non-interactively in favor Like :merge, but resolve all conflicts non-interactively in favor
of the other `p2()` changes.""" of the other `p2()` changes."""
return _merge( return _merge(repo, fcd, fco, fca, labels, b'other')
repo, mynode, fcd, fco, fca, toolconf, backup, labels, b'other'
)
@internaltool( @internaltool(
b'tagmerge', b'tagmerge',
mergeonly, mergeonly,
_( _(
b"automatic tag merging of %s failed! " b"automatic tag merging of %s failed! "
b"(use 'hg resolve --tool :merge' or another merge " b"(use 'hg resolve --tool :merge' or another merge "