This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4384

narrow: update the narrowspecs to new ones after pulling when widening
ClosedPublic

Authored by pulkit on Aug 27 2018, 8:10 AM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG2b8adb7ca39a: narrow: update the narrowspecs to new ones after pulling when widening
Summary

The ellipsis case updates the new narrowspecs at bundle2 handling code, and
non-ellipsis widening didn't use to work and never set the new narrowpats.
Previous pacth added server side logic for widening without ellipsis. This patch
adds the missing repo.setnarrowpats() so that we set the new narrowpats after
widening in non-ellipsis cases also.

This makes widening with non-ellipsis case work but there are certain things
which we can improve.

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.Aug 27 2018, 8:10 AM
martinvonz accepted this revision.Aug 29 2018, 7:37 PM
martinvonz added a subscriber: martinvonz.
martinvonz added inline comments.
hgext/narrow/narrowcommands.py
310

This means we're now setting it twice in some cases, but that's probably okay. We can always improve it later.

This revision is now accepted and ready to land.Aug 29 2018, 7:37 PM
Closed by commit rHG2b8adb7ca39a: narrow: update the narrowspecs to new ones after pulling when widening (authored by pulkit). · Explain WhyAug 29 2018, 7:45 PM
This revision was automatically updated to reflect the committed changes.
pulkit added inline comments.Aug 30 2018, 8:46 AM
hgext/narrow/narrowcommands.py
310

Let me see if can remove the other place where we set it.

Revision Contents
Changeset List

Diff 10663

hgext/narrow/narrowcommands.py

with ds.parentchange(): with ds.parentchange():
ds.setparents(node.nullid, node.nullid) ds.setparents(node.nullid, node.nullid)
common = commoninc[0] common = commoninc[0]
with wrappedextraprepare: with wrappedextraprepare:
exchange.pull(repo, remote, heads=common) exchange.pull(repo, remote, heads=common)
with ds.parentchange(): with ds.parentchange():
ds.setparents(p1, p2) ds.setparents(p1, p2)
repo.setnewnarrowpats()
martinvonzUnsubmitted
Not Done

This means we're now setting it twice in some cases, but that's probably okay. We can always improve it later.

martinvonz: This means we're now setting it twice in some cases, but that's probably okay. We can always…
pulkitAuthorUnsubmitted
Not Done

Let me see if can remove the other place where we set it.

pulkit: Let me see if can remove the other place where we set it.
actions = {k: [] for k in 'a am f g cd dc r dm dg m e k p pr'.split()} actions = {k: [] for k in 'a am f g cd dc r dm dg m e k p pr'.split()}
addgaction = actions['g'].append addgaction = actions['g'].append
mf = repo['.'].manifest().matches(newmatch) mf = repo['.'].manifest().matches(newmatch)
for f, fn in mf.iteritems(): for f, fn in mf.iteritems():
if f not in repo.dirstate: if f not in repo.dirstate:
addgaction((f, (mf.flags(f), False), addgaction((f, (mf.flags(f), False),
"add from widened narrow clone")) "add from widened narrow clone"))

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

no changes found no changes found
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 0 changesets with 0 changes to 1 files added 0 changesets with 0 changes to 1 files
3 local changesets published 3 local changesets published
$ hg tracked $ hg tracked
I path:inside I path:inside
I path:wider/f
Pull down the newly added upstream revision. Pull down the newly added upstream revision.
$ hg pull $ hg pull
pulling from ssh://user@dummy/master pulling from ssh://user@dummy/master
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 5 changesets with 1 changes to 1 files added 5 changesets with 2 changes to 2 files
new changesets *:* (glob) new changesets *:* (glob)
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg update -r 'desc("add wider")' $ hg update -r 'desc("add wider")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat wider/f $ cat wider/f
cat: wider/f: $ENOENT$ wider
[1]
$ hg update -r 'desc("update inside")' $ hg update -r 'desc("update inside")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat wider/f $ cat wider/f
cat: wider/f: $ENOENT$ wider
[1]
$ cat inside/f $ cat inside/f
inside v2 inside v2
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
45662f0793c7: update widest v4 45662f0793c7: update widest v4
1dd1364b566e: add outside2 1dd1364b566e: add outside2
*: update inside (glob) *: update inside (glob)
be0600e3ccba: update widest v3 be0600e3ccba: update widest v3
$ hg tracked --addinclude widest $ hg tracked --addinclude widest
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
no changes found no changes found
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 0 changesets with 4 changes to 2 files added 0 changesets with 4 changes to 3 files
5 local changesets published 5 local changesets published
abort: path ends in directory separator: widest/
[255]
$ hg tracked $ hg tracked
I path:inside I path:inside
I path:wider/f
I path:widest
$ hg update 'desc("add widest")' $ hg update 'desc("add widest")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ cat widest/f $ cat widest/f
cat: widest/f: $ENOENT$ widest
[1]
$ hg update 'desc("add wider, update widest")' $ hg update 'desc("add wider, update widest")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat wider/f $ cat wider/f
cat: wider/f: $ENOENT$ wider
[1]
$ cat widest/f $ cat widest/f
cat: widest/f: $ENOENT$ widest v2
[1]
$ hg update 'desc("update widest v3")' $ hg update 'desc("update widest v3")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat widest/f $ cat widest/f
cat: widest/f: $ENOENT$ widest v3
[1]
$ hg update 'desc("update widest v4")' $ hg update 'desc("update widest v4")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat widest/f $ cat widest/f
cat: widest/f: $ENOENT$ widest v4
[1]
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
*: update widest v4 (glob) *: update widest v4 (glob)
1dd1364b566e: add outside2 1dd1364b566e: add outside2
*: update inside (glob) *: update inside (glob)
*: update widest v3 (glob) *: update widest v3 (glob)
*: add wider, update widest (glob) *: add wider, update widest (glob)
4922ea71b958: add outside 4922ea71b958: add outside
comparing with ssh://user@dummy/upstream comparing with ssh://user@dummy/upstream
searching for changes searching for changes
no changes found no changes found
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 0 changesets with 1 changes to 5 files added 0 changesets with 1 changes to 5 files
11 local changesets published 11 local changesets published
abort: path ends in directory separator: d1/
[255]
$ hg tracked $ hg tracked
I path:d0 I path:d0
I path:d1
I path:d3 I path:d3
I path:d6 I path:d6
I path:d9 I path:d9
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
5dcf948d1e26: add d10/f 5dcf948d1e26: add d10/f
*: add d9/f (glob) *: add d9/f (glob)
ed07d334af10: add d8/f ed07d334af10: add d8/f
472749d2eed8: add d7/f 472749d2eed8: add d7/f
*: add d6/f (glob) *: add d6/f (glob)
47c482f555ec: add d5/f 47c482f555ec: add d5/f
3c6772db7d10: add d4/f 3c6772db7d10: add d4/f
*: add d3/f (glob) *: add d3/f (glob)
a68ce05aaaed: add d2/f a68ce05aaaed: add d2/f
*: add d1/f (glob) *: add d1/f (glob)
*: add d0/f (glob) *: add d0/f (glob)
Verify shouldn't claim the repo is corrupt after a widen. Verify shouldn't claim the repo is corrupt after a widen.
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
checking directory manifests checking directory manifests
warning: orphan data file 'meta/d1/00manifest.i'
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
warning: orphan data file 'data/d1/f.i' 5 files, 11 changesets, 5 total revisions
4 files, 11 changesets, 4 total revisions
2 warnings encountered!
Widening preserves parent of local commit Widening preserves parent of local commit
$ cd .. $ cd ..
$ hg clone -q --narrow ssh://user@dummy/upstream narrow3 --include d2 -r 2 $ hg clone -q --narrow ssh://user@dummy/upstream narrow3 --include d2 -r 2
$ cd narrow3 $ cd narrow3
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
*: add d2/f (glob) *: add d2/f (glob)
5934322a52dd: add d1/f 5934322a52dd: add d1/f
44d97ac7c511: add d0/f 44d97ac7c511: add d0/f
$ hg pull -q -r 3 $ hg pull -q -r 3
$ hg co -q tip $ hg co -q tip
$ hg pull -q -r 4 $ hg pull -q -r 4
$ echo local > d2/f $ echo local > d2/f
$ hg ci -m local $ hg ci -m local
created new head created new head
$ hg tracked -q --addinclude d0 --addinclude d9 $ hg tracked -q --addinclude d0 --addinclude d9
abort: path ends in directory separator: d0/
[255]
Widening preserves bookmarks Widening preserves bookmarks
$ cd .. $ cd ..
$ hg clone -q --narrow ssh://user@dummy/upstream narrow-bookmarks --include d4 $ hg clone -q --narrow ssh://user@dummy/upstream narrow-bookmarks --include d4
$ cd narrow-bookmarks $ cd narrow-bookmarks
$ echo local > d4/f $ echo local > d4/f
$ hg ci -m local $ hg ci -m local
$ hg bookmarks bookmark $ hg bookmarks bookmark
$ hg bookmarks $ hg bookmarks
* bookmark 11:42aed9c63197 * bookmark 11:42aed9c63197
$ hg -q tracked --addinclude d2 $ hg -q tracked --addinclude d2
abort: path ends in directory separator: d2/
[255]
$ hg bookmarks $ hg bookmarks
* bookmark 11:42aed9c63197 * bookmark 11:42aed9c63197
$ hg log -r bookmark -T '{desc}\n' $ hg log -r bookmark -T '{desc}\n'
local local
Widening that fails can be recovered from Widening that fails can be recovered from
$ cd .. $ cd ..
comparing with ssh://user@dummy/upstream comparing with ssh://user@dummy/upstream
searching for changes searching for changes
no changes found no changes found
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 0 changesets with 1 changes to 2 files added 0 changesets with 1 changes to 2 files
11 local changesets published 11 local changesets published
abort: path ends in directory separator: d1/
[255]
$ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
11: local 11: local
10: add d10/f 10: add d10/f
9: add d9/f 9: add d9/f
8: add d8/f 8: add d8/f
7: add d7/f 7: add d7/f
6: add d6/f 6: add d6/f
5: add d5/f 5: add d5/f