facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity
9e7aaa60ee
sapling/tests/test-subrepo-recursion.t

501 lines
14 KiB
Perl
Raw Normal View History

status: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
Create test repository:
outgoing: recurse into subrepositories with --subrepos/-S flag As with push, the optional destination path is ignored for the subrepositories, i.e., they are always compared with their default push path. Fixing this is Issue1852.
2010-09-13 15:09:26 +04:00
$ hg init repo
$ cd repo
status: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
$ 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
add: recurse into subrepositories with --subrepos/-S flag
2010-09-13 15:09:20 +04:00
Add files --- .hgsub files must go first to trigger subrepos:
$ hg add -S .hgsub
$ hg add -S foo/.hgsub
$ hg add -S foo/bar
tests: add missing '(glob)'s to match '\' in paths in test output on windows
2011-11-16 06:45:14 +04:00
adding foo/bar/z.txt (glob)
add: recurse into subrepositories with --subrepos/-S flag
2010-09-13 15:09:20 +04:00
$ hg add -S
adding x.txt
tests: add missing '(glob)'s to match '\' in paths in test output on windows
2011-11-16 06:45:14 +04:00
adding foo/y.txt (glob)
status: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
subrepos: handle modified but uncommitted .hgsub
2010-09-07 18:23:55 +04:00
Test recursive status without committing anything:
test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test
2010-09-28 15:09:22 +04:00
$ hg status -S
subrepos: handle modified but uncommitted .hgsub
2010-09-07 18:23:55 +04:00
A .hgsub
A foo/.hgsub
A foo/bar/z.txt
A foo/y.txt
A x.txt
Test recursive diff without committing anything:
test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test
2010-09-28 15:09:22 +04:00
$ hg diff --nodates -S foo
subrepos: handle modified but uncommitted .hgsub
2010-09-07 18:23:55 +04:00
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:
subrepos: abort commit by default if a subrepo is dirty (BC) This changeset flips the default value of ui.commitsubrepos setting from True to False and adds a --subrepos flag to commit. The commit, status, and diff commands behave like this with regard to recusion and the ui.commitsubrepos setting: | recurses | recurses | by default | with --subrepos --------+---------------+---------------- commit: | commitsubrepo | True status: | False | True diff: | False | True By changing the default from True to False, the table becomes consistent in the two columns: * without --subrepos on the command line, commit will abort if a subrepo is dirty and status/diff wont show changes inside subrepos. * with --subrepos, all three commands will recurse. A --subrepos flag on the command line overrides the config settin.g
2011-10-21 02:33:08 +04:00
$ 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
status: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
committing subrepository foo
tests: add missing '(glob)'s to match '\' in paths in test output on windows
2011-11-16 06:45:14 +04:00
committing subrepository foo/bar (glob)
status: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
$ 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
$ cd ..
$ hg commit -m 1-2-1
Change working directory:
$ echo y3 >> foo/y.txt
$ echo z3 >> foo/bar/z.txt
test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test
2010-09-28 15:09:22 +04:00
$ hg status -S
status: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
M foo/bar/z.txt
M foo/y.txt
test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test
2010-09-28 15:09:22 +04:00
$ hg diff --nodates -S
diff: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
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
status: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
Status call crossing repository boundaries:
test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test
2010-09-28 15:09:22 +04:00
$ hg status -S foo/bar/z.txt
status: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
M foo/bar/z.txt
test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test
2010-09-28 15:09:22 +04:00
$ hg status -S -I 'foo/?.txt'
status: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
M foo/y.txt
test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test
2010-09-28 15:09:22 +04:00
$ hg status -S -I '**/?.txt'
status: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
M foo/bar/z.txt
M foo/y.txt
test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test
2010-09-28 15:09:22 +04:00
$ hg diff --nodates -S -I '**/?.txt'
diff: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
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
status: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
Status from within a subdirectory:
$ mkdir dir
$ cd dir
$ echo a1 > a.txt
test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test
2010-09-28 15:09:22 +04:00
$ hg status -S
status: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
M foo/bar/z.txt
M foo/y.txt
? dir/a.txt
test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test
2010-09-28 15:09:22 +04:00
$ hg diff --nodates -S
diff: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
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
status: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
Status with relative path:
test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test
2010-09-28 15:09:22 +04:00
$ hg status -S ..
status: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
M ../foo/bar/z.txt
M ../foo/y.txt
? a.txt
test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test
2010-09-28 15:09:22 +04:00
$ hg diff --nodates -S ..
diff: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
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
status: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
$ cd ..
diff: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
Cleanup and final commit:
status: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
$ rm -r dir
subrepos: abort commit by default if a subrepo is dirty (BC) This changeset flips the default value of ui.commitsubrepos setting from True to False and adds a --subrepos flag to commit. The commit, status, and diff commands behave like this with regard to recusion and the ui.commitsubrepos setting: | recurses | recurses | by default | with --subrepos --------+---------------+---------------- commit: | commitsubrepo | True status: | False | True diff: | False | True By changing the default from True to False, the table becomes consistent in the two columns: * without --subrepos on the command line, commit will abort if a subrepo is dirty and status/diff wont show changes inside subrepos. * with --subrepos, all three commands will recurse. A --subrepos flag on the command line overrides the config settin.g
2011-10-21 02:33:08 +04:00
$ hg commit --subrepos -m 2-3-2
status: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
committing subrepository foo
tests: add missing '(glob)'s to match '\' in paths in test output on windows
2011-11-16 06:45:14 +04:00
committing subrepository foo/bar (glob)
diff: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
tests: add subrepo recursion tests for add/forget with explicit paths When support for handling add/forget of explicit paths within subrepos was added (825c4cefde4b/155b89136ae7), nested subrepos weren't handled properly. This change adds test coverage to expose the broken behavior, which will be fixed in later patches.
2012-01-18 04:10:54 +04:00
Test explicit path commands within subrepos: add/forget
$ echo z1 > foo/bar/z2.txt
$ hg status -S
? foo/bar/z2.txt
$ hg add foo/bar/z2.txt
$ hg status -S
A foo/bar/z2.txt
$ hg forget foo/bar/z2.txt
$ hg status -S
? foo/bar/z2.txt
forget: show warning messages for forgetting in subrepo correctly in 'cmdutil.forget()': for f in match.files(): if match.exact(f) or not explicitonly: .... is equal to: for f in match.files(): if True: .... because 'f' from 'match.files()' should 'match.exact(f)': - 'match.files()' returns 'self._files' - 'match.exact(f)' examines 'f in self._fmap', - 'self._fmap' of match is 'set(self._files)' then, 'explicitonly' wants to suppress warning messges, if it is true (= 'cmdutil.forget()' is invoked from 'subrepo.forget()'). so, current code should be fixed as: if not explicitonly: for f in match.files(): ....
2012-02-06 09:37:49 +04:00
$ hg forget foo/bar/z2.txt
tests: add missing accept of native pathname separator
2012-04-28 03:55:39 +04:00
not removing foo/bar/z2.txt: file is already untracked (glob)
forget: show warning messages for forgetting in subrepo correctly in 'cmdutil.forget()': for f in match.files(): if match.exact(f) or not explicitonly: .... is equal to: for f in match.files(): if True: .... because 'f' from 'match.files()' should 'match.exact(f)': - 'match.files()' returns 'self._files' - 'match.exact(f)' examines 'f in self._fmap', - 'self._fmap' of match is 'set(self._files)' then, 'explicitonly' wants to suppress warning messges, if it is true (= 'cmdutil.forget()' is invoked from 'subrepo.forget()'). so, current code should be fixed as: if not explicitonly: for f in match.files(): ....
2012-02-06 09:37:49 +04:00
[1]
$ hg status -S
? foo/bar/z2.txt
tests: add subrepo recursion tests for add/forget with explicit paths When support for handling add/forget of explicit paths within subrepos was added (825c4cefde4b/155b89136ae7), nested subrepos weren't handled properly. This change adds test coverage to expose the broken behavior, which will be fixed in later patches.
2012-01-18 04:10:54 +04:00
$ rm foo/bar/z2.txt
diff: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
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
Status between revisions:
test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test
2010-09-28 15:09:22 +04:00
$ hg status -S
$ hg status -S --rev 0:1
status: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
M .hgsubstate
M foo/.hgsubstate
M foo/bar/z.txt
M foo/y.txt
test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test
2010-09-28 15:09:22 +04:00
$ hg diff --nodates -S -I '**/?.txt' --rev 0:1
diff: recurse into subrepositories with --subrepos/-S flag
2010-09-03 14:58:51 +04:00
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
outgoing: recurse into subrepositories with --subrepos/-S flag As with push, the optional destination path is ignored for the subrepositories, i.e., they are always compared with their default push path. Fixing this is Issue1852.
2010-09-13 15:09:26 +04:00
subrepo: add progress bar support to archive
2010-11-29 18:34:10 +03:00
Enable progress extension for archive tests:
$ cp $HGRCPATH $HGRCPATH.no-progress
$ cat >> $HGRCPATH <<EOF
> [extensions]
> progress =
> [progress]
> assume-tty = 1
> delay = 0
progress using tests: disable time estimates to avoid flakiness
2010-12-15 19:55:14 +03:00
> format = topic bar number
subrepo: add progress bar support to archive
2010-11-29 18:34:10 +03:00
> 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):
tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup
2012-10-10 03:37:54 +04:00
$ hg archive --subrepos ../archive
\r (no-eol) (esc)
archiving [ ] 0/3\r (no-eol) (esc)
archiving [ ] 0/3\r (no-eol) (esc)
archiving [=============> ] 1/3\r (no-eol) (esc)
archiving [=============> ] 1/3\r (no-eol) (esc)
archiving [===========================> ] 2/3\r (no-eol) (esc)
archiving [===========================> ] 2/3\r (no-eol) (esc)
archiving [==========================================>] 3/3\r (no-eol) (esc)
archiving [==========================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
archiving (foo) [ ] 0/3\r (no-eol) (esc)
archiving (foo) [ ] 0/3\r (no-eol) (esc)
archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows Regression was introduced in 413c3f722ffd. Resolved by using the fine line noise '\r (no-eol) (glob) (esc)'.
2012-10-14 20:30:47 +04:00
archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup
2012-10-10 03:37:54 +04:00
\r (no-eol) (esc)
test-subrepo-recursion: sort archive output for portability
2010-09-22 01:58:32 +04:00
$ find ../archive | sort
subrepo: add support for 'hg archive'
2010-09-20 17:46:17 +04:00
../archive
test-subrepo-recursion: sort archive output for portability
2010-09-22 01:58:32 +04:00
../archive/.hg_archival.txt
../archive/.hgsub
../archive/.hgsubstate
subrepo: add support for 'hg archive'
2010-09-20 17:46:17 +04:00
../archive/foo
test-subrepo-recursion: sort archive output for portability
2010-09-22 01:58:32 +04:00
../archive/foo/.hgsub
../archive/foo/.hgsubstate
subrepo: add support for 'hg archive'
2010-09-20 17:46:17 +04:00
../archive/foo/bar
../archive/foo/bar/z.txt
../archive/foo/y.txt
../archive/x.txt
tests: fixup tests using unzip -l
2010-09-21 00:50:36 +04:00
Test archiving to zip file (unzip output is unstable):
subrepo: add support for 'hg archive'
2010-09-20 17:46:17 +04:00
tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup
2012-10-10 03:37:54 +04:00
$ hg archive --subrepos ../archive.zip
\r (no-eol) (esc)
archiving [ ] 0/3\r (no-eol) (esc)
archiving [ ] 0/3\r (no-eol) (esc)
archiving [=============> ] 1/3\r (no-eol) (esc)
archiving [=============> ] 1/3\r (no-eol) (esc)
archiving [===========================> ] 2/3\r (no-eol) (esc)
archiving [===========================> ] 2/3\r (no-eol) (esc)
archiving [==========================================>] 3/3\r (no-eol) (esc)
archiving [==========================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
archiving (foo) [ ] 0/3\r (no-eol) (esc)
archiving (foo) [ ] 0/3\r (no-eol) (esc)
archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows Regression was introduced in 413c3f722ffd. Resolved by using the fine line noise '\r (no-eol) (glob) (esc)'.
2012-10-14 20:30:47 +04:00
archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup
2012-10-10 03:37:54 +04:00
\r (no-eol) (esc)
subrepo: add progress bar support to archive
2010-11-29 18:34:10 +03:00
subrepo: pull revisions on demand when archiving hg subrepos Before, running 'hg archive -S' could result in abort: unknown revision '65903cebad86f1a84bd4f1134f62fa7dcb7a1c98'! if a subrepo was missing completely or had missing changesets. Now, the missing changesets will be pulled or cloned as appropriate. This make Mercurial subrepos match Git subrepos which already took care to fetch any missing commits before starting the archive.
2011-10-17 18:45:19 +04:00
Test archiving a revision that references a subrepo that is not yet
cloned:
$ hg clone -U . ../empty
$ cd ../empty
tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup
2012-10-10 03:37:54 +04:00
$ hg archive --subrepos -r tip ../archive.tar.gz
\r (no-eol) (esc)
archiving [ ] 0/3\r (no-eol) (esc)
archiving [ ] 0/3\r (no-eol) (esc)
archiving [=============> ] 1/3\r (no-eol) (esc)
archiving [=============> ] 1/3\r (no-eol) (esc)
archiving [===========================> ] 2/3\r (no-eol) (esc)
archiving [===========================> ] 2/3\r (no-eol) (esc)
archiving [==========================================>] 3/3\r (no-eol) (esc)
archiving [==========================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
archiving (foo) [ ] 0/3\r (no-eol) (esc)
archiving (foo) [ ] 0/3\r (no-eol) (esc)
archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows Regression was introduced in 413c3f722ffd. Resolved by using the fine line noise '\r (no-eol) (glob) (esc)'.
2012-10-14 20:30:47 +04:00
archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup
2012-10-10 03:37:54 +04:00
\r (no-eol) (esc)
subrepo: pull revisions on demand when archiving hg subrepos Before, running 'hg archive -S' could result in abort: unknown revision '65903cebad86f1a84bd4f1134f62fa7dcb7a1c98'! if a subrepo was missing completely or had missing changesets. Now, the missing changesets will be pulled or cloned as appropriate. This make Mercurial subrepos match Git subrepos which already took care to fetch any missing commits before starting the archive.
2011-10-17 18:45:19 +04:00
cloning subrepo foo from $TESTTMP/repo/foo
tests: add missing '(glob)'s to match '\' in paths in test output on windows
2011-11-16 06:45:14 +04:00
cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup
2012-10-10 03:37:54 +04:00
subrepo: pull revisions on demand when archiving hg subrepos Before, running 'hg archive -S' could result in abort: unknown revision '65903cebad86f1a84bd4f1134f62fa7dcb7a1c98'! if a subrepo was missing completely or had missing changesets. Now, the missing changesets will be pulled or cloned as appropriate. This make Mercurial subrepos match Git subrepos which already took care to fetch any missing commits before starting the archive.
2011-10-17 18:45:19 +04:00
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)
subrepo: add progress bar support to archive
2010-11-29 18:34:10 +03:00
Disable progress extension and cleanup:
$ mv $HGRCPATH.no-progress $HGRCPATH
subrepo: add support for 'hg archive'
2010-09-20 17:46:17 +04:00
subrepo: abort in hgsubrepo._get if the destination is obstructed Before, we deleted foo when we determined that there were zero changesets in the foo subrepo. Any files in foo was deleted too. We now delete foo/.hg instead, and the normal checks in hg.clone will then abort if there are untracked files in foo.
2011-10-17 20:01:38 +04:00
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
subrepo: append subrepo path to subrepo error messages This change appends the subrepo path to subrepo errors. That is, when there is an error performing an operation a subrepo, rather than displaying a message such as: pushing subrepo MYSUBREPO to PATH searching for changes abort: push creates new remote head HEADHASH! hint: did you forget to merge? use push -f to force mercurial will show: pushing subrepo MYSUBREPO to PATH searching for changes abort: push creates new remote head HEADHASH! (in subrepo MYSUBREPO) hint: did you forget to merge? use push -f to force The rationale for this change is that the current error messages make it hard for TortoiseHg (and similar tools) to tell the user which subrepo caused the push failure. The "(in subrepo MYSUBREPO)" message has been added to those subrepo methods were it made sense (by using a decorator). We avoid appending "(in subrepo XXX)" multiple times when subrepos are nexted by throwing a "SubrepoAbort" exception after the extra message is appended. The decorator will then "ignore" (i.e. just re-raise) the exception and never add the message again. A small drawback of this method is that part of the exception trace is lost when the exception is catched and re-raised by the annotatesubrepoerror decorator. Also, because the state() function already printed the subrepo path when it threw an error, that error has been changed to avoid duplicating the subrepo path in the error message. Note that I have also updated several subrepo related tests to reflect these changes.
2012-12-14 02:37:53 +04:00
abort: destination '$TESTTMP/almost-empty/foo' is not empty (in subrepo foo) (glob)
subrepo: abort in hgsubrepo._get if the destination is obstructed Before, we deleted foo when we determined that there were zero changesets in the foo subrepo. Any files in foo was deleted too. We now delete foo/.hg instead, and the normal checks in hg.clone will then abort if there are untracked files in foo.
2011-10-17 20:01:38 +04:00
[255]
outgoing: recurse into subrepositories with --subrepos/-S flag As with push, the optional destination path is ignored for the subrepositories, i.e., they are always compared with their default push path. Fixing this is Issue1852.
2010-09-13 15:09:26 +04:00
Clone and test outgoing:
$ cd ..
$ hg clone repo repo2
updating to branch default
subrepo: create subrepos using clone instead of pull Subrepositories used to be created empty and then filled with data using pull. This is wasteful when you do a clone from a local source since it means that no hardlinks are created for the subrepos. This patch make the hgsubrepo._get method check for an empty subrepo and in that case do a clone instead of a pull. This brings in the same data as before, but creates hardlinks when possible.
2011-05-09 19:15:44 +04:00
cloning subrepo foo from $TESTTMP/repo/foo
tests: add missing '(glob)'s to match '\' in paths in test output on windows
2011-11-16 06:45:14 +04:00
cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
outgoing: recurse into subrepositories with --subrepos/-S flag As with push, the optional destination path is ignored for the subrepositories, i.e., they are always compared with their default push path. Fixing this is Issue1852.
2010-09-13 15:09:26 +04:00
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo2
$ hg outgoing -S
tests: add missing '(glob)'s to match '\' in paths in test output on windows
2011-11-16 06:45:14 +04:00
comparing with $TESTTMP/repo (glob)
outgoing: recurse into subrepositories with --subrepos/-S flag As with push, the optional destination path is ignored for the subrepositories, i.e., they are always compared with their default push path. Fixing this is Issue1852.
2010-09-13 15:09:26 +04:00
searching for changes
no changes found
tests: remove redundant globs Many globs now just match $TESTTMP and is no longer needed.
2010-10-09 07:36:10 +04:00
comparing with $TESTTMP/repo/foo
outgoing: recurse into subrepositories with --subrepos/-S flag As with push, the optional destination path is ignored for the subrepositories, i.e., they are always compared with their default push path. Fixing this is Issue1852.
2010-09-13 15:09:26 +04:00
searching for changes
no changes found
tests: remove redundant globs Many globs now just match $TESTTMP and is no longer needed.
2010-10-09 07:36:10 +04:00
comparing with $TESTTMP/repo/foo/bar
incoming/outgoing: Fix recursion on sub repositories Incoming and outgoing are fixed so they go through the whole three of repositories instead of only visiting first level of sub repositories.
2010-09-24 14:00:55 +04:00
searching for changes
no changes found
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[1]
outgoing: recurse into subrepositories with --subrepos/-S flag As with push, the optional destination path is ignored for the subrepositories, i.e., they are always compared with their default push path. Fixing this is Issue1852.
2010-09-13 15:09:26 +04:00
Make nested change:
$ echo y4 >> foo/y.txt
test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test
2010-09-28 15:09:22 +04:00
$ hg diff --nodates -S
outgoing: recurse into subrepositories with --subrepos/-S flag As with push, the optional destination path is ignored for the subrepositories, i.e., they are always compared with their default push path. Fixing this is Issue1852.
2010-09-13 15:09:26 +04:00
diff -r 65903cebad86 foo/y.txt
--- a/foo/y.txt
+++ b/foo/y.txt
@@ -1,3 +1,4 @@
y1
y2
y3
+y4
subrepos: abort commit by default if a subrepo is dirty (BC) This changeset flips the default value of ui.commitsubrepos setting from True to False and adds a --subrepos flag to commit. The commit, status, and diff commands behave like this with regard to recusion and the ui.commitsubrepos setting: | recurses | recurses | by default | with --subrepos --------+---------------+---------------- commit: | commitsubrepo | True status: | False | True diff: | False | True By changing the default from True to False, the table becomes consistent in the two columns: * without --subrepos on the command line, commit will abort if a subrepo is dirty and status/diff wont show changes inside subrepos. * with --subrepos, all three commands will recurse. A --subrepos flag on the command line overrides the config settin.g
2011-10-21 02:33:08 +04:00
$ hg commit --subrepos -m 3-4-2
outgoing: recurse into subrepositories with --subrepos/-S flag As with push, the optional destination path is ignored for the subrepositories, i.e., they are always compared with their default push path. Fixing this is Issue1852.
2010-09-13 15:09:26 +04:00
committing subrepository foo
$ hg outgoing -S
tests: add missing '(glob)'s to match '\' in paths in test output on windows
2011-11-16 06:45:14 +04:00
comparing with $TESTTMP/repo (glob)
outgoing: recurse into subrepositories with --subrepos/-S flag As with push, the optional destination path is ignored for the subrepositories, i.e., they are always compared with their default push path. Fixing this is Issue1852.
2010-09-13 15:09:26 +04:00
searching for changes
changeset: 3:2655b8ecc4ee
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 3-4-2
tests: remove redundant globs Many globs now just match $TESTTMP and is no longer needed.
2010-10-09 07:36:10 +04:00
comparing with $TESTTMP/repo/foo
outgoing: recurse into subrepositories with --subrepos/-S flag As with push, the optional destination path is ignored for the subrepositories, i.e., they are always compared with their default push path. Fixing this is Issue1852.
2010-09-13 15:09:26 +04:00
searching for changes
changeset: 4:e96193d6cb36
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 3-4-2
tests: remove redundant globs Many globs now just match $TESTTMP and is no longer needed.
2010-10-09 07:36:10 +04:00
comparing with $TESTTMP/repo/foo/bar
incoming/outgoing: Fix recursion on sub repositories Incoming and outgoing are fixed so they go through the whole three of repositories instead of only visiting first level of sub repositories.
2010-09-24 14:00:55 +04:00
searching for changes
no changes found
incoming: recurse into subrepositories with --subrepos/-S flag As with push and outgoing, the optional source path is ignored for the subrepositories. Fixing this is Issue1852.
2010-09-13 15:09:31 +04:00
test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test
2010-09-28 15:09:22 +04:00
incoming: recurse into subrepositories with --subrepos/-S flag As with push and outgoing, the optional source path is ignored for the subrepositories. Fixing this is Issue1852.
2010-09-13 15:09:31 +04:00
Switch to original repo and setup default path:
$ cd ../repo
$ echo '[paths]' >> .hg/hgrc
$ echo 'default = ../repo2' >> .hg/hgrc
Test incoming:
$ hg incoming -S
tests: add missing '(glob)'s to match '\' in paths in test output on windows
2011-11-16 06:45:14 +04:00
comparing with $TESTTMP/repo2 (glob)
incoming: recurse into subrepositories with --subrepos/-S flag As with push and outgoing, the optional source path is ignored for the subrepositories. Fixing this is Issue1852.
2010-09-13 15:09:31 +04:00
searching for changes
changeset: 3:2655b8ecc4ee
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 3-4-2
tests: remove redundant globs Many globs now just match $TESTTMP and is no longer needed.
2010-10-09 07:36:10 +04:00
comparing with $TESTTMP/repo2/foo
incoming: recurse into subrepositories with --subrepos/-S flag As with push and outgoing, the optional source path is ignored for the subrepositories. Fixing this is Issue1852.
2010-09-13 15:09:31 +04:00
searching for changes
changeset: 4:e96193d6cb36
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 3-4-2
tests: remove redundant globs Many globs now just match $TESTTMP and is no longer needed.
2010-10-09 07:36:10 +04:00
comparing with $TESTTMP/repo2/foo/bar
incoming/outgoing: Fix recursion on sub repositories Incoming and outgoing are fixed so they go through the whole three of repositories instead of only visiting first level of sub repositories.
2010-09-24 14:00:55 +04:00
searching for changes
no changes found
incoming: recurse into subrepositories with --subrepos/-S flag As with push and outgoing, the optional source path is ignored for the subrepositories. Fixing this is Issue1852.
2010-09-13 15:09:31 +04:00
$ hg incoming -S --bundle incoming.hg
abort: cannot combine --bundle and --subrepos
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[255]
incoming: recurse into subrepositories with --subrepos/-S flag As with push and outgoing, the optional source path is ignored for the subrepositories. Fixing this is Issue1852.
2010-09-13 15:09:31 +04:00
test-subrepo-recursion: test missing subrepo
2010-09-13 17:13:30 +04:00
Test missing subrepo:
$ rm -r foo
test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test
2010-09-28 15:09:22 +04:00
$ hg status -S
subrepo: improve lookup error messages
2010-09-13 17:33:49 +04:00
warning: error "unknown revision '65903cebad86f1a84bd4f1134f62fa7dcb7a1c98'" in subrepository "foo"
subrepo: fix pruning of subrepo filenames in dirstate (issue2619)
2011-02-04 11:05:23 +03:00
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
tests: add missing trailing 'cd ..' Many tests didn't change back from subdirectories at the end of the tests ... and they don't have to. The missing 'cd ..' could always be added when another test case is added to the test file. This change do that tests (99.5%) consistently end up in $TESTDIR where they started, thus making it simpler to extend them or move them around.
2012-06-11 03:40:51 +04:00
$ cd ..
Reference in New Issue Copy Permalink