This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4812

narrow: pass old includes and excludes to _widen()
ClosedPublic

Authored by pulkit on Sep 30 2018, 12:11 PM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG1a4c1a3cc3f5: narrow: pass old includes and excludes to _widen()
Summary

In future patches we will need to pass them in the widen wireprotocol command
which we are building.

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.Sep 30 2018, 12:11 PM
martinvonz added a subscriber: martinvonz.Oct 1 2018, 3:08 AM
martinvonz added inline comments.
hgext/narrow/narrowcommands.py
251–253

nit: Can you put them before their new* counterparts? That's the order used elsewhere in this file (and is probably generally more common).

pulkit updated this revision to Diff 11519.Oct 1 2018, 12:02 PM
martinvonz accepted this revision.Oct 2 2018, 12:20 PM
This revision is now accepted and ready to land.Oct 2 2018, 12:20 PM
Closed by commit rHG1a4c1a3cc3f5: narrow: pass old includes and excludes to _widen() (authored by pulkit). · Explain WhyOct 2 2018, 12:55 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 11570

hgext/narrow/narrowcommands.py

repo.store.markremoved(f) repo.store.markremoved(f)
_narrowcleanupwdir(repo, oldincludes, oldexcludes, newincludes, _narrowcleanupwdir(repo, oldincludes, oldexcludes, newincludes,
newexcludes, oldmatch, newmatch) newexcludes, oldmatch, newmatch)
repo.setnarrowpats(newincludes, newexcludes) repo.setnarrowpats(newincludes, newexcludes)
repo.destroyed() repo.destroyed()
def _widen(ui, repo, remote, commoninc, newincludes, newexcludes): def _widen(ui, repo, remote, commoninc, oldincludes, oldexcludes,
newincludes, newexcludes):
newmatch = narrowspec.match(repo.root, newincludes, newexcludes) newmatch = narrowspec.match(repo.root, newincludes, newexcludes)
martinvonzUnsubmitted
Not Done

nit: Can you put them before their new* counterparts? That's the order used elsewhere in this file (and is probably generally more common).

martinvonz: nit: Can you put them before their `new*` counterparts? That's the order used elsewhere in this…
# for now we assume that if a server has ellipses enabled, we will be # for now we assume that if a server has ellipses enabled, we will be
# exchanging ellipses nodes. In future we should add ellipses as a client # exchanging ellipses nodes. In future we should add ellipses as a client
# side requirement (maybe) to distinguish a client is shallow or not and # side requirement (maybe) to distinguish a client is shallow or not and
# then send that information to server whether we want ellipses or not. # then send that information to server whether we want ellipses or not.
# Theoretically a non-ellipses repo should be able to use narrow # Theoretically a non-ellipses repo should be able to use narrow
# functionality from an ellipses enabled server # functionality from an ellipses enabled server
ellipsesremote = wireprotoserver.ELLIPSESCAP in remote.capabilities() ellipsesremote = wireprotoserver.ELLIPSESCAP in remote.capabilities()
# use the updated values as its base (otherwise removed includes # use the updated values as its base (otherwise removed includes
# and addedexcludes will be lost in the resulting narrowspec) # and addedexcludes will be lost in the resulting narrowspec)
oldincludes = newincludes oldincludes = newincludes
oldexcludes = newexcludes oldexcludes = newexcludes
if widening: if widening:
newincludes = oldincludes | addedincludes newincludes = oldincludes | addedincludes
newexcludes = oldexcludes - removedexcludes newexcludes = oldexcludes - removedexcludes
_widen(ui, repo, remote, commoninc, newincludes, newexcludes) _widen(ui, repo, remote, commoninc, oldincludes, oldexcludes,
newincludes, newexcludes)
return 0 return 0