This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8686

extdiff: refactor logic which does diff of patches
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG48c38018bd77: extdiff: refactor logic which does diff of patches
Summary

The current extdiff code is hard to understand on first look. Took me few hours
to grasp the code. Before adding more things, decided to do some refactoring.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

pulkit created this revision.Jul 7 2020, 5:27 AM
Alphare accepted this revision.Jul 15 2020, 11:50 AM
Alphare added a subscriber: Alphare.

Thanks for refactoring first!

hgext/extdiff.py
353

Could you add a small docstring?

pulkit added a commit: rHG48c38018bd77: extdiff: refactor logic which does diff of patches.Jul 16 2020, 9:21 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG48c38018bd77: extdiff: refactor logic which does diff of patches (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/extdiff.py (157 lines)

Diff 21779

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):
AlphareUnsubmitted
Not Done

Could you add a small docstring?

Alphare: Could you add a small docstring?
template = b'hg-%h.patch'
with formatter.nullformatter(ui, b'extdiff', {}) as fm:
cmdutil.export(
repo,
[repo[node1a].rev(), repo[node2].rev()],
fm,
fntemplate=repo.vfs.reljoin(tmproot, template),
match=matcher,
)
label1a = cmdutil.makefilename(repo[node1a], template)
label2 = cmdutil.makefilename(repo[node2], template)
dir1a = repo.vfs.reljoin(tmproot, label1a)
dir2 = repo.vfs.reljoin(tmproot, label2)
dir1b = None
label1b = None
cmdline = formatcmdline(
cmdline,
repo.root,
do3way=do3way,
parent1=dir1a,
plabel1=label1a,
parent2=dir1b,
plabel2=label1b,
child=dir2,
clabel=label2,
)
ui.debug(b'running %r in %s\n' % (pycompat.bytestr(cmdline), tmproot))
ui.system(cmdline, cwd=tmproot, blockedtag=b'extdiff')
return 1
def dodiff(ui, repo, cmdline, pats, opts, guitool=False): def dodiff(ui, repo, cmdline, pats, opts, guitool=False):
'''Do the actual diff: '''Do the actual diff:
- copy to a temp structure if diffing 2 internal revisions - copy to a temp structure if diffing 2 internal revisions
- copy to a temp structure if diffing working revision with - copy to a temp structure if diffing working revision with
another one and more than 1 file is changed another one and more than 1 file is changed
- just invoke the diff for a single file in the working dir - just invoke the diff for a single file in the working dir
''' '''
# Disable 3-way merge if there is only one parent # Disable 3-way merge if there is only one parent
if do3way: if do3way:
if node1b == nullid: if node1b == nullid:
do3way = False do3way = False
subrepos = opts.get(b'subrepos') subrepos = opts.get(b'subrepos')
matcher = scmutil.match(repo[node2], pats, opts) matcher = scmutil.match(repo[node2], pats, opts)
tmproot = pycompat.mkdtemp(prefix=b'extdiff.')
if opts.get(b'patch'): if opts.get(b'patch'):
if subrepos: if subrepos:
raise error.Abort(_(b'--patch cannot be used with --subrepos')) raise error.Abort(_(b'--patch cannot be used with --subrepos'))
if perfile: if perfile:
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'))
) )
else: else:
mod_b, add_b, rem_b = set(), set(), set() mod_b, add_b, rem_b = set(), set(), set()
modadd = mod_a | add_a | mod_b | add_b modadd = mod_a | add_a | mod_b | add_b
common = modadd | rem_a | rem_b common = modadd | rem_a | rem_b
if not common: if not common:
return 0 return 0
tmproot = pycompat.mkdtemp(prefix=b'extdiff.')
try: try:
if not opts.get(b'patch'): if opts.get(b'patch'):
return diffpatch(
ui, repo, node1a, node2, tmproot, matcher, cmdline, do3way
)
# Always make a copy of node1a (and node1b, if applicable) # Always make a copy of node1a (and node1b, if applicable)
dir1a_files = mod_a | rem_a | ((mod_b | add_b) - add_a) dir1a_files = mod_a | rem_a | ((mod_b | add_b) - add_a)
dir1a = snapshot(ui, repo, dir1a_files, node1a, tmproot, subrepos)[ dir1a = snapshot(ui, repo, dir1a_files, node1a, tmproot, subrepos)[0]
0
]
rev1a = b'@%d' % repo[node1a].rev() rev1a = b'@%d' % repo[node1a].rev()
if do3way: if do3way:
dir1b_files = mod_b | rem_b | ((mod_a | add_a) - add_b) dir1b_files = mod_b | rem_b | ((mod_a | add_a) - add_b)
dir1b = snapshot( dir1b = snapshot(ui, repo, dir1b_files, node1b, tmproot, subrepos)[
ui, repo, dir1b_files, node1b, tmproot, subrepos 0
)[0] ]
rev1b = b'@%d' % repo[node1b].rev() rev1b = b'@%d' % repo[node1b].rev()
else: else:
dir1b = None dir1b = None
rev1b = b'' rev1b = b''
fnsandstat = [] fnsandstat = []
# If node2 in not the wc or there is >1 change, copy it # If node2 in not the wc or there is >1 change, copy it
dir2root = b'' dir2root = b''
rev2 = b'' rev2 = b''
if node2: if node2:
dir2 = snapshot(ui, repo, modadd, node2, tmproot, subrepos)[0] dir2 = snapshot(ui, repo, modadd, node2, tmproot, subrepos)[0]
rev2 = b'@%d' % repo[node2].rev() rev2 = b'@%d' % repo[node2].rev()
elif len(common) > 1: elif len(common) > 1:
# we only actually need to get the files to copy back to # we only actually need to get the files to copy back to
# the working dir in this case (because the other cases # the working dir in this case (because the other cases
# are: diffing 2 revisions or single file -- in which case # are: diffing 2 revisions or single file -- in which case
# the file is already directly passed to the diff tool). # the file is already directly passed to the diff tool).
dir2, fnsandstat = snapshot( dir2, fnsandstat = snapshot(
ui, repo, modadd, None, tmproot, subrepos ui, repo, modadd, None, tmproot, subrepos
) )
else: else:
# This lets the diff tool open the changed file directly # This lets the diff tool open the changed file directly
dir2 = b'' dir2 = b''
dir2root = repo.root dir2root = repo.root
label1a = rev1a label1a = rev1a
label1b = rev1b label1b = rev1b
label2 = rev2 label2 = rev2
# If only one change, diff the files instead of the directories # If only one change, diff the files instead of the directories
# Handle bogus modifies correctly by checking if the files exist # Handle bogus modifies correctly by checking if the files exist
if len(common) == 1: if len(common) == 1:
common_file = util.localpath(common.pop()) common_file = util.localpath(common.pop())
dir1a = os.path.join(tmproot, dir1a, common_file) dir1a = os.path.join(tmproot, dir1a, common_file)
label1a = common_file + rev1a label1a = common_file + rev1a
if not os.path.isfile(dir1a): if not os.path.isfile(dir1a):
dir1a = pycompat.osdevnull dir1a = pycompat.osdevnull
if do3way: if do3way:
dir1b = os.path.join(tmproot, dir1b, common_file) dir1b = os.path.join(tmproot, dir1b, common_file)
label1b = common_file + rev1b label1b = common_file + rev1b
if not os.path.isfile(dir1b): if not os.path.isfile(dir1b):
dir1b = pycompat.osdevnull dir1b = pycompat.osdevnull
dir2 = os.path.join(dir2root, dir2, common_file) dir2 = os.path.join(dir2root, dir2, common_file)
label2 = common_file + rev2 label2 = common_file + rev2
else:
template = b'hg-%h.patch'
with formatter.nullformatter(ui, b'extdiff', {}) as fm:
cmdutil.export(
repo,
[repo[node1a].rev(), repo[node2].rev()],
fm,
fntemplate=repo.vfs.reljoin(tmproot, template),
match=matcher,
)
label1a = cmdutil.makefilename(repo[node1a], template)
label2 = cmdutil.makefilename(repo[node2], template)
dir1a = repo.vfs.reljoin(tmproot, label1a)
dir2 = repo.vfs.reljoin(tmproot, label2)
dir1b = None
label1b = None
fnsandstat = []
if not perfile: if not perfile:
# Run the external tool on the 2 temp directories or the patches # Run the external tool on the 2 temp directories or the patches
cmdline = formatcmdline( cmdline = formatcmdline(
cmdline, cmdline,
repo.root, repo.root,
do3way=do3way, do3way=do3way,
parent1=dir1a, parent1=dir1a,