##// END OF EJS Templates
tests: removed test names in tests...
Erik Zielke -
r12587:e3247cea default
parent child Browse files
Show More
@@ -78,5 +78,5 b' attack /tmp/test'
78 $ hg manifest -r4
78 $ hg manifest -r4
79 /tmp/test
79 /tmp/test
80 $ hg update -Cr4
80 $ hg update -Cr4
81 abort: No such file or directory: */test-audit-path.t/target//tmp/test (glob)
81 abort: No such file or directory: */target//tmp/test (glob)
82 [255]
82 [255]
@@ -14,7 +14,7 b' Convert while testing all possible outpu'
14
14
15 $ hg --debug convert svn-repo A-hg
15 $ hg --debug convert svn-repo A-hg
16 initializing destination A-hg repository
16 initializing destination A-hg repository
17 reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob)
17 reparent to file://*/svn-repo (glob)
18 run hg sink pre-conversion action
18 run hg sink pre-conversion action
19 scanning source...
19 scanning source...
20 found trunk at 'trunk'
20 found trunk at 'trunk'
@@ -23,7 +23,7 b' Convert while testing all possible outpu'
23 found branch branché at 5
23 found branch branché at 5
24 found branch branchée at 6
24 found branch branchée at 6
25 scanning: 1 revisions
25 scanning: 1 revisions
26 reparent to file://*/test-convert-svn-encoding.t/svn-repo/trunk (glob)
26 reparent to file://*/svn-repo/trunk (glob)
27 fetching revision log for "/trunk" from 4 to 0
27 fetching revision log for "/trunk" from 4 to 0
28 parsing revision 4 (2 changes)
28 parsing revision 4 (2 changes)
29 parsing revision 3 (4 changes)
29 parsing revision 3 (4 changes)
@@ -33,18 +33,18 b' Convert while testing all possible outpu'
33 '/branches' is not under '/trunk', ignoring
33 '/branches' is not under '/trunk', ignoring
34 '/tags' is not under '/trunk', ignoring
34 '/tags' is not under '/trunk', ignoring
35 scanning: 2 revisions
35 scanning: 2 revisions
36 reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9 (glob)
36 reparent to file://*/svn-repo/branches/branch%C3%A9 (glob)
37 fetching revision log for "/branches/branché" from 5 to 0
37 fetching revision log for "/branches/branché" from 5 to 0
38 parsing revision 5 (1 changes)
38 parsing revision 5 (1 changes)
39 reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob)
39 reparent to file://*/svn-repo (glob)
40 reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9 (glob)
40 reparent to file://*/svn-repo/branches/branch%C3%A9 (glob)
41 found parent of branch /branches/branché at 4: /trunk
41 found parent of branch /branches/branché at 4: /trunk
42 scanning: 3 revisions
42 scanning: 3 revisions
43 reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9e (glob)
43 reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
44 fetching revision log for "/branches/branchée" from 6 to 0
44 fetching revision log for "/branches/branchée" from 6 to 0
45 parsing revision 6 (1 changes)
45 parsing revision 6 (1 changes)
46 reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob)
46 reparent to file://*/svn-repo (glob)
47 reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9e (glob)
47 reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
48 found parent of branch /branches/branchée at 5: /branches/branché
48 found parent of branch /branches/branchée at 5: /branches/branché
49 scanning: 4 revisions
49 scanning: 4 revisions
50 scanning: 5 revisions
50 scanning: 5 revisions
@@ -57,7 +57,7 b' Convert while testing all possible outpu'
57 4 hello
57 4 hello
58 source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@2
58 source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@2
59 converting: 1/6 revisions (16.67%)
59 converting: 1/6 revisions (16.67%)
60 reparent to file://*/test-convert-svn-encoding.t/svn-repo/trunk (glob)
60 reparent to file://*/svn-repo/trunk (glob)
61 scanning paths: /trunk/à 0/3 (0.00%)
61 scanning paths: /trunk/à 0/3 (0.00%)
62 scanning paths: /trunk/à/é 1/3 (33.33%)
62 scanning paths: /trunk/à/é 1/3 (33.33%)
63 scanning paths: /trunk/é 2/3 (66.67%)
63 scanning paths: /trunk/é 2/3 (66.67%)
@@ -70,14 +70,14 b' Convert while testing all possible outpu'
70 converting: 2/6 revisions (33.33%)
70 converting: 2/6 revisions (33.33%)
71 scanning paths: /trunk/à 0/4 (0.00%)
71 scanning paths: /trunk/à 0/4 (0.00%)
72 gone from -1
72 gone from -1
73 reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob)
73 reparent to file://*/svn-repo (glob)
74 reparent to file://*/test-convert-svn-encoding.t/svn-repo/trunk (glob)
74 reparent to file://*/svn-repo/trunk (glob)
75 scanning paths: /trunk/è 1/4 (25.00%)
75 scanning paths: /trunk/è 1/4 (25.00%)
76 copied to è from é@2
76 copied to è from é@2
77 scanning paths: /trunk/é 2/4 (50.00%)
77 scanning paths: /trunk/é 2/4 (50.00%)
78 gone from -1
78 gone from -1
79 reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob)
79 reparent to file://*/svn-repo (glob)
80 reparent to file://*/test-convert-svn-encoding.t/svn-repo/trunk (glob)
80 reparent to file://*/svn-repo/trunk (glob)
81 scanning paths: /trunk/ù 3/4 (75.00%)
81 scanning paths: /trunk/ù 3/4 (75.00%)
82 mark /trunk/ù came from à:2
82 mark /trunk/ù came from à:2
83 à/é
83 à/é
@@ -95,12 +95,12 b' Convert while testing all possible outpu'
95 converting: 3/6 revisions (50.00%)
95 converting: 3/6 revisions (50.00%)
96 scanning paths: /trunk/è 0/2 (0.00%)
96 scanning paths: /trunk/è 0/2 (0.00%)
97 gone from -1
97 gone from -1
98 reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob)
98 reparent to file://*/svn-repo (glob)
99 reparent to file://*/test-convert-svn-encoding.t/svn-repo/trunk (glob)
99 reparent to file://*/svn-repo/trunk (glob)
100 scanning paths: /trunk/ù 1/2 (50.00%)
100 scanning paths: /trunk/ù 1/2 (50.00%)
101 gone from -1
101 gone from -1
102 reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob)
102 reparent to file://*/svn-repo (glob)
103 reparent to file://*/test-convert-svn-encoding.t/svn-repo/trunk (glob)
103 reparent to file://*/svn-repo/trunk (glob)
104 è
104 è
105 getting files: è 1/2 (50.00%)
105 getting files: è 1/2 (50.00%)
106 ù/é
106 ù/é
@@ -108,17 +108,17 b' Convert while testing all possible outpu'
108 1 branch to branch?
108 1 branch to branch?
109 source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5
109 source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5
110 converting: 4/6 revisions (66.67%)
110 converting: 4/6 revisions (66.67%)
111 reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9 (glob)
111 reparent to file://*/svn-repo/branches/branch%C3%A9 (glob)
112 scanning paths: /branches/branché 0/1 (0.00%)
112 scanning paths: /branches/branché 0/1 (0.00%)
113 0 branch to branch?e
113 0 branch to branch?e
114 source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e@6
114 source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e@6
115 converting: 5/6 revisions (83.33%)
115 converting: 5/6 revisions (83.33%)
116 reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9e (glob)
116 reparent to file://*svn-repo/branches/branch%C3%A9e (glob)
117 scanning paths: /branches/branchée 0/1 (0.00%)
117 scanning paths: /branches/branchée 0/1 (0.00%)
118 reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob)
118 reparent to file://*svn-repo (glob)
119 reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9e (glob)
119 reparent to file://*svn-repo/branches/branch%C3%A9e (glob)
120 reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob)
120 reparent to file://*svn-repo (glob)
121 reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9e (glob)
121 reparent to file://*svn-repo/branches/branch%C3%A9e (glob)
122 updating tags
122 updating tags
123 .hgtags
123 .hgtags
124 run hg sink post-conversion action
124 run hg sink post-conversion action
@@ -74,13 +74,10 b' Test diff during merge:'
74
74
75 Should diff cloned file against wc file:
75 Should diff cloned file against wc file:
76
76
77 $ hg falabala > out
77 $ hg falabala
78 diffing a.2a13a4d2da36/a */a/a (glob)
78 [1]
79 [1]
79
80
80 Cleanup the output since the wc is a tmp directory:
81
82 $ sed 's:\(diffing [^ ]* \).*\(\/test-extdiff\):\1[tmp]\2:' out
83 diffing a.2a13a4d2da36/a [tmp]/test-extdiff.t/a/a
84
81
85 Test --change option:
82 Test --change option:
86
83
@@ -17,7 +17,7 b' commit hooks can see env vars'
17 $ hg add a
17 $ hg add a
18 $ hg commit -m a
18 $ hg commit -m a
19 precommit hook: HG_PARENT1=0000000000000000000000000000000000000000
19 precommit hook: HG_PARENT1=0000000000000000000000000000000000000000
20 pretxncommit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 HG_PENDING=$HGTMP/test-hook.t/a
20 pretxncommit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 HG_PENDING=$HGTMP/*/a (glob)
21 0:cb9a9f314b8b
21 0:cb9a9f314b8b
22 commit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000
22 commit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000
23 commit.b hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000
23 commit.b hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000
@@ -40,7 +40,7 b' pretxncommit and commit hooks can see bo'
40 $ echo b >> a
40 $ echo b >> a
41 $ hg commit -m a1 -d "1 0"
41 $ hg commit -m a1 -d "1 0"
42 precommit hook: HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
42 precommit hook: HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
43 pretxncommit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$HGTMP/test-hook.t/a
43 pretxncommit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$HGTMP/*/a (glob)
44 1:ab228980c14d
44 1:ab228980c14d
45 commit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
45 commit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
46 commit.b hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
46 commit.b hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
@@ -50,7 +50,7 b' pretxncommit and commit hooks can see bo'
50 $ hg add b
50 $ hg add b
51 $ hg commit -m b -d '1 0'
51 $ hg commit -m b -d '1 0'
52 precommit hook: HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
52 precommit hook: HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
53 pretxncommit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$HGTMP/test-hook.t/a
53 pretxncommit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$HGTMP/*/a (glob)
54 2:ee9deb46ab31
54 2:ee9deb46ab31
55 commit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
55 commit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
56 commit.b hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
56 commit.b hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
@@ -60,7 +60,7 b' pretxncommit and commit hooks can see bo'
60 (branch merge, don't forget to commit)
60 (branch merge, don't forget to commit)
61 $ hg commit -m merge -d '2 0'
61 $ hg commit -m merge -d '2 0'
62 precommit hook: HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
62 precommit hook: HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
63 pretxncommit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd HG_PENDING=$HGTMP/test-hook.t/a
63 pretxncommit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd HG_PENDING=$HGTMP/*/a (glob)
64 3:07f3376c1e65
64 3:07f3376c1e65
65 commit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
65 commit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
66 commit.b hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
66 commit.b hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
@@ -99,7 +99,7 b' tag hooks can see env vars'
99 $ hg tag -d '3 0' a
99 $ hg tag -d '3 0' a
100 pretag hook: HG_LOCAL=0 HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_TAG=a
100 pretag hook: HG_LOCAL=0 HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_TAG=a
101 precommit hook: HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
101 precommit hook: HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
102 pretxncommit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PENDING=$HGTMP/test-hook.t/a
102 pretxncommit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PENDING=$HGTMP/*/a (glob)
103 4:539e4b31b6dc
103 4:539e4b31b6dc
104 commit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
104 commit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
105 commit.b hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
105 commit.b hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
@@ -133,10 +133,10 b' more there after'
133 4:539e4b31b6dc
133 4:539e4b31b6dc
134 $ hg commit -m 'fail' -d '4 0'
134 $ hg commit -m 'fail' -d '4 0'
135 precommit hook: HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
135 precommit hook: HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
136 pretxncommit hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/test-hook.t/a
136 pretxncommit hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/*/a (glob)
137 5:6f611f8018c1
137 5:6f611f8018c1
138 5:6f611f8018c1
138 5:6f611f8018c1
139 pretxncommit.forbid hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/test-hook.t/a
139 pretxncommit.forbid hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/*/a (glob)
140 transaction abort!
140 transaction abort!
141 rollback completed
141 rollback completed
142 abort: pretxncommit.forbid1 hook exited with status 1
142 abort: pretxncommit.forbid1 hook exited with status 1
@@ -192,7 +192,7 b' incoming changes no longer there after'
192 $ echo 'pretxnchangegroup.forbid1 = python ../printenv.py pretxnchangegroup.forbid 1' >> .hg/hgrc
192 $ echo 'pretxnchangegroup.forbid1 = python ../printenv.py pretxnchangegroup.forbid 1' >> .hg/hgrc
193 $ hg pull ../a
193 $ hg pull ../a
194 4:539e4b31b6dc
194 4:539e4b31b6dc
195 pretxnchangegroup.forbid hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/test-hook.t/b HG_SOURCE=pull HG_URL=file:
195 pretxnchangegroup.forbid hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/*/b HG_SOURCE=pull HG_URL=file: (glob)
196 pulling from ../a
196 pulling from ../a
197 searching for changes
197 searching for changes
198 adding changesets
198 adding changesets
@@ -686,7 +686,7 b' Clone to test incoming'
686 > default = ../Test
686 > default = ../Test
687 > EOF
687 > EOF
688 $ hg incoming
688 $ hg incoming
689 comparing with *test-keyword.t/Test (glob)
689 comparing with */Test (glob)
690 searching for changes
690 searching for changes
691 changeset: 2:bb948857c743
691 changeset: 2:bb948857c743
692 tag: tip
692 tag: tip
@@ -6,11 +6,11 b''
6 $ echo '[paths]' >> .hg/hgrc
6 $ echo '[paths]' >> .hg/hgrc
7 $ echo 'dupe = ../b' >> .hg/hgrc
7 $ echo 'dupe = ../b' >> .hg/hgrc
8 $ hg in dupe
8 $ hg in dupe
9 comparing with */test-paths.t/b (glob)
9 comparing with */b (glob)
10 no changes found
10 no changes found
11 [1]
11 [1]
12 $ cd ..
12 $ cd ..
13 $ hg -R a in dupe
13 $ hg -R a in dupe
14 comparing with */test-paths.t/b (glob)
14 comparing with */b (glob)
15 no changes found
15 no changes found
16 [1]
16 [1]
@@ -144,7 +144,7 b' find incoming on the remote side'
144 find incoming on the remote side (using absolute path)
144 find incoming on the remote side (using absolute path)
145
145
146 $ hg incoming -R ../remote -e "python ../dummyssh" "ssh://user@dummy/`pwd`"
146 $ hg incoming -R ../remote -e "python ../dummyssh" "ssh://user@dummy/`pwd`"
147 comparing with ssh://user@dummy/*/test-ssh.t/local (glob)
147 comparing with ssh://user@dummy/*/local (glob)
148 searching for changes
148 searching for changes
149 changeset: 1:a28a9d1a809c
149 changeset: 1:a28a9d1a809c
150 tag: tip
150 tag: tip
@@ -226,7 +226,7 b' push should succeed even though it has a'
226 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
226 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
227 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
227 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
228 Got arguments 1:user@dummy 2:hg -R local serve --stdio
228 Got arguments 1:user@dummy 2:hg -R local serve --stdio
229 Got arguments 1:user@dummy 2:hg -R /*/test-ssh.t/local serve --stdio (glob)
229 Got arguments 1:user@dummy 2:hg -R /*/local serve --stdio (glob)
230 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
230 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
231 changegroup-in-remote hook: HG_NODE=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1
231 changegroup-in-remote hook: HG_NODE=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1
232 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
232 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
@@ -28,5 +28,5 b' test bad subpaths pattern'
28 > .* = \1
28 > .* = \1
29 > EOF
29 > EOF
30 $ hg debugsub
30 $ hg debugsub
31 abort: bad subrepository pattern in */test-subrepo-paths.t/outer/.hg/hgrc:2: invalid group reference (glob)
31 abort: bad subrepository pattern in */outer/.hg/hgrc:2: invalid group reference (glob)
32 [255]
32 [255]
@@ -252,13 +252,13 b' Clone and test outgoing:'
252 $ cd ..
252 $ cd ..
253 $ hg clone repo repo2
253 $ hg clone repo repo2
254 updating to branch default
254 updating to branch default
255 pulling subrepo foo from */test-subrepo-recursion.t/repo/foo (glob)
255 pulling subrepo foo from */repo/foo (glob)
256 requesting all changes
256 requesting all changes
257 adding changesets
257 adding changesets
258 adding manifests
258 adding manifests
259 adding file changes
259 adding file changes
260 added 4 changesets with 7 changes to 3 files
260 added 4 changesets with 7 changes to 3 files
261 pulling subrepo foo/bar from */test-subrepo-recursion.t/repo/foo/bar (glob)
261 pulling subrepo foo/bar from */repo/foo/bar (glob)
262 requesting all changes
262 requesting all changes
263 adding changesets
263 adding changesets
264 adding manifests
264 adding manifests
@@ -267,13 +267,13 b' Clone and test outgoing:'
267 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
267 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
268 $ cd repo2
268 $ cd repo2
269 $ hg outgoing -S
269 $ hg outgoing -S
270 comparing with */test-subrepo-recursion.t/repo (glob)
270 comparing with */repo (glob)
271 searching for changes
271 searching for changes
272 no changes found
272 no changes found
273 comparing with */test-subrepo-recursion.t/repo/foo (glob)
273 comparing with */repo/foo (glob)
274 searching for changes
274 searching for changes
275 no changes found
275 no changes found
276 comparing with */test-subrepo-recursion.t/repo/foo/bar (glob)
276 comparing with */repo/foo/bar (glob)
277 searching for changes
277 searching for changes
278 no changes found
278 no changes found
279 [1]
279 [1]
@@ -293,7 +293,7 b' Make nested change:'
293 $ hg commit -m 3-4-2
293 $ hg commit -m 3-4-2
294 committing subrepository foo
294 committing subrepository foo
295 $ hg outgoing -S
295 $ hg outgoing -S
296 comparing with */test-subrepo-recursion.t/repo (glob)
296 comparing with */repo (glob)
297 searching for changes
297 searching for changes
298 changeset: 3:2655b8ecc4ee
298 changeset: 3:2655b8ecc4ee
299 tag: tip
299 tag: tip
@@ -301,7 +301,7 b' Make nested change:'
301 date: Thu Jan 01 00:00:00 1970 +0000
301 date: Thu Jan 01 00:00:00 1970 +0000
302 summary: 3-4-2
302 summary: 3-4-2
303
303
304 comparing with */test-subrepo-recursion.t/repo/foo (glob)
304 comparing with */repo/foo (glob)
305 searching for changes
305 searching for changes
306 changeset: 4:e96193d6cb36
306 changeset: 4:e96193d6cb36
307 tag: tip
307 tag: tip
@@ -309,7 +309,7 b' Make nested change:'
309 date: Thu Jan 01 00:00:00 1970 +0000
309 date: Thu Jan 01 00:00:00 1970 +0000
310 summary: 3-4-2
310 summary: 3-4-2
311
311
312 comparing with */test-subrepo-recursion.t/repo/foo/bar (glob)
312 comparing with */repo/foo/bar (glob)
313 searching for changes
313 searching for changes
314 no changes found
314 no changes found
315
315
@@ -322,7 +322,7 b' Switch to original repo and setup defaul'
322 Test incoming:
322 Test incoming:
323
323
324 $ hg incoming -S
324 $ hg incoming -S
325 comparing with */test-subrepo-recursion.t/repo2 (glob)
325 comparing with */repo2 (glob)
326 searching for changes
326 searching for changes
327 changeset: 3:2655b8ecc4ee
327 changeset: 3:2655b8ecc4ee
328 tag: tip
328 tag: tip
@@ -330,7 +330,7 b' Test incoming:'
330 date: Thu Jan 01 00:00:00 1970 +0000
330 date: Thu Jan 01 00:00:00 1970 +0000
331 summary: 3-4-2
331 summary: 3-4-2
332
332
333 comparing with */test-subrepo-recursion.t/repo2/foo (glob)
333 comparing with */repo2/foo (glob)
334 searching for changes
334 searching for changes
335 changeset: 4:e96193d6cb36
335 changeset: 4:e96193d6cb36
336 tag: tip
336 tag: tip
@@ -338,7 +338,7 b' Test incoming:'
338 date: Thu Jan 01 00:00:00 1970 +0000
338 date: Thu Jan 01 00:00:00 1970 +0000
339 summary: 3-4-2
339 summary: 3-4-2
340
340
341 comparing with */test-subrepo-recursion.t/repo2/foo/bar (glob)
341 comparing with */repo2/foo/bar (glob)
342 searching for changes
342 searching for changes
343 no changes found
343 no changes found
344
344
@@ -542,9 +542,9 b' test repository cloning'
542 $ cat mercurial2/main/nested_absolute/.hg/hgrc \
542 $ cat mercurial2/main/nested_absolute/.hg/hgrc \
543 > mercurial2/main/nested_relative/.hg/hgrc
543 > mercurial2/main/nested_relative/.hg/hgrc
544 [paths]
544 [paths]
545 default = */test-subrepo.t/sub/mercurial/nested_absolute (glob)
545 default = */sub/mercurial/nested_absolute (glob)
546 [paths]
546 [paths]
547 default = */test-subrepo.t/sub/mercurial/nested_relative (glob)
547 default = */sub/mercurial/nested_relative (glob)
548 $ rm -rf mercurial mercurial2
548 $ rm -rf mercurial mercurial2
549
549
550 Issue1977: multirepo push should fail if subrepo push fails
550 Issue1977: multirepo push should fail if subrepo push fails
General Comments 0
You need to be logged in to leave comments. Login now