This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5510

narrow: reuse narrowspec.updateworkingcopy() when widening
ClosedPublic

Authored by martinvonz on Jan 7 2019, 3:45 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGad9ab2523149: narrow: reuse narrowspec.updateworkingcopy() when widening
rHG092700100f94: narrow: reuse narrowspec.updateworkingcopy() when widening
Summary

The widening of the working copy we do after widening a repo is
practically the same as we do in a repo share after the store
narrowspec has been changed in a different share. Let's reuse the code
for that that we now have in the narrowspec module.

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

martinvonz created this revision.Jan 7 2019, 3:45 AM
martinvonz updated this revision to Diff 13038.Jan 7 2019, 4:18 AM
martinvonz updated this revision to Diff 13059.Jan 7 2019, 2:02 PM
Closed by commit rHG092700100f94: narrow: reuse narrowspec.updateworkingcopy() when widening (authored by martinvonz). · Explain WhyJan 16 2019, 4:34 AM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Jan 16 2019, 7:42 AM

Fixed pyflakes warnings in flight.

hgext/narrow/narrowcommands.py:13: 'mercurial.merge' imported but unused
hgext/narrow/narrowcommands.py:262: local variable 'newmatch' is assigned to but never used
martinvonz added a comment.Jan 16 2019, 11:25 AM
In D5510#82651, @yuja wrote:

Fixed pyflakes warnings in flight.

hgext/narrow/narrowcommands.py:13: 'mercurial.merge' imported but unused
hgext/narrow/narrowcommands.py:262: local variable 'newmatch' is assigned to but never used

Sorry about that, and thanks for fixing!

Revision Contents
Changeset List

Diff 13247

hgext/narrow/narrowcommands.py

}).result() }).result()
with repo.transaction('widening') as tr,\ with repo.transaction('widening') as tr,\
repo.ui.configoverride(overrides, 'widen'): repo.ui.configoverride(overrides, 'widen'):
tgetter = lambda: tr tgetter = lambda: tr
bundle2.processbundle(repo, bundle, bundle2.processbundle(repo, bundle,
transactiongetter=tgetter) transactiongetter=tgetter)
with repo.transaction('widening'):
repo.setnewnarrowpats() repo.setnewnarrowpats()
narrowspec.updateworkingcopy(repo)
narrowspec.copytoworkingcopy(repo) narrowspec.copytoworkingcopy(repo)
actions = merge.emptyactions()
addgaction = actions['g'].append
mf = repo['.'].manifest().matches(newmatch)
for f, fn in mf.iteritems():
if f not in repo.dirstate:
addgaction((f, (mf.flags(f), False),
"add from widened narrow clone"))
merge.applyupdates(repo, actions, wctx=repo[None],
mctx=repo['.'], overwrite=False)
merge.recordupdates(repo, actions, branchmerge=False)
# TODO(rdamazio): Make new matcher format and update description # TODO(rdamazio): Make new matcher format and update description
@command('tracked', @command('tracked',
[('', 'addinclude', [], _('new paths to include')), [('', 'addinclude', [], _('new paths to include')),
('', 'removeinclude', [], _('old paths to no longer include')), ('', 'removeinclude', [], _('old paths to no longer include')),
('', 'addexclude', [], _('new paths to exclude')), ('', 'addexclude', [], _('new paths to exclude')),
('', 'import-rules', '', _('import narrowspecs from a file')), ('', 'import-rules', '', _('import narrowspecs from a file')),
('', 'removeexclude', [], _('old paths to no longer exclude')), ('', 'removeexclude', [], _('old paths to no longer exclude')),

tests/test-narrow-widen-no-ellipsis.t

adding changesets adding changesets
adding manifests adding manifests
adding widest/ revisions (tree !) adding widest/ revisions (tree !)
adding file changes adding file changes
adding widest/f revisions (tree !) adding widest/f revisions (tree !)
added 0 changesets with 1 changes to 1 files added 0 changesets with 1 changes to 1 files
bundle2-input-part: total payload size * (glob) bundle2-input-part: total payload size * (glob)
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 0 parts total
widest/f: add from widened narrow clone -> g widest/f: narrowspec updated -> g
getting widest/f getting widest/f
$ hg tracked $ hg tracked
I path:inside I path:inside
I path:widest/f I path:widest/f
$ cat widest/f $ cat widest/f
widest widest