This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8690

extdiff: add some comments in diffrevs()
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG33524b6bef53: extdiff: add some comments in diffrevs()
Summary

It was not obvious to understand the code so I added some 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:28 AM
Alphare accepted this revision.Jul 15 2020, 12:02 PM
Alphare added a subscriber: Alphare.

I'm not a big fan of the small-but-non-obvious variable names in this series, but they predate your patches, so maybe for another time.
Thanks for this series

hgext/extdiff.py
423

Nit: except files

pulkit added a commit: rHG33524b6bef53: extdiff: add some comments in diffrevs().Jul 16 2020, 9:21 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG33524b6bef53: extdiff: add some comments in diffrevs() (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 21935

hgext/extdiff.py

tmproot, tmproot,
cmdline, cmdline,
do3way, do3way,
guitool, guitool,
opts, opts,
): ):
subrepos = opts.get(b'subrepos') subrepos = opts.get(b'subrepos')
# calculate list of files changed between both revs
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
# Always make a copy of node1a (and node1b, if applicable) # Always make a copy of node1a (and node1b, if applicable)
# dir1a should contain files which are:
# * modified or removed from node1a to node2
# * modified or added from node1b to node2
# (except file added from node1a to node2 as they were not present in
AlphareUnsubmitted
Not Done

Nit: except files

Alphare: Nit: `except files`
# node1a)
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:
# file calculation criteria same as dir1a
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)[0] dir1b = snapshot(ui, repo, dir1b_files, node1b, tmproot, subrepos)[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 = []