I'm about to make some changes to which revisions get sent during
widening. Some more tests will make it clearer what changes. I've also
switched to graph log so we easily notice if the graph shape changes.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/test-narrow-widen.t (206 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| #testcases flat tree | #testcases flat tree | ||||
| $ . "$TESTDIR/narrow-library.sh" | $ . "$TESTDIR/narrow-library.sh" | ||||
| $ cat >> $HGRCPATH <<EOF | |||||
| > [alias] | |||||
| > l = log -G -T "{if(ellipsis, '...')}{rev}: {desc}\n" | |||||
| > EOF | |||||
| #if tree | #if tree | ||||
| $ cat << EOF >> $HGRCPATH | $ cat << EOF >> $HGRCPATH | ||||
| > [experimental] | > [experimental] | ||||
| > treemanifest = 1 | > treemanifest = 1 | ||||
| > EOF | > EOF | ||||
| #endif | #endif | ||||
| $ hg init master | $ hg init master | ||||
| $ mkdir outside2 | $ mkdir outside2 | ||||
| $ echo 'outside2' > outside2/f | $ echo 'outside2' > outside2/f | ||||
| $ hg add outside2/f | $ hg add outside2/f | ||||
| $ hg commit -m 'add outside2' | $ hg commit -m 'add outside2' | ||||
| $ echo 'widest v4' > widest/f | $ echo 'widest v4' > widest/f | ||||
| $ hg commit -m 'update widest v4' | $ hg commit -m 'update widest v4' | ||||
| $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" | $ hg l | ||||
| 7: update widest v4 | @ 7: update widest v4 | ||||
| 6: add outside2 | | | ||||
| 5: update inside | o 6: add outside2 | ||||
| 4: update widest v3 | | | ||||
| 3: add wider, update widest | o 5: update inside | ||||
| 2: add outside | | | ||||
| 1: add widest | o 4: update widest v3 | ||||
| 0: add inside | | | ||||
| o 3: add wider, update widest | |||||
| | | |||||
| o 2: add outside | |||||
| | | |||||
| o 1: add widest | |||||
| | | |||||
| o 0: add inside | |||||
| $ cd .. | $ cd .. | ||||
| Widen the narrow spec to see the widest file. This should not get the newly | Widen the narrow spec to see the widest file. This should not get the newly | ||||
| added upstream revisions. | added upstream revisions. | ||||
| $ cd narrow | $ cd narrow | ||||
| $ hg l | |||||
| @ ...1: add outside | |||||
| | | |||||
| o 0: add inside | |||||
| $ hg tracked --addinclude widest/f | $ hg tracked --addinclude widest/f | ||||
| comparing with ssh://user@dummy/master | comparing with ssh://user@dummy/master | ||||
| searching for changes | searching for changes | ||||
| saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) | saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||
| adding file changes | adding file changes | ||||
| added 3 changesets with 2 changes to 2 files | added 3 changesets with 2 changes to 2 files | ||||
| $ hg l | |||||
| @ ...2: add outside | |||||
| | | |||||
| o 1: add widest | |||||
| | | |||||
| o 0: add inside | |||||
| $ 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 | ||||
| Pull down the newly added upstream revision. | Pull down the newly added upstream revision. | ||||
| $ hg update -r 'desc("update inside")' | $ hg update -r 'desc("update inside")' | ||||
| 2 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 | ||||
| widest v3 | widest v3 | ||||
| $ cat inside/f | $ cat inside/f | ||||
| inside v2 | inside v2 | ||||
| $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" | $ hg l | ||||
| 7: update widest v4 | o 7: update widest v4 | ||||
| ...6: add outside2 | | | ||||
| 5: update inside | o ...6: add outside2 | ||||
| 4: update widest v3 | | | ||||
| 3: add wider, update widest | @ 5: update inside | ||||
| ...2: add outside | | | ||||
| 1: add widest | o 4: update widest v3 | ||||
| 0: add inside | | | ||||
| o 3: add wider, update widest | |||||
| | | |||||
| o ...2: add outside | |||||
| | | |||||
| o 1: add widest | |||||
| | | |||||
| o 0: add inside | |||||
| Check that widening with a newline fails | Check that widening with a newline fails | ||||
| $ hg tracked --addinclude 'widest | $ hg tracked --addinclude 'widest | ||||
| > ' | > ' | ||||
| abort: newlines are not allowed in narrowspec paths | abort: newlines are not allowed in narrowspec paths | ||||
| [255] | [255] | ||||
| 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 widest/f | $ cat widest/f | ||||
| widest v3 | widest v3 | ||||
| $ hg update 'desc("update widest v4")' | $ hg update 'desc("update widest v4")' | ||||
| 2 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 | ||||
| widest v4 | widest v4 | ||||
| $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" | $ hg l | ||||
| 7: update widest v4 | @ 7: update widest v4 | ||||
| ...6: add outside2 | | | ||||
| 5: update inside | o ...6: add outside2 | ||||
| 4: update widest v3 | | | ||||
| 3: add wider, update widest | o 5: update inside | ||||
| ...2: add outside | | | ||||
| 1: add widest | o 4: update widest v3 | ||||
| 0: add inside | | | ||||
| o 3: add wider, update widest | |||||
| | | |||||
| o ...2: add outside | |||||
| | | |||||
| o 1: add widest | |||||
| | | |||||
| o 0: add inside | |||||
| separate suite of tests: files from 0-10 modified in changes 0-10. This allows | separate suite of tests: files from 0-10 modified in changes 0-10. This allows | ||||
| more obvious precise tests tickling particular corner cases. | more obvious precise tests tickling particular corner cases. | ||||
| $ cd .. | $ cd .. | ||||
| $ hg init upstream | $ hg init upstream | ||||
| $ cd upstream | $ cd upstream | ||||
| $ cat >> .hg/hgrc <<EOF | $ cat >> .hg/hgrc <<EOF | ||||
| I path:d9 | I path:d9 | ||||
| $ hg verify | $ hg verify | ||||
| checking changesets | checking changesets | ||||
| checking manifests | checking manifests | ||||
| checking directory manifests (tree !) | checking directory manifests (tree !) | ||||
| crosschecking files in changesets and manifests | crosschecking files in changesets and manifests | ||||
| checking files | checking files | ||||
| checked 8 changesets with 4 changes to 4 files | checked 8 changesets with 4 changes to 4 files | ||||
| $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" | $ hg l | ||||
| ...7: add d10/f | @ ...7: add d10/f | ||||
| 6: add d9/f | | | ||||
| ...5: add d8/f | o 6: add d9/f | ||||
| 4: add d6/f | | | ||||
| ...3: add d5/f | o ...5: add d8/f | ||||
| 2: add d3/f | | | ||||
| ...1: add d2/f | o 4: add d6/f | ||||
| 0: add d0/f | | | ||||
| o ...3: add d5/f | |||||
| | | |||||
| o 2: add d3/f | |||||
| | | |||||
| o ...1: add d2/f | |||||
| | | |||||
| o 0: add d0/f | |||||
| $ hg tracked --addinclude d1 | $ hg tracked --addinclude d1 | ||||
| comparing with ssh://user@dummy/upstream | comparing with ssh://user@dummy/upstream | ||||
| searching for changes | searching for changes | ||||
| saved backup bundle to $TESTTMP/narrow2/.hg/strip-backup/*-widen.hg (glob) | saved backup bundle to $TESTTMP/narrow2/.hg/strip-backup/*-widen.hg (glob) | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||
| adding file changes | adding file changes | ||||
| added 9 changesets with 5 changes to 5 files | added 9 changesets with 5 changes to 5 files | ||||
| $ hg tracked | $ hg tracked | ||||
| I path:d0 | I path:d0 | ||||
| I path:d1 | 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, '...')}{rev}: {desc}\n" | $ hg l | ||||
| ...8: add d10/f | @ ...8: add d10/f | ||||
| 7: add d9/f | | | ||||
| ...6: add d8/f | o 7: add d9/f | ||||
| 5: add d6/f | | | ||||
| ...4: add d5/f | o ...6: add d8/f | ||||
| 3: add d3/f | | | ||||
| ...2: add d2/f | o 5: add d6/f | ||||
| 1: add d1/f | | | ||||
| 0: add d0/f | o ...4: add d5/f | ||||
| | | |||||
| o 3: add d3/f | |||||
| | | |||||
| o ...2: add d2/f | |||||
| | | |||||
| o 1: add d1/f | |||||
| | | |||||
| o 0: add d0/f | |||||
| 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 (tree !) | checking directory manifests (tree !) | ||||
| crosschecking files in changesets and manifests | crosschecking files in changesets and manifests | ||||
| checking files | checking files | ||||
| checked 9 changesets with 5 changes to 5 files | checked 9 changesets with 5 changes to 5 files | ||||
| 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, '...')}{rev}: {desc}\n" | $ hg l | ||||
| 1: add d2/f | @ 1: add d2/f | ||||
| ...0: add d1/f | | | ||||
| o ...0: add d1/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 l | |||||
| @ 4: local | |||||
| | | |||||
| | o ...3: add d4/f | |||||
| |/ | |||||
| o ...2: add d3/f | |||||
| | | |||||
| o 1: add d2/f | |||||
| | | |||||
| o ...0: add d1/f | |||||
| $ hg tracked -q --addinclude d0 --addinclude d9 | $ hg tracked -q --addinclude d0 --addinclude d9 | ||||
| $ hg l | |||||
| @ 5: local | |||||
| | | |||||
| | o ...4: add d4/f | |||||
| |/ | |||||
| o ...3: add d3/f | |||||
| | | |||||
| o 2: add d2/f | |||||
| | | |||||
| o ...1: add d1/f | |||||
| | | |||||
| o 0: add d0/f | |||||
| 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 3:* (glob) | * bookmark 3:* (glob) | ||||
| $ hg -q tracked --addinclude d2 | $ hg -q tracked --addinclude d2 | ||||
| $ hg bookmarks | $ hg bookmarks | ||||
| * bookmark 5:* (glob) | * bookmark 5:* (glob) | ||||
| $ 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 .. | ||||
| $ hg clone -q --narrow ssh://user@dummy/upstream interrupted --include d0 | $ hg clone -q --narrow ssh://user@dummy/upstream interrupted --include d0 | ||||
| $ cd interrupted | $ cd interrupted | ||||
| $ echo local > d0/f | $ echo local > d0/f | ||||
| $ hg ci -m local | $ hg ci -m local | ||||
| $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" | $ hg l | ||||
| 2: local | @ 2: local | ||||
| ...1: add d10/f | | | ||||
| 0: add d0/f | o ...1: add d10/f | ||||
| | | |||||
| o 0: add d0/f | |||||
| $ hg bookmarks bookmark | $ hg bookmarks bookmark | ||||
| $ hg --config hooks.pretxnchangegroup.bad=false tracked --addinclude d1 | $ hg --config hooks.pretxnchangegroup.bad=false tracked --addinclude d1 | ||||
| comparing with ssh://user@dummy/upstream | comparing with ssh://user@dummy/upstream | ||||
| searching for changes | searching for changes | ||||
| saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/*-widen.hg (glob) | saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/*-widen.hg (glob) | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||
| adding file changes | adding file changes | ||||
| transaction abort! | transaction abort! | ||||
| rollback completed | rollback completed | ||||
| abort: pretxnchangegroup.bad hook exited with status 1 | abort: pretxnchangegroup.bad hook exited with status 1 | ||||
| [255] | [255] | ||||
| $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" | $ hg l | ||||
| $ hg bookmarks | $ hg bookmarks | ||||
| no bookmarks set | no bookmarks set | ||||
| $ hg unbundle .hg/strip-backup/*-widen.hg | $ hg unbundle .hg/strip-backup/*-widen.hg | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||
| adding file changes | adding file changes | ||||
| added 3 changesets with 2 changes to 1 files | added 3 changesets with 2 changes to 1 files | ||||
| new changesets *:* (glob) | new changesets *:* (glob) | ||||
| (run 'hg update' to get a working copy) | (run 'hg update' to get a working copy) | ||||
| $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" | $ hg l | ||||
| 2: local | o 2: local | ||||
| ...1: add d10/f | | | ||||
| 0: add d0/f | o ...1: add d10/f | ||||
| | | |||||
| o 0: add d0/f | |||||
| $ hg bookmarks | $ hg bookmarks | ||||
| * bookmark 2:* (glob) | * bookmark 2:* (glob) | ||||