( )⚙ D8687 extdiff: refactor logic to diff revs of versions of files

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8687

extdiff: refactor logic to diff revs of versions of files
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGda2e69a278df: extdiff: refactor logic to diff revs of versions of files
Summary

Now that code for both cases, diffing patches or files is in separate function,
it will be better to refactor them more and understand.

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:56 AM
Alphare added a subscriber: Alphare.

Thanks again for refactoring

hgext/extdiff.py
385

Could you add a docstring?

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

Revision Contents
Changeset List

PathPackages
Mhgext/extdiff.py (289 lines)

Diff 21932

hgext/extdiff.py

child=dir2, child=dir2,
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 dodiff(ui, repo, cmdline, pats, opts, guitool=False): def diffrevs(
AlphareUnsubmitted
Not Done

Could you add a docstring?

Alphare: Could you add a docstring?
'''Do the actual diff: ui,
repo,
- copy to a temp structure if diffing 2 internal revisions node1a,
- copy to a temp structure if diffing working revision with node1b,
another one and more than 1 file is changed node2,
- just invoke the diff for a single file in the working dir matcher,
''' tmproot,
cmdline,
cmdutil.check_at_most_one_arg(opts, b'rev', b'change') do3way,
revs = opts.get(b'rev') guitool,
change = opts.get(b'change') opts,
do3way = b'$parent2' in cmdline ):
if change:
ctx2 = scmutil.revsingle(repo, change, None)
ctx1a, ctx1b = ctx2.p1(), ctx2.p2()
else:
ctx1a, ctx2 = scmutil.revpair(repo, revs)
if not revs:
ctx1b = repo[None].p2()
else:
ctx1b = repo[nullid]
perfile = opts.get(b'per_file')
confirm = opts.get(b'confirm')
node1a = ctx1a.node()
node1b = ctx1b.node()
node2 = ctx2.node()
# Disable 3-way merge if there is only one parent
if do3way:
if node1b == nullid:
do3way = False
subrepos = opts.get(b'subrepos') subrepos = opts.get(b'subrepos')
matcher = scmutil.match(repo[node2], pats, opts)
if opts.get(b'patch'):
if subrepos:
raise error.Abort(_(b'--patch cannot be used with --subrepos'))
if perfile:
raise error.Abort(_(b'--patch cannot be used with --per-file'))
if node2 is None:
raise error.Abort(_(b'--patch requires two revisions'))
else:
st = repo.status(node1a, node2, matcher, listsubrepos=subrepos) st = repo.status(node1a, node2, matcher, listsubrepos=subrepos)
mod_a, add_a, rem_a = set(st.modified), set(st.added), set(st.removed) mod_a, add_a, rem_a = set(st.modified), set(st.added), set(st.removed)
if do3way: if do3way:
stb = repo.status(node1b, node2, matcher, listsubrepos=subrepos) stb = repo.status(node1b, node2, matcher, listsubrepos=subrepos)
mod_b, add_b, rem_b = ( mod_b, add_b, rem_b = (
set(stb.modified), set(stb.modified),
set(stb.added), set(stb.added),
set(stb.removed), set(stb.removed),
) )
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:
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)[0] dir1a = snapshot(ui, repo, dir1a_files, node1a, tmproot, subrepos)[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(ui, repo, dir1b_files, node1b, tmproot, subrepos)[ dir1b = snapshot(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
if not perfile: if not opts.get(b'per_file'):
# 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,
plabel1=label1a, plabel1=label1a,
parent2=dir1b, parent2=dir1b,
plabel2=label1b, plabel2=label1b,
child=dir2, child=dir2,
clabel=label2, clabel=label2,
) )
ui.debug( ui.debug(b'running %r in %s\n' % (pycompat.bytestr(cmdline), tmproot))
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')
else: else:
# Run the external tool once for each pair of files # Run the external tool once for each pair of files
_runperfilediff( _runperfilediff(
cmdline, cmdline,
repo.root, repo.root,
ui, ui,
guitool=guitool, guitool=guitool,
do3way=do3way, do3way=do3way,
confirm=confirm, confirm=opts.get(b'confirm'),
commonfiles=common, commonfiles=common,
tmproot=tmproot, tmproot=tmproot,
dir1a=dir1a, dir1a=dir1a,
dir1b=dir1b, dir1b=dir1b,
dir2root=dir2root, dir2root=dir2root,
dir2=dir2, dir2=dir2,
rev1a=rev1a, rev1a=rev1a,
rev1b=rev1b, rev1b=rev1b,
rev2=rev2, rev2=rev2,
) )
for copy_fn, working_fn, st in fnsandstat: for copy_fn, working_fn, st in fnsandstat:
cpstat = os.lstat(copy_fn) cpstat = os.lstat(copy_fn)
# Some tools copy the file and attributes, so mtime may not detect # Some tools copy the file and attributes, so mtime may not detect
# all changes. A size check will detect more cases, but not all. # all changes. A size check will detect more cases, but not all.
# The only certain way to detect every case is to diff all files, # The only certain way to detect every case is to diff all files,
# which could be expensive. # which could be expensive.
# copyfile() carries over the permission, so the mode check could # copyfile() carries over the permission, so the mode check could
# be in an 'elif' branch, but for the case where the file has # be in an 'elif' branch, but for the case where the file has
# changed without affecting mtime or size. # changed without affecting mtime or size.
if ( if (
cpstat[stat.ST_MTIME] != st[stat.ST_MTIME] cpstat[stat.ST_MTIME] != st[stat.ST_MTIME]
or cpstat.st_size != st.st_size or cpstat.st_size != st.st_size
or (cpstat.st_mode & 0o100) != (st.st_mode & 0o100) or (cpstat.st_mode & 0o100) != (st.st_mode & 0o100)
): ):
ui.debug( ui.debug(
b'file changed while diffing. ' b'file changed while diffing. '
b'Overwriting: %s (src: %s)\n' % (working_fn, copy_fn) b'Overwriting: %s (src: %s)\n' % (working_fn, copy_fn)
) )
util.copyfile(copy_fn, working_fn) util.copyfile(copy_fn, working_fn)
return 1 return 1
def dodiff(ui, repo, cmdline, pats, opts, guitool=False):
'''Do the actual diff:
- copy to a temp structure if diffing 2 internal revisions
- copy to a temp structure if diffing working revision with
another one and more than 1 file is changed
- just invoke the diff for a single file in the working dir
'''
cmdutil.check_at_most_one_arg(opts, b'rev', b'change')
revs = opts.get(b'rev')
change = opts.get(b'change')
do3way = b'$parent2' in cmdline
if change:
ctx2 = scmutil.revsingle(repo, change, None)
ctx1a, ctx1b = ctx2.p1(), ctx2.p2()
else:
ctx1a, ctx2 = scmutil.revpair(repo, revs)
if not revs:
ctx1b = repo[None].p2()
else:
ctx1b = repo[nullid]
node1a = ctx1a.node()
node1b = ctx1b.node()
node2 = ctx2.node()
# Disable 3-way merge if there is only one parent
if do3way:
if node1b == nullid:
do3way = False
matcher = scmutil.match(repo[node2], pats, opts)
if opts.get(b'patch'):
if opts.get(b'subrepos'):
raise error.Abort(_(b'--patch cannot be used with --subrepos'))
if opts.get(b'per_file'):
raise error.Abort(_(b'--patch cannot be used with --per-file'))
if node2 is None:
raise error.Abort(_(b'--patch requires two revisions'))
tmproot = pycompat.mkdtemp(prefix=b'extdiff.')
try:
if opts.get(b'patch'):
return diffpatch(
ui, repo, node1a, node2, tmproot, matcher, cmdline, do3way
)
return diffrevs(
ui,
repo,
node1a,
node1b,
node2,
matcher,
tmproot,
cmdline,
do3way,
guitool,
opts,
)
finally: finally:
ui.note(_(b'cleaning up temp directory\n')) ui.note(_(b'cleaning up temp directory\n'))
shutil.rmtree(tmproot) shutil.rmtree(tmproot)
extdiffopts = ( extdiffopts = (
[ [
( (