Details
Details
- Reviewers
durin42 - Group Reviewers
hg-reviewers - Commits
- rHGe82a59bfc5e8: tests: conditionalize test output for simple store
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Lint
Lint Skipped - Unit
Unit Tests Skipped
durin42 |
hg-reviewers |
Lint Skipped |
Unit Tests Skipped |
Path | Packages | |||
---|---|---|---|---|
M | tests/test-clone.t (26 lines) | |||
M | tests/test-convert-hg-source.t (5 lines) | |||
M | tests/test-narrow.t (34 lines) |
Status | Author | Revision | |
---|---|---|---|
Abandoned | indygreg | ||
Abandoned | indygreg | ||
Closed | indygreg | ||
Closed | indygreg | ||
Closed | indygreg | ||
Closed | indygreg | ||
Closed | indygreg | ||
Closed | indygreg | ||
Closed | indygreg | ||
Closed | indygreg | ||
Closed | indygreg | ||
Closed | indygreg | ||
Closed | indygreg | ||
Closed | indygreg | ||
Closed | indygreg | ||
Closed | indygreg | ||
Closed | indygreg | ||
Closed | indygreg | ||
Closed | indygreg | ||
Closed | indygreg | ||
Closed | indygreg | ||
Closed | indygreg |
linking: 1 | linking: 1 | ||||
linking: 2 | linking: 2 | ||||
linking: 3 | linking: 3 | ||||
linking: 4 | linking: 4 | ||||
linking: 5 | linking: 5 | ||||
linking: 6 | linking: 6 | ||||
linking: 7 | linking: 7 | ||||
linking: 8 | linking: 8 | ||||
linked 8 files | linked 8 files (reporevlogstore !) | ||||
linking: 9 (reposimplestore !) | |||||
linking: 10 (reposimplestore !) | |||||
linking: 11 (reposimplestore !) | |||||
linking: 12 (reposimplestore !) | |||||
linking: 13 (reposimplestore !) | |||||
linking: 14 (reposimplestore !) | |||||
linking: 15 (reposimplestore !) | |||||
linking: 16 (reposimplestore !) | |||||
linking: 17 (reposimplestore !) | |||||
linking: 18 (reposimplestore !) | |||||
linked 18 files (reposimplestore !) | |||||
#else | #else | ||||
$ hg --debug clone -U . ../c --config progress.debug=true | $ hg --debug clone -U . ../c --config progress.debug=true | ||||
linking: 1 | linking: 1 | ||||
copying: 2 | copying: 2 | ||||
copying: 3 | copying: 3 | ||||
copying: 4 | copying: 4 | ||||
copying: 5 | copying: 5 | ||||
copying: 6 | copying: 6 | ||||
copying: 7 | copying: 7 | ||||
copying: 8 | copying: 8 | ||||
copied 8 files | copied 8 files (reporevlogstore !) | ||||
copying: 9 (reposimplestore !) | |||||
copying: 10 (reposimplestore !) | |||||
copying: 11 (reposimplestore !) | |||||
copying: 12 (reposimplestore !) | |||||
copying: 13 (reposimplestore !) | |||||
copying: 14 (reposimplestore !) | |||||
copying: 15 (reposimplestore !) | |||||
copying: 16 (reposimplestore !) | |||||
copying: 17 (reposimplestore !) | |||||
copying: 18 (reposimplestore !) | |||||
copied 18 files (reposimplestore !) | |||||
#endif | #endif | ||||
$ cd ../c | $ cd ../c | ||||
Ensure branchcache got copied over: | Ensure branchcache got copied over: | ||||
$ ls .hg/cache | $ ls .hg/cache | ||||
branch2-served | branch2-served | ||||
rbc-names-v1 | rbc-names-v1 |
created new head | created new head | ||||
$ HGMERGE=internal:local hg -q merge | $ HGMERGE=internal:local hg -q merge | ||||
$ hg ci -m merge | $ hg ci -m merge | ||||
$ hg mv b d | $ hg mv b d | ||||
$ hg ci -m moveb | $ hg ci -m moveb | ||||
break it | break it | ||||
#if reporevlogstore | |||||
$ rm .hg/store/data/b.* | $ rm .hg/store/data/b.* | ||||
#endif | |||||
#if reposimplestore | |||||
$ rm .hg/store/data/b/* | |||||
#endif | |||||
$ cd .. | $ cd .. | ||||
$ hg --config convert.hg.ignoreerrors=True convert broken fixed | $ hg --config convert.hg.ignoreerrors=True convert broken fixed | ||||
initializing destination fixed repository | initializing destination fixed repository | ||||
scanning source... | scanning source... | ||||
sorting... | sorting... | ||||
converting... | converting... | ||||
4 init | 4 init | ||||
ignoring: data/b.i@1e88685f5dde: no match found | ignoring: data/b.i@1e88685f5dde: no match found |
*: add d0/f (glob) | *: add d0/f (glob) | ||||
$ hg tracked --removeinclude d0 --force-delete-local-changes | $ hg tracked --removeinclude d0 --force-delete-local-changes | ||||
comparing with ssh://user@dummy/master | comparing with ssh://user@dummy/master | ||||
searching for changes | searching for changes | ||||
looking for local changes to affected paths | looking for local changes to affected paths | ||||
The following changeset(s) or their ancestors have local changes not on the remote: | The following changeset(s) or their ancestors have local changes not on the remote: | ||||
* (glob) | * (glob) | ||||
saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) | saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) | ||||
deleting data/d0/f.i | deleting data/d0/f.i (reporevlogstore !) | ||||
deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !) | |||||
deleting data/d0/f/4374b5650fc5ae54ac857c0f0381971fdde376f7 (reposimplestore !) | |||||
deleting data/d0/f/index (reposimplestore !) | |||||
deleting meta/d0/00manifest.i (tree !) | deleting meta/d0/00manifest.i (tree !) | ||||
$ hg log -T "{node|short}: {desc} {outsidenarrow}\n" | $ hg log -T "{node|short}: {desc} {outsidenarrow}\n" | ||||
*: local change to d3 (glob) | *: local change to d3 (glob) | ||||
*: add d10/f outsidenarrow (glob) | *: add d10/f outsidenarrow (glob) | ||||
*: add d6/f (glob) | *: add d6/f (glob) | ||||
*: add d5/f outsidenarrow (glob) | *: add d5/f outsidenarrow (glob) | ||||
*: add d3/f (glob) | *: add d3/f (glob) | ||||
*: add d2/f outsidenarrow (glob) | *: add d2/f outsidenarrow (glob) | ||||
*: add d0/f outsidenarrow (glob) | *: add d0/f outsidenarrow (glob) | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg debugobsolete `hg log -T '{node}' -r 'desc("local change to d0")'` | $ hg debugobsolete `hg log -T '{node}' -r 'desc("local change to d0")'` | ||||
obsoleted 1 changesets | obsoleted 1 changesets | ||||
$ hg tracked --removeinclude d0 | $ hg tracked --removeinclude d0 | ||||
comparing with ssh://user@dummy/master | comparing with ssh://user@dummy/master | ||||
searching for changes | searching for changes | ||||
looking for local changes to affected paths | looking for local changes to affected paths | ||||
saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) | saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) | ||||
deleting data/d0/f.i | deleting data/d0/f.i (reporevlogstore !) | ||||
deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !) | |||||
deleting data/d0/f/4374b5650fc5ae54ac857c0f0381971fdde376f7 (reposimplestore !) | |||||
deleting data/d0/f/index (reposimplestore !) | |||||
deleting meta/d0/00manifest.i (tree !) | deleting meta/d0/00manifest.i (tree !) | ||||
Updates off of stripped commit if necessary | Updates off of stripped commit if necessary | ||||
$ hg co -r 'desc("local change to d3")' -q | $ hg co -r 'desc("local change to d3")' -q | ||||
$ echo local change >> d6/f | $ echo local change >> d6/f | ||||
$ hg ci -m 'local change to d6' | $ hg ci -m 'local change to d6' | ||||
$ hg tracked --removeinclude d3 --force-delete-local-changes | $ hg tracked --removeinclude d3 --force-delete-local-changes | ||||
comparing with ssh://user@dummy/master | comparing with ssh://user@dummy/master | ||||
searching for changes | searching for changes | ||||
looking for local changes to affected paths | looking for local changes to affected paths | ||||
The following changeset(s) or their ancestors have local changes not on the remote: | The following changeset(s) or their ancestors have local changes not on the remote: | ||||
* (glob) | * (glob) | ||||
* (glob) | * (glob) | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) | saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) | ||||
deleting data/d3/f.i | deleting data/d3/f.i (reporevlogstore !) | ||||
deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !) | |||||
deleting data/d3/f/99fa7136105a15e2045ce3d9152e4837c5349e4d (reposimplestore !) | |||||
deleting data/d3/f/index (reposimplestore !) | |||||
deleting meta/d3/00manifest.i (tree !) | deleting meta/d3/00manifest.i (tree !) | ||||
$ hg log -T '{desc}\n' -r . | $ hg log -T '{desc}\n' -r . | ||||
add d10/f | add d10/f | ||||
Updates to nullid if necessary | Updates to nullid if necessary | ||||
$ hg tracked --addinclude d3 -q | $ hg tracked --addinclude d3 -q | ||||
$ hg co null -q | $ hg co null -q | ||||
$ mkdir d3 | $ mkdir d3 | ||||
$ echo local change > d3/f | $ echo local change > d3/f | ||||
$ hg add d3/f | $ hg add d3/f | ||||
$ hg ci -m 'local change to d3' | $ hg ci -m 'local change to d3' | ||||
created new head | created new head | ||||
$ hg tracked --removeinclude d3 --force-delete-local-changes | $ hg tracked --removeinclude d3 --force-delete-local-changes | ||||
comparing with ssh://user@dummy/master | comparing with ssh://user@dummy/master | ||||
searching for changes | searching for changes | ||||
looking for local changes to affected paths | looking for local changes to affected paths | ||||
The following changeset(s) or their ancestors have local changes not on the remote: | The following changeset(s) or their ancestors have local changes not on the remote: | ||||
* (glob) | * (glob) | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) | saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) | ||||
deleting data/d3/f.i | deleting data/d3/f.i (reporevlogstore !) | ||||
deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !) | |||||
deleting data/d3/f/5ce0767945cbdbca3b924bb9fbf5143f72ab40ac (reposimplestore !) | |||||
deleting data/d3/f/index (reposimplestore !) | |||||
deleting meta/d3/00manifest.i (tree !) | deleting meta/d3/00manifest.i (tree !) | ||||
$ hg id | $ hg id | ||||
000000000000 | 000000000000 | ||||
$ cd .. | $ cd .. | ||||
Can remove last include, making repo empty | Can remove last include, making repo empty | ||||
$ hg clone --narrow ssh://user@dummy/master narrow-empty --include d0 -r 5 | $ hg clone --narrow ssh://user@dummy/master narrow-empty --include d0 -r 5 | ||||
adding changesets | adding changesets | ||||
adding manifests | adding manifests | ||||
adding file changes | adding file changes | ||||
added 2 changesets with 1 changes to 1 files | added 2 changesets with 1 changes to 1 files | ||||
new changesets *:* (glob) | new changesets *:* (glob) | ||||
updating to branch default | updating to branch default | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cd narrow-empty | $ cd narrow-empty | ||||
$ hg tracked --removeinclude d0 | $ hg tracked --removeinclude d0 | ||||
comparing with ssh://user@dummy/master | comparing with ssh://user@dummy/master | ||||
searching for changes | searching for changes | ||||
looking for local changes to affected paths | looking for local changes to affected paths | ||||
deleting data/d0/f.i | deleting data/d0/f.i (reporevlogstore !) | ||||
deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !) | |||||
deleting data/d0/f/index (reposimplestore !) | |||||
deleting meta/d0/00manifest.i (tree !) | deleting meta/d0/00manifest.i (tree !) | ||||
$ hg tracked | $ hg tracked | ||||
$ hg files | $ hg files | ||||
[1] | [1] | ||||
$ test -d d0 | $ test -d d0 | ||||
[1] | [1] | ||||
Do some work in the empty clone | Do some work in the empty clone | ||||
$ hg diff --change . | $ hg diff --change . | ||||
I path:d0 | I path:d0 | ||||
I path:d3 | I path:d3 | ||||
I path:d6 | I path:d6 | ||||
I path:d9 | I path:d9 | ||||
$ hg tracked --removeinclude d6 | $ hg tracked --removeinclude d6 | ||||
comparing with ssh://user@dummy/master | comparing with ssh://user@dummy/master | ||||
searching for changes | searching for changes | ||||
looking for local changes to affected paths | looking for local changes to affected paths | ||||
deleting data/d6/f.i | deleting data/d6/f.i (reporevlogstore !) | ||||
deleting data/d6/f/7339d30678f451ac8c3f38753beeb4cf2e1655c7 (reposimplestore !) | |||||
deleting data/d6/f/index (reposimplestore !) | |||||
deleting meta/d6/00manifest.i (tree !) | deleting meta/d6/00manifest.i (tree !) | ||||
$ hg tracked | $ hg tracked | ||||
I path:d0 | I path:d0 | ||||
I path:d3 | I path:d3 | ||||
I path:d9 | I path:d9 | ||||
$ hg debugrebuildfncache | $ hg debugrebuildfncache | ||||
fncache already up to date | fncache already up to date | ||||
$ find * | $ find * | ||||
d0 | d0 | ||||
d0/f | d0/f | ||||
d3 | d3 | ||||
d3/f | d3/f | ||||
d9 | d9 | ||||
d9/f | d9/f | ||||
$ hg verify -q | $ hg verify -q | ||||
$ hg tracked --addexclude d3/f | $ hg tracked --addexclude d3/f | ||||
comparing with ssh://user@dummy/master | comparing with ssh://user@dummy/master | ||||
searching for changes | searching for changes | ||||
looking for local changes to affected paths | looking for local changes to affected paths | ||||
deleting data/d3/f.i | deleting data/d3/f.i (reporevlogstore !) | ||||
$ hg tracked | $ hg tracked | ||||
I path:d0 | I path:d0 | ||||
I path:d3 | I path:d3 | ||||
I path:d9 | I path:d9 | ||||
X path:d3/f | X path:d3/f | ||||
$ hg debugrebuildfncache | $ hg debugrebuildfncache | ||||
fncache already up to date | fncache already up to date | ||||
$ find * | $ find * | ||||
d0 | d0 | ||||
d0/f | d0/f | ||||
d9 | d9 | ||||
d9/f | d9/f | ||||
$ hg verify -q | $ hg verify -q | ||||
$ hg tracked --addexclude d0 | $ hg tracked --addexclude d0 | ||||
comparing with ssh://user@dummy/master | comparing with ssh://user@dummy/master | ||||
searching for changes | searching for changes | ||||
looking for local changes to affected paths | looking for local changes to affected paths | ||||
deleting data/d0/f.i | deleting data/d0/f.i (reporevlogstore !) | ||||
deleting meta/d0/00manifest.i (tree !) | deleting meta/d0/00manifest.i (tree !) | ||||
$ hg tracked | $ hg tracked | ||||
I path:d3 | I path:d3 | ||||
I path:d9 | I path:d9 | ||||
X path:d0 | X path:d0 | ||||
X path:d3/f | X path:d3/f | ||||
$ hg debugrebuildfncache | $ hg debugrebuildfncache | ||||
fncache already up to date | fncache already up to date |