This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8689

extdiff: add comments and minor variable renames diffpatch()
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG30c31de4d1db: extdiff: add comments and minor variable renames diffpatch()
Summary

Some variable names were now confusing as we refactored the code in a separate
function. For example, node1a leads to ideas why 1a and not 1. The
variable storing path to patch file was named as dirX instead of fileX.
Renamed these variables and added couple of comments.

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:59 AM
pulkit added a commit: rHG30c31de4d1db: extdiff: add comments and minor variable renames diffpatch().Jul 16 2020, 9:21 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG30c31de4d1db: extdiff: add comments and minor variable renames diffpatch() (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/extdiff.py (24 lines)

Diff 21934

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): def diffpatch(ui, repo, node1, node2, tmproot, matcher, cmdline):
template = b'hg-%h.patch' template = b'hg-%h.patch'
# write patches to temporary files
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[node1].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) label1 = cmdutil.makefilename(repo[node1], template)
label2 = cmdutil.makefilename(repo[node2], template) label2 = cmdutil.makefilename(repo[node2], template)
dir1a = repo.vfs.reljoin(tmproot, label1a) file1 = repo.vfs.reljoin(tmproot, label1)
dir2 = repo.vfs.reljoin(tmproot, label2) file2 = repo.vfs.reljoin(tmproot, label2)
dir1b = None
label1b = None
cmdline = formatcmdline( cmdline = formatcmdline(
cmdline, cmdline,
repo.root, repo.root,
parent1=dir1a,
plabel1=label1a,
parent2=dir1b,
plabel2=label1b,
child=dir2,
# no 3way while comparing patches # no 3way while comparing patches
do3way=False, do3way=False,
parent1=file1,
plabel1=label1,
# while comparing patches, there is no second parent
parent2=None,
plabel2=None,
child=file2,
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(