This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8688

extdiff: remove unrequired do3way argument to diffpatch()
ClosedPublic

Authored by pulkit on Jul 7 2020, 5:27 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGd23881b17388: extdiff: remove unrequired do3way argument to diffpatch()
Summary

When we are diffing patches, there is no 3 way diff.

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

pulkit created this revision.Jul 7 2020, 5:27 AM
Alphare accepted this revision.Jul 15 2020, 11:57 AM
Alphare requested changes to this revision.Jul 15 2020, 11:59 AM
Alphare added inline comments.
hgext/extdiff.py
353

node1a -> node1 should not be in this patch

This revision now requires changes to proceed.Jul 15 2020, 11:59 AM
pulkit added inline comments.Jul 16 2020, 5:46 AM
hgext/extdiff.py
353

Oh yes.

pulkit added a commit: rHGd23881b17388: extdiff: remove unrequired do3way argument to diffpatch().Jul 16 2020, 9:21 AM
This revision was not accepted when it landed; it landed in state Needs Revision.
Closed by commit rHGd23881b17388: extdiff: remove unrequired do3way argument to diffpatch() (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 21933

hgext/extdiff.py

waitprocs.append(proc) waitprocs.append(proc)
if waitprocs: if waitprocs:
with ui.timeblockedsection(b'extdiff'): with ui.timeblockedsection(b'extdiff'):
for proc in waitprocs: for proc in waitprocs:
proc.wait() proc.wait()
def diffpatch(ui, repo, node1a, node2, tmproot, matcher, cmdline, do3way): def diffpatch(ui, repo, node1a, node2, tmproot, matcher, cmdline):
AlphareUnsubmitted
Not Done

node1a -> node1 should not be in this patch

Alphare: `node1a` -> `node1` should not be in this patch
pulkitAuthorUnsubmitted
Done

Oh yes.

pulkit: Oh yes.
template = b'hg-%h.patch' template = b'hg-%h.patch'
with formatter.nullformatter(ui, b'extdiff', {}) as fm: with formatter.nullformatter(ui, b'extdiff', {}) as fm:
cmdutil.export( cmdutil.export(
repo, repo,
[repo[node1a].rev(), repo[node2].rev()], [repo[node1a].rev(), repo[node2].rev()],
fm, fm,
fntemplate=repo.vfs.reljoin(tmproot, template), fntemplate=repo.vfs.reljoin(tmproot, template),
match=matcher, match=matcher,
) )
label1a = cmdutil.makefilename(repo[node1a], template) label1a = cmdutil.makefilename(repo[node1a], template)
label2 = cmdutil.makefilename(repo[node2], template) label2 = cmdutil.makefilename(repo[node2], template)
dir1a = repo.vfs.reljoin(tmproot, label1a) dir1a = repo.vfs.reljoin(tmproot, label1a)
dir2 = repo.vfs.reljoin(tmproot, label2) dir2 = repo.vfs.reljoin(tmproot, label2)
dir1b = None dir1b = None
label1b = None label1b = None
cmdline = formatcmdline( cmdline = formatcmdline(
cmdline, cmdline,
repo.root, repo.root,
do3way=do3way,
parent1=dir1a, parent1=dir1a,
plabel1=label1a, plabel1=label1a,
parent2=dir1b, parent2=dir1b,
plabel2=label1b, plabel2=label1b,
child=dir2, child=dir2,
# no 3way while comparing patches
do3way=False,
clabel=label2, clabel=label2,
) )
ui.debug(b'running %r in %s\n' % (pycompat.bytestr(cmdline), tmproot)) ui.debug(b'running %r in %s\n' % (pycompat.bytestr(cmdline), tmproot))
ui.system(cmdline, cwd=tmproot, blockedtag=b'extdiff') ui.system(cmdline, cwd=tmproot, blockedtag=b'extdiff')
return 1 return 1
def diffrevs( def diffrevs(
if opts.get(b'per_file'): if opts.get(b'per_file'):
raise error.Abort(_(b'--patch cannot be used with --per-file')) raise error.Abort(_(b'--patch cannot be used with --per-file'))
if node2 is None: if node2 is None:
raise error.Abort(_(b'--patch requires two revisions')) raise error.Abort(_(b'--patch requires two revisions'))
tmproot = pycompat.mkdtemp(prefix=b'extdiff.') tmproot = pycompat.mkdtemp(prefix=b'extdiff.')
try: try:
if opts.get(b'patch'): if opts.get(b'patch'):
return diffpatch( return diffpatch(ui, repo, node1a, node2, tmproot, matcher, cmdline)
ui, repo, node1a, node2, tmproot, matcher, cmdline, do3way
)
return diffrevs( return diffrevs(
ui, ui,
repo, repo,
node1a, node1a,
node1b, node1b,
node2, node2,
matcher, matcher,