test-subrepo-recursion.t
477 lines
| 12.4 KiB
| text/troff
|
Tads3Lexer
/ tests / test-subrepo-recursion.t
|
r12166 | Create test repository: | ||
|
r12272 | $ hg init repo | ||
$ cd repo | ||||
|
r12166 | $ echo x1 > x.txt | ||
$ hg init foo | ||||
$ cd foo | ||||
$ echo y1 > y.txt | ||||
$ hg init bar | ||||
$ cd bar | ||||
$ echo z1 > z.txt | ||||
$ cd .. | ||||
$ echo 'bar = bar' > .hgsub | ||||
$ cd .. | ||||
$ echo 'foo = foo' > .hgsub | ||||
|
r12270 | |||
Add files --- .hgsub files must go first to trigger subrepos: | ||||
$ hg add -S .hgsub | ||||
$ hg add -S foo/.hgsub | ||||
$ hg add -S foo/bar | ||||
adding foo/bar/z.txt | ||||
$ hg add -S | ||||
adding x.txt | ||||
adding foo/y.txt | ||||
|
r12166 | |||
|
r12175 | Test recursive status without committing anything: | ||
|
r12588 | $ hg status -S | ||
|
r12175 | A .hgsub | ||
A foo/.hgsub | ||||
A foo/bar/z.txt | ||||
A foo/y.txt | ||||
A x.txt | ||||
Test recursive diff without committing anything: | ||||
|
r12588 | $ hg diff --nodates -S foo | ||
|
r12175 | diff -r 000000000000 foo/.hgsub | ||
--- /dev/null | ||||
+++ b/foo/.hgsub | ||||
@@ -0,0 +1,1 @@ | ||||
+bar = bar | ||||
diff -r 000000000000 foo/y.txt | ||||
--- /dev/null | ||||
+++ b/foo/y.txt | ||||
@@ -0,0 +1,1 @@ | ||||
+y1 | ||||
diff -r 000000000000 foo/bar/z.txt | ||||
--- /dev/null | ||||
+++ b/foo/bar/z.txt | ||||
@@ -0,0 +1,1 @@ | ||||
+z1 | ||||
Commits: | ||||
|
r15321 | $ hg commit -m fails | ||
abort: uncommitted changes in subrepo foo | ||||
(use --subrepos for recursive commit) | ||||
[255] | ||||
The --subrepos flag overwrite the config setting: | ||||
$ hg commit -m 0-0-0 --config ui.commitsubrepos=No --subrepos | ||||
|
r12166 | committing subrepository foo | ||
committing subrepository foo/bar | ||||
$ cd foo | ||||
$ echo y2 >> y.txt | ||||
$ hg commit -m 0-1-0 | ||||
$ cd bar | ||||
$ echo z2 >> z.txt | ||||
$ hg commit -m 0-1-1 | ||||
$ cd .. | ||||
$ hg commit -m 0-2-1 | ||||
committing subrepository bar | ||||
$ cd .. | ||||
$ hg commit -m 1-2-1 | ||||
committing subrepository foo | ||||
Change working directory: | ||||
$ echo y3 >> foo/y.txt | ||||
$ echo z3 >> foo/bar/z.txt | ||||
|
r12588 | $ hg status -S | ||
|
r12166 | M foo/bar/z.txt | ||
M foo/y.txt | ||||
|
r12588 | $ hg diff --nodates -S | ||
|
r12167 | diff -r d254738c5f5e foo/y.txt | ||
--- a/foo/y.txt | ||||
+++ b/foo/y.txt | ||||
@@ -1,2 +1,3 @@ | ||||
y1 | ||||
y2 | ||||
+y3 | ||||
diff -r 9647f22de499 foo/bar/z.txt | ||||
--- a/foo/bar/z.txt | ||||
+++ b/foo/bar/z.txt | ||||
@@ -1,2 +1,3 @@ | ||||
z1 | ||||
z2 | ||||
+z3 | ||||
|
r12166 | |||
Status call crossing repository boundaries: | ||||
|
r12588 | $ hg status -S foo/bar/z.txt | ||
|
r12166 | M foo/bar/z.txt | ||
|
r12588 | $ hg status -S -I 'foo/?.txt' | ||
|
r12166 | M foo/y.txt | ||
|
r12588 | $ hg status -S -I '**/?.txt' | ||
|
r12166 | M foo/bar/z.txt | ||
M foo/y.txt | ||||
|
r12588 | $ hg diff --nodates -S -I '**/?.txt' | ||
|
r12167 | diff -r d254738c5f5e foo/y.txt | ||
--- a/foo/y.txt | ||||
+++ b/foo/y.txt | ||||
@@ -1,2 +1,3 @@ | ||||
y1 | ||||
y2 | ||||
+y3 | ||||
diff -r 9647f22de499 foo/bar/z.txt | ||||
--- a/foo/bar/z.txt | ||||
+++ b/foo/bar/z.txt | ||||
@@ -1,2 +1,3 @@ | ||||
z1 | ||||
z2 | ||||
+z3 | ||||
|
r12166 | |||
Status from within a subdirectory: | ||||
$ mkdir dir | ||||
$ cd dir | ||||
$ echo a1 > a.txt | ||||
|
r12588 | $ hg status -S | ||
|
r12166 | M foo/bar/z.txt | ||
M foo/y.txt | ||||
? dir/a.txt | ||||
|
r12588 | $ hg diff --nodates -S | ||
|
r12167 | diff -r d254738c5f5e foo/y.txt | ||
--- a/foo/y.txt | ||||
+++ b/foo/y.txt | ||||
@@ -1,2 +1,3 @@ | ||||
y1 | ||||
y2 | ||||
+y3 | ||||
diff -r 9647f22de499 foo/bar/z.txt | ||||
--- a/foo/bar/z.txt | ||||
+++ b/foo/bar/z.txt | ||||
@@ -1,2 +1,3 @@ | ||||
z1 | ||||
z2 | ||||
+z3 | ||||
|
r12166 | |||
Status with relative path: | ||||
|
r12588 | $ hg status -S .. | ||
|
r12166 | M ../foo/bar/z.txt | ||
M ../foo/y.txt | ||||
? a.txt | ||||
|
r12588 | $ hg diff --nodates -S .. | ||
|
r12167 | diff -r d254738c5f5e foo/y.txt | ||
--- a/foo/y.txt | ||||
+++ b/foo/y.txt | ||||
@@ -1,2 +1,3 @@ | ||||
y1 | ||||
y2 | ||||
+y3 | ||||
diff -r 9647f22de499 foo/bar/z.txt | ||||
--- a/foo/bar/z.txt | ||||
+++ b/foo/bar/z.txt | ||||
@@ -1,2 +1,3 @@ | ||||
z1 | ||||
z2 | ||||
+z3 | ||||
|
r12166 | $ cd .. | ||
|
r12167 | Cleanup and final commit: | ||
$ rm -r dir | ||||
|
r15321 | $ hg commit --subrepos -m 2-3-2 | ||
|
r12167 | committing subrepository foo | ||
committing subrepository foo/bar | ||||
Log with the relationships between repo and its subrepo: | ||||
$ hg log --template '{rev}:{node|short} {desc}\n' | ||||
2:1326fa26d0c0 2-3-2 | ||||
1:4b3c9ff4f66b 1-2-1 | ||||
0:23376cbba0d8 0-0-0 | ||||
$ hg -R foo log --template '{rev}:{node|short} {desc}\n' | ||||
3:65903cebad86 2-3-2 | ||||
2:d254738c5f5e 0-2-1 | ||||
1:8629ce7dcc39 0-1-0 | ||||
0:af048e97ade2 0-0-0 | ||||
$ hg -R foo/bar log --template '{rev}:{node|short} {desc}\n' | ||||
2:31ecbdafd357 2-3-2 | ||||
1:9647f22de499 0-1-1 | ||||
0:4904098473f9 0-0-0 | ||||
|
r12166 | Status between revisions: | ||
|
r12588 | $ hg status -S | ||
$ hg status -S --rev 0:1 | ||||
|
r12166 | M .hgsubstate | ||
M foo/.hgsubstate | ||||
M foo/bar/z.txt | ||||
M foo/y.txt | ||||
|
r12588 | $ hg diff --nodates -S -I '**/?.txt' --rev 0:1 | ||
|
r12167 | diff -r af048e97ade2 -r d254738c5f5e foo/y.txt | ||
--- a/foo/y.txt | ||||
+++ b/foo/y.txt | ||||
@@ -1,1 +1,2 @@ | ||||
y1 | ||||
+y2 | ||||
diff -r 4904098473f9 -r 9647f22de499 foo/bar/z.txt | ||||
--- a/foo/bar/z.txt | ||||
+++ b/foo/bar/z.txt | ||||
@@ -1,1 +1,2 @@ | ||||
z1 | ||||
+z2 | ||||
|
r12272 | |||
|
r13144 | Enable progress extension for archive tests: | ||
$ cp $HGRCPATH $HGRCPATH.no-progress | ||||
$ cat >> $HGRCPATH <<EOF | ||||
> [extensions] | ||||
> progress = | ||||
> [progress] | ||||
> assume-tty = 1 | ||||
> delay = 0 | ||||
|
r13149 | > format = topic bar number | ||
|
r13144 | > refresh = 0 | ||
> width = 60 | ||||
> EOF | ||||
Test archiving to a directory tree (the doubled lines in the output | ||||
only show up in the test output, not in real usage): | ||||
|
r12323 | |||
|
r13144 | $ hg archive --subrepos ../archive 2>&1 | $TESTDIR/filtercr.py | ||
archiving [ ] 0/3 | ||||
archiving [ ] 0/3 | ||||
archiving [=============> ] 1/3 | ||||
archiving [=============> ] 1/3 | ||||
archiving [===========================> ] 2/3 | ||||
archiving [===========================> ] 2/3 | ||||
archiving [==========================================>] 3/3 | ||||
archiving [==========================================>] 3/3 | ||||
archiving (foo) [ ] 0/3 | ||||
archiving (foo) [ ] 0/3 | ||||
archiving (foo) [===========> ] 1/3 | ||||
archiving (foo) [===========> ] 1/3 | ||||
archiving (foo) [=======================> ] 2/3 | ||||
archiving (foo) [=======================> ] 2/3 | ||||
archiving (foo) [====================================>] 3/3 | ||||
archiving (foo) [====================================>] 3/3 | ||||
archiving (foo/bar) [ ] 0/1 | ||||
archiving (foo/bar) [ ] 0/1 | ||||
archiving (foo/bar) [================================>] 1/1 | ||||
archiving (foo/bar) [================================>] 1/1 | ||||
\r (esc) | ||||
|
r12363 | $ find ../archive | sort | ||
|
r12323 | ../archive | ||
|
r12363 | ../archive/.hg_archival.txt | ||
../archive/.hgsub | ||||
../archive/.hgsubstate | ||||
|
r12323 | ../archive/foo | ||
|
r12363 | ../archive/foo/.hgsub | ||
../archive/foo/.hgsubstate | ||||
|
r12323 | ../archive/foo/bar | ||
../archive/foo/bar/z.txt | ||||
../archive/foo/y.txt | ||||
../archive/x.txt | ||||
|
r12339 | Test archiving to zip file (unzip output is unstable): | ||
|
r12323 | |||
|
r13144 | $ hg archive --subrepos ../archive.zip 2>&1 | $TESTDIR/filtercr.py | ||
archiving [ ] 0/3 | ||||
archiving [ ] 0/3 | ||||
archiving [=============> ] 1/3 | ||||
archiving [=============> ] 1/3 | ||||
archiving [===========================> ] 2/3 | ||||
archiving [===========================> ] 2/3 | ||||
archiving [==========================================>] 3/3 | ||||
archiving [==========================================>] 3/3 | ||||
archiving (foo) [ ] 0/3 | ||||
archiving (foo) [ ] 0/3 | ||||
archiving (foo) [===========> ] 1/3 | ||||
archiving (foo) [===========> ] 1/3 | ||||
archiving (foo) [=======================> ] 2/3 | ||||
archiving (foo) [=======================> ] 2/3 | ||||
archiving (foo) [====================================>] 3/3 | ||||
archiving (foo) [====================================>] 3/3 | ||||
archiving (foo/bar) [ ] 0/1 | ||||
archiving (foo/bar) [ ] 0/1 | ||||
archiving (foo/bar) [================================>] 1/1 | ||||
archiving (foo/bar) [================================>] 1/1 | ||||
\r (esc) | ||||
|
r15286 | Test archiving a revision that references a subrepo that is not yet | ||
cloned: | ||||
$ hg clone -U . ../empty | ||||
$ cd ../empty | ||||
$ hg archive --subrepos -r tip ../archive.tar.gz 2>&1 | $TESTDIR/filtercr.py | ||||
archiving [ ] 0/3 | ||||
archiving [ ] 0/3 | ||||
archiving [=============> ] 1/3 | ||||
archiving [=============> ] 1/3 | ||||
archiving [===========================> ] 2/3 | ||||
archiving [===========================> ] 2/3 | ||||
archiving [==========================================>] 3/3 | ||||
archiving [==========================================>] 3/3 | ||||
archiving (foo) [ ] 0/3 | ||||
archiving (foo) [ ] 0/3 | ||||
archiving (foo) [===========> ] 1/3 | ||||
archiving (foo) [===========> ] 1/3 | ||||
archiving (foo) [=======================> ] 2/3 | ||||
archiving (foo) [=======================> ] 2/3 | ||||
archiving (foo) [====================================>] 3/3 | ||||
archiving (foo) [====================================>] 3/3 | ||||
archiving (foo/bar) [ ] 0/1 | ||||
archiving (foo/bar) [ ] 0/1 | ||||
archiving (foo/bar) [================================>] 1/1 | ||||
archiving (foo/bar) [================================>] 1/1 | ||||
cloning subrepo foo from $TESTTMP/repo/foo | ||||
cloning subrepo foo/bar from $TESTTMP/repo/foo/bar | ||||
The newly cloned subrepos contain no working copy: | ||||
$ hg -R foo summary | ||||
parent: -1:000000000000 (no revision checked out) | ||||
branch: default | ||||
commit: (clean) | ||||
update: 4 new changesets (update) | ||||
|
r13144 | Disable progress extension and cleanup: | ||
$ mv $HGRCPATH.no-progress $HGRCPATH | ||||
|
r12323 | |||
|
r15287 | Test archiving when there is a directory in the way for a subrepo | ||
created by archive: | ||||
$ hg clone -U . ../almost-empty | ||||
$ cd ../almost-empty | ||||
$ mkdir foo | ||||
$ echo f > foo/f | ||||
$ hg archive --subrepos -r tip archive | ||||
cloning subrepo foo from $TESTTMP/empty/foo | ||||
abort: destination '$TESTTMP/almost-empty/foo' is not empty | ||||
[255] | ||||
|
r12272 | Clone and test outgoing: | ||
$ cd .. | ||||
$ hg clone repo repo2 | ||||
updating to branch default | ||||
|
r14281 | cloning subrepo foo from $TESTTMP/repo/foo | ||
cloning subrepo foo/bar from $TESTTMP/repo/foo/bar | ||||
|
r12272 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
$ cd repo2 | ||||
$ hg outgoing -S | ||||
|
r12640 | comparing with $TESTTMP/repo | ||
|
r12272 | searching for changes | ||
no changes found | ||||
|
r12640 | comparing with $TESTTMP/repo/foo | ||
|
r12272 | searching for changes | ||
no changes found | ||||
|
r12640 | comparing with $TESTTMP/repo/foo/bar | ||
|
r12400 | searching for changes | ||
no changes found | ||||
|
r12316 | [1] | ||
|
r12272 | |||
Make nested change: | ||||
$ echo y4 >> foo/y.txt | ||||
|
r12588 | $ hg diff --nodates -S | ||
|
r12272 | diff -r 65903cebad86 foo/y.txt | ||
--- a/foo/y.txt | ||||
+++ b/foo/y.txt | ||||
@@ -1,3 +1,4 @@ | ||||
y1 | ||||
y2 | ||||
y3 | ||||
+y4 | ||||
|
r15321 | $ hg commit --subrepos -m 3-4-2 | ||
|
r12272 | committing subrepository foo | ||
$ hg outgoing -S | ||||
|
r12640 | comparing with $TESTTMP/repo | ||
|
r12272 | searching for changes | ||
changeset: 3:2655b8ecc4ee | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 3-4-2 | ||||
|
r12640 | comparing with $TESTTMP/repo/foo | ||
|
r12272 | searching for changes | ||
changeset: 4:e96193d6cb36 | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 3-4-2 | ||||
|
r12640 | comparing with $TESTTMP/repo/foo/bar | ||
|
r12400 | searching for changes | ||
no changes found | ||||
|
r12274 | |||
|
r12588 | |||
|
r12274 | Switch to original repo and setup default path: | ||
$ cd ../repo | ||||
$ echo '[paths]' >> .hg/hgrc | ||||
$ echo 'default = ../repo2' >> .hg/hgrc | ||||
Test incoming: | ||||
$ hg incoming -S | ||||
|
r12640 | comparing with $TESTTMP/repo2 | ||
|
r12274 | searching for changes | ||
changeset: 3:2655b8ecc4ee | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 3-4-2 | ||||
|
r12640 | comparing with $TESTTMP/repo2/foo | ||
|
r12274 | searching for changes | ||
changeset: 4:e96193d6cb36 | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 3-4-2 | ||||
|
r12640 | comparing with $TESTTMP/repo2/foo/bar | ||
|
r12400 | searching for changes | ||
no changes found | ||||
|
r12274 | $ hg incoming -S --bundle incoming.hg | ||
abort: cannot combine --bundle and --subrepos | ||||
|
r12316 | [255] | ||
|
r12274 | |||
|
r12275 | Test missing subrepo: | ||
$ rm -r foo | ||||
|
r12588 | $ hg status -S | ||
|
r12503 | warning: error "unknown revision '65903cebad86f1a84bd4f1134f62fa7dcb7a1c98'" in subrepository "foo" | ||
|
r13339 | |||
Issue2619: IndexError: list index out of range on hg add with subrepos | ||||
The subrepo must sorts after the explicit filename. | ||||
$ cd .. | ||||
$ hg init test | ||||
$ cd test | ||||
$ hg init x | ||||
$ echo "x = x" >> .hgsub | ||||
$ hg add .hgsub | ||||
$ touch a x/a | ||||
$ hg add a x/a | ||||