This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1979

tests: fold narrow treemanifest tests into main test file using testcases
ClosedPublic

Authored by durin42 on Feb 1 2018, 6:00 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGdc01484606da: tests: fold narrow treemanifest tests into main test file using testcases
Summary

These tests predate the testcases functionality in run-tests.py, so it
was never done in narrowhg.

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

durin42 created this revision.Feb 1 2018, 6:00 PM
indygreg accepted this revision.Feb 5 2018, 4:24 PM
indygreg added a subscriber: indygreg.

Very nice.

This revision is now accepted and ready to land.Feb 5 2018, 4:24 PM
Closed by commit rHGdc01484606da: tests: fold narrow treemanifest tests into main test file using testcases (authored by durin42). · Explain WhyFeb 12 2018, 6:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 5546

tests/test-narrow-commit-tree.t

  • This file was deleted.
$ cd $TESTDIR && python $RUNTESTDIR/run-tests.py \
> --extra-config-opt experimental.treemanifest=1 test-narrow-commit.t 2>&1 | \
> grep -v 'unexpected mercurial lib' | egrep -v '\(expected'
--- */tests/test-narrow-commit.t (glob)
+++ */tests/test-narrow-commit.t.err (glob)
@@ -\d+,\d+ \+\d+,\d+ @@ (re)
created new head
$ hg files -r .
inside/f1
- outside/f1
+ outside/
Some filesystems (notably FAT/exFAT only store timestamps with 2
seconds of precision, so by sleeping for 3 seconds, we can ensure that
the timestamps of files stored by dirstate will appear older than the
ERROR: test-narrow-commit.t output changed
!
Failed test-narrow-commit.t: output changed
# Ran 1 tests, 0 skipped, 1 failed.
python hash seed: * (glob)

tests/test-narrow-commit.t

#testcases flat tree
$ . "$TESTDIR/narrow-library.sh" $ . "$TESTDIR/narrow-library.sh"
#if tree
$ cat << EOF >> $HGRCPATH
> [experimental]
> treemanifest = 1
> EOF
#endif
create full repo create full repo
$ hg init master $ hg init master
$ cd master $ cd master
$ mkdir inside $ mkdir inside
$ echo inside > inside/f1 $ echo inside > inside/f1
$ mkdir outside $ mkdir outside
Can commit changes inside. Leaves outside unchanged. Can commit changes inside. Leaves outside unchanged.
$ hg update -q 'desc("initial")' $ hg update -q 'desc("initial")'
$ echo modified2 > inside/f1 $ echo modified2 > inside/f1
$ hg commit -m 'modify inside/f1' $ hg commit -m 'modify inside/f1'
created new head created new head
$ hg files -r . $ hg files -r .
inside/f1 inside/f1
outside/f1 outside/f1 (flat !)
outside/ (tree !)
Some filesystems (notably FAT/exFAT only store timestamps with 2 Some filesystems (notably FAT/exFAT only store timestamps with 2
seconds of precision, so by sleeping for 3 seconds, we can ensure that seconds of precision, so by sleeping for 3 seconds, we can ensure that
the timestamps of files stored by dirstate will appear older than the the timestamps of files stored by dirstate will appear older than the
dirstate file, and therefore we'll be able to get stable output from dirstate file, and therefore we'll be able to get stable output from
debugdirstate. If we don't do this, the test can be slightly flaky. debugdirstate. If we don't do this, the test can be slightly flaky.
$ sleep 3 $ sleep 3
$ hg status $ hg status
$ hg debugdirstate --nodates $ hg debugdirstate --nodates
n 644 10 set inside/f1 n 644 10 set inside/f1

tests/test-narrow-merge-tree.t

  • This file was deleted.
$ cd $TESTDIR && python $RUNTESTDIR/run-tests.py \
> --extra-config-opt experimental.treemanifest=1 test-narrow-merge.t 2>&1 | \
> grep -v 'unexpected mercurial lib' | egrep -v '\(expected'
--- */tests/test-narrow-merge.t (glob)
+++ */tests/test-narrow-merge.t.err (glob)
@@ -\d+,\d+ \+\d+,\d+ @@ (re)
$ hg update -q 'desc("modify inside/f1")'
$ hg merge 'desc("modify outside/f1")'
- abort: merge affects file 'outside/f1' outside narrow, which is not yet supported
+ abort: merge affects file 'outside/' outside narrow, which is not yet supported
(merging in the other direction may work)
[255]
@@ -\d+,\d+ \+\d+,\d+ @@ (re)
$ hg update -q 'desc("modify outside/f1")'
$ hg merge 'desc("conflicting outside/f1")'
- abort: conflict in file 'outside/f1' is outside narrow clone
+ abort: conflict in file 'outside/' is outside narrow clone
[255]
ERROR: test-narrow-merge.t output changed
!
Failed test-narrow-merge.t: output changed
# Ran 1 tests, 0 skipped, 1 failed.
python hash seed: * (glob)

tests/test-narrow-merge.t

#testcases flat tree
$ . "$TESTDIR/narrow-library.sh" $ . "$TESTDIR/narrow-library.sh"
#if tree
$ cat << EOF >> $HGRCPATH
> [experimental]
> treemanifest = 1
> EOF
#endif
create full repo create full repo
$ hg init master $ hg init master
$ cd master $ cd master
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [narrow] > [narrow]
> serveellipses=True > serveellipses=True
> EOF > EOF
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
$ hg commit -m 'merge inside/f1' $ hg commit -m 'merge inside/f1'
TODO: Can merge non-conflicting changes outside narrow spec TODO: Can merge non-conflicting changes outside narrow spec
$ hg update -q 'desc("modify inside/f1")' $ hg update -q 'desc("modify inside/f1")'
$ hg merge 'desc("modify outside/f1")' $ hg merge 'desc("modify outside/f1")'
abort: merge affects file 'outside/f1' outside narrow, which is not yet supported abort: merge affects file 'outside/f1' outside narrow, which is not yet supported (flat !)
abort: merge affects file 'outside/' outside narrow, which is not yet supported (tree !)
(merging in the other direction may work) (merging in the other direction may work)
[255] [255]
$ hg update -q 'desc("modify outside/f1")' $ hg update -q 'desc("modify outside/f1")'
$ hg merge 'desc("modify inside/f1")' $ hg merge 'desc("modify inside/f1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m 'merge from inside to outside' $ hg ci -m 'merge from inside to outside'
Refuses merge of conflicting outside changes Refuses merge of conflicting outside changes
$ hg update -q 'desc("modify outside/f1")' $ hg update -q 'desc("modify outside/f1")'
$ hg merge 'desc("conflicting outside/f1")' $ hg merge 'desc("conflicting outside/f1")'
abort: conflict in file 'outside/f1' is outside narrow clone abort: conflict in file 'outside/f1' is outside narrow clone (flat !)
abort: conflict in file 'outside/' is outside narrow clone (tree !)
[255] [255]

tests/test-narrow-patch-tree.t

  • This file was deleted.
$ cd $TESTDIR && python $RUNTESTDIR/run-tests.py \
> --extra-config-opt experimental.treemanifest=1 test-patch.t 2>&1 | \
> grep -v 'unexpected mercurial lib' | egrep -v '\(expected'
.
# Ran 1 tests, 0 skipped, 0 failed.

tests/test-narrow-patch.t

#testcases flat tree
$ . "$TESTDIR/narrow-library.sh" $ . "$TESTDIR/narrow-library.sh"
#if tree
$ cat << EOF >> $HGRCPATH
> [experimental]
> treemanifest = 1
> EOF
#endif
create full repo create full repo
$ hg init master $ hg init master
$ cd master $ cd master
$ mkdir inside $ mkdir inside
$ echo inside > inside/f1 $ echo inside > inside/f1
$ mkdir outside $ mkdir outside

tests/test-narrow-strip-tree.t

  • This file was deleted.
$ cd $TESTDIR && python $RUNTESTDIR/run-tests.py \
> --extra-config-opt experimental.treemanifest=1 test-narrow-strip.t 2>&1 | \
> grep -v 'unexpected mercurial lib' | egrep -v '\(expected'
--- */test-narrow-strip.t (glob)
+++ */test-narrow-strip.t.err (glob)
@@ -\d+,\d+ \+\d+,\d+ @@ (re)
o 0 initial
$ hg debugdata -m 1
- inside/f1\x004d6a634d5ba06331a60c29ee0db8412490a54fcd (esc)
- outside/f1\x0084ba604d54dee1f13310ce3d4ac2e8a36636691a (esc)
+ inside\x006a8bc41df94075d501f9740587a0c0e13c170dc5t (esc)
+ outside\x00255c2627ebdd3c7dcaa6945246f9b9f02bd45a09t (esc)
$ rm -f $TESTTMP/narrow/.hg/strip-backup/*-backup.hg
$ hg strip .
@@ -\d+,\d+ \+\d+,\d+ @@ (re)
Check that hash of file outside narrow spec got restored
$ hg debugdata -m 2
- inside/f1\x004d6a634d5ba06331a60c29ee0db8412490a54fcd (esc)
- outside/f1\x0084ba604d54dee1f13310ce3d4ac2e8a36636691a (esc)
+ inside\x006a8bc41df94075d501f9740587a0c0e13c170dc5t (esc)
+ outside\x00255c2627ebdd3c7dcaa6945246f9b9f02bd45a09t (esc)
Also verify we can apply the bundle with 'hg pull':
$ hg co -r 'desc("modify inside")'
@@ -\d+,\d+ \+\d+,\d+ @@ (re)
date: Thu Jan 01 00:00:00 1970 +0000
summary: initial
- changeset: 1:9e48d953700d
+ changeset: 1:3888164bccf0
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: modify outside again
- changeset: 2:f505d5e96aa8
+ changeset: 2:40b66f95a209
tag: tip
- parent: 0:a99f4d53924d
+ parent: 0:c2a5fabcca3c
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: modify inside
ERROR: test-narrow-strip.t output changed
!
Failed test-narrow-strip.t: output changed
# Ran 1 tests, 0 skipped, 1 failed.
python hash seed: * (glob)

tests/test-narrow-strip.t

#testcases flat tree
$ . "$TESTDIR/narrow-library.sh" $ . "$TESTDIR/narrow-library.sh"
#if tree
$ cat << EOF >> $HGRCPATH
> [experimental]
> treemanifest = 1
> EOF
#endif
create full repo create full repo
$ hg init master $ hg init master
$ cd master $ cd master
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [narrow] > [narrow]
> serveellipses=True > serveellipses=True
> EOF > EOF
$ hg log -G -T '{rev} {desc}\n' $ hg log -G -T '{rev} {desc}\n'
o 2 modify inside o 2 modify inside
| |
| @ 1 modify outside again | @ 1 modify outside again
|/ |/
o 0 initial o 0 initial
$ hg debugdata -m 1 $ hg debugdata -m 1
inside/f1\x004d6a634d5ba06331a60c29ee0db8412490a54fcd (esc) inside/f1\x004d6a634d5ba06331a60c29ee0db8412490a54fcd (esc) (flat !)
outside/f1\x0084ba604d54dee1f13310ce3d4ac2e8a36636691a (esc) outside/f1\x0084ba604d54dee1f13310ce3d4ac2e8a36636691a (esc) (flat !)
inside\x006a8bc41df94075d501f9740587a0c0e13c170dc5t (esc) (tree !)
outside\x00255c2627ebdd3c7dcaa6945246f9b9f02bd45a09t (esc) (tree !)
$ rm -f $TESTTMP/narrow/.hg/strip-backup/*-backup.hg $ rm -f $TESTTMP/narrow/.hg/strip-backup/*-backup.hg
$ hg strip . $ hg strip .
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)
$ hg unbundle .hg/strip-backup/*-backup.hg $ hg unbundle .hg/strip-backup/*-backup.hg
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads) added 1 changesets with 0 changes to 0 files (+1 heads)
new changesets * (glob) new changesets * (glob)
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg log -G -T '{rev} {desc}\n' $ hg log -G -T '{rev} {desc}\n'
o 2 modify outside again o 2 modify outside again
| |
| o 1 modify inside | o 1 modify inside
|/ |/
@ 0 initial @ 0 initial
Check that hash of file outside narrow spec got restored Check that hash of file outside narrow spec got restored
$ hg debugdata -m 2 $ hg debugdata -m 2
inside/f1\x004d6a634d5ba06331a60c29ee0db8412490a54fcd (esc) inside/f1\x004d6a634d5ba06331a60c29ee0db8412490a54fcd (esc) (flat !)
outside/f1\x0084ba604d54dee1f13310ce3d4ac2e8a36636691a (esc) outside/f1\x0084ba604d54dee1f13310ce3d4ac2e8a36636691a (esc) (flat !)
inside\x006a8bc41df94075d501f9740587a0c0e13c170dc5t (esc) (tree !)
outside\x00255c2627ebdd3c7dcaa6945246f9b9f02bd45a09t (esc) (tree !)
Also verify we can apply the bundle with 'hg pull': Also verify we can apply the bundle with 'hg pull':
$ hg co -r 'desc("modify inside")' $ hg co -r 'desc("modify 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
$ rm .hg/strip-backup/*-backup.hg $ rm .hg/strip-backup/*-backup.hg
$ hg strip . $ hg strip .
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)
$ hg incoming .hg/strip-backup/*-backup.hg $ hg incoming .hg/strip-backup/*-backup.hg
comparing with .hg/strip-backup/*-backup.hg (glob) comparing with .hg/strip-backup/*-backup.hg (glob)
changeset: 0:* (glob) changeset: 0:* (glob)
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: initial summary: initial
changeset: 1:9e48d953700d changeset: 1:9e48d953700d (flat !)
changeset: 1:3888164bccf0 (tree !)
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: modify outside again summary: modify outside again
changeset: 2:f505d5e96aa8 changeset: 2:f505d5e96aa8 (flat !)
changeset: 2:40b66f95a209 (tree !)
tag: tip tag: tip
parent: 0:a99f4d53924d parent: 0:a99f4d53924d (flat !)
parent: 0:c2a5fabcca3c (tree !)
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: modify inside summary: modify inside
$ hg pull .hg/strip-backup/*-backup.hg $ hg pull .hg/strip-backup/*-backup.hg
pulling from .hg/strip-backup/*-backup.hg (glob) pulling from .hg/strip-backup/*-backup.hg (glob)
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 3 changesets with 2 changes to 1 files (+1 heads) added 3 changesets with 2 changes to 1 files (+1 heads)
new changesets *:* (glob) new changesets *:* (glob)
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)

tests/test-narrow-tree.t

  • This file was deleted.
$ cd $TESTDIR && python $RUNTESTDIR/run-tests.py \
> --extra-config-opt experimental.treemanifest=1 test-narrow-narrow.t 2>&1 | \
> grep -v 'unexpected mercurial lib' | egrep -v '\(expected'
--- /*/tests/test-narrow-narrow.t (glob)
+++ /*/tests/test-narrow-narrow.t.err (glob)
@@ -\d+,\d+ \+\d+,\d+ @@ (re)
* (glob)
* (glob)
deleting data/d0/f.i
+ deleting meta/d0/00manifest.i
$ hg log -T "{node|short}: {desc} {outsidenarrow}\n"
*: local change to d3 (glob)
*: add d10/f outsidenarrow (glob)
@@ -\d+,\d+ \+\d+,\d+ @@ (re)
looking for local changes to affected paths
saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
deleting data/d0/f.i
+ deleting meta/d0/00manifest.i
Updates off of stripped commit if necessary
$ hg co -r 'desc("local change to d3")' -q
$ echo local change >> d6/f
@@ -\d+,\d+ \+\d+,\d+ @@ (re)
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)
deleting data/d3/f.i
+ deleting meta/d3/00manifest.i
$ hg log -T '{desc}\n' -r .
add d10/f
Updates to nullid if necessary
@@ -\d+,\d+ \+\d+,\d+ @@ (re)
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)
deleting data/d3/f.i
+ deleting meta/d3/00manifest.i
$ hg id
000000000000
$ cd ..
@@ -\d+,\d+ \+\d+,\d+ @@ (re)
searching for changes
looking for local changes to affected paths
deleting data/d0/f.i
+ deleting meta/d0/00manifest.i
$ hg tracked
$ hg files
[1]
@@ -\d+,\d+ \+\d+,\d+ @@ (re)
searching for changes
looking for local changes to affected paths
deleting data/d6/f.i
+ deleting meta/d6/00manifest.i
$ hg tracked
I path:d0
I path:d3
@@ -\d+,\d+ \+\d+,\d+ @@ (re)
searching for changes
looking for local changes to affected paths
deleting data/d0/f.i
+ deleting meta/d0/00manifest.i
$ hg tracked
I path:d3
I path:d9
ERROR: test-narrow-narrow.t output changed
!
Failed test-narrow-narrow.t: output changed
# Ran 1 tests, 0 skipped, 1 failed.
python hash seed: * (glob)

tests/test-narrow-widen-tree.t

  • This file was deleted.
$ cd $TESTDIR && python $RUNTESTDIR/run-tests.py \
> --extra-config-opt experimental.treemanifest=1 test-narrow-widen.t 2>&1 | \
> grep -v 'unexpected mercurial lib' | egrep -v '\(expected'
--- */test-narrow-widen.t (glob)
+++ */test-narrow-widen.t.err (glob)
@@ -\d+,\d+ \+\d+,\d+ @@ (re)
$ hg verify
checking changesets
checking manifests
+ checking directory manifests
crosschecking files in changesets and manifests
checking files
4 files, 8 changesets, 4 total revisions
@@ -\d+,\d+ \+\d+,\d+ @@ (re)
$ hg verify
checking changesets
checking manifests
+ checking directory manifests
crosschecking files in changesets and manifests
checking files
5 files, 9 changesets, 5 total revisions
ERROR: test-narrow-widen.t output changed
!
Failed test-narrow-widen.t: output changed
# Ran 1 tests, 0 skipped, 1 failed.
python hash seed: * (glob)

tests/test-narrow-widen.t

#testcases flat tree
$ . "$TESTDIR/narrow-library.sh" $ . "$TESTDIR/narrow-library.sh"
#if tree
$ cat << EOF >> $HGRCPATH
> [experimental]
> treemanifest = 1
> EOF
#endif
$ hg init master $ hg init master
$ cd master $ cd master
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [narrow] > [narrow]
> serveellipses=True > serveellipses=True
> EOF > EOF
$ mkdir inside $ mkdir inside
$ hg tracked $ hg tracked
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 verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
checking directory manifests (tree !)
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
4 files, 8 changesets, 4 total revisions 4 files, 8 changesets, 4 total revisions
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
...*: add d10/f (glob) ...*: add d10/f (glob)
*: add d9/f (glob) *: add d9/f (glob)
...*: add d8/f (glob) ...*: add d8/f (glob)
*: add d6/f (glob) *: add d6/f (glob)
*: 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 (tree !)
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
5 files, 9 changesets, 5 total revisions 5 files, 9 changesets, 5 total revisions
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

tests/test-narrow.t

#testcases flat tree
$ . "$TESTDIR/narrow-library.sh" $ . "$TESTDIR/narrow-library.sh"
#if tree
$ cat << EOF >> $HGRCPATH
> [experimental]
> treemanifest = 1
> EOF
#endif
$ hg init master $ hg init master
$ cd master $ cd master
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [narrow] > [narrow]
> serveellipses=True > serveellipses=True
> EOF > EOF
$ for x in `$TESTDIR/seq.py 0 10` $ for x in `$TESTDIR/seq.py 0 10`
> do > do
$ 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
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)
$ 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
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
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
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
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 .
$ hg branch foo $ hg branch foo
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
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
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
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
$ find * $ find *
tests/test-narrow-strip.t