##// END OF EJS Templates
tests: remove redundant globs...
Mads Kiilerich -
r12640:6cc4b14f 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: */target//tmp/test (glob)
81 abort: No such file or directory: $TESTTMP/target//tmp/test
82 [255]
82 [255]
@@ -8,7 +8,7 b''
8 $ echo "badext2 =" >> $HGRCPATH
8 $ echo "badext2 =" >> $HGRCPATH
9
9
10 $ hg -q help help
10 $ hg -q help help
11 \*\*\* failed to import extension badext from */badext.py: bit bucket overflow (glob)
11 *** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow
12 *** failed to import extension badext2: No module named badext2
12 *** failed to import extension badext2: No module named badext2
13 hg help [TOPIC]
13 hg help [TOPIC]
14
14
@@ -37,7 +37,7 b' bookmark list'
37 rebase
37 rebase
38
38
39 $ hg rebase -s two -d one
39 $ hg rebase -s two -d one
40 saved backup bundle to * (glob)
40 saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)
41
41
42 $ hg log
42 $ hg log
43 changeset: 3:9163974d1cb5
43 changeset: 3:9163974d1cb5
@@ -50,7 +50,7 b' bookmarks updated?'
50 strip to revision 1
50 strip to revision 1
51
51
52 $ hg strip 1
52 $ hg strip 1
53 saved backup bundle to * (glob)
53 saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)
54
54
55 list bookmarks
55 list bookmarks
56
56
@@ -80,7 +80,7 b' Check that path aliases are expanded:'
80
80
81 $ hg clone -q -U --config 'paths.foobar=a#0' foobar f
81 $ hg clone -q -U --config 'paths.foobar=a#0' foobar f
82 $ hg -R f showconfig paths.default
82 $ hg -R f showconfig paths.default
83 */a#0 (glob)
83 $TESTTMP/a#0
84
84
85 Use --pull:
85 Use --pull:
86
86
@@ -62,7 +62,7 b' Convert'
62 $ hg convert src
62 $ hg convert src
63 assuming destination src-hg
63 assuming destination src-hg
64 initializing destination src-hg repository
64 initializing destination src-hg repository
65 connecting to */cvsrepo (glob)
65 connecting to $TESTTMP/cvsrepo
66 scanning source...
66 scanning source...
67 collecting CVS rlog
67 collecting CVS rlog
68 7 log entries
68 7 log entries
@@ -69,7 +69,7 b' make unrelated change on v1_1'
69 merge file1 to v1_1
69 merge file1 to v1_1
70
70
71 $ cvscall -Q update -jv1_0
71 $ cvscall -Q update -jv1_0
72 RCS file: */cvsrepo/proj/file1,v (glob)
72 RCS file: $TESTTMP/cvsrepo/proj/file1,v
73 retrieving revision 1.1
73 retrieving revision 1.1
74 retrieving revision 1.1.2.1
74 retrieving revision 1.1.2.1
75 Merging differences between 1.1 and 1.1.2.1 into file1
75 Merging differences between 1.1 and 1.1.2.1 into file1
@@ -80,7 +80,7 b' merge change to trunk'
80
80
81 $ cvscall -Q update -A
81 $ cvscall -Q update -A
82 $ cvscall -Q update -jv1_1
82 $ cvscall -Q update -jv1_1
83 RCS file: */cvsrepo/proj/file1,v (glob)
83 RCS file: $TESTTMP/cvsrepo/proj/file1,v
84 retrieving revision 1.1
84 retrieving revision 1.1
85 retrieving revision 1.1.4.1
85 retrieving revision 1.1.4.1
86 Merging differences between 1.1 and 1.1.4.1 into file1
86 Merging differences between 1.1 and 1.1.4.1 into file1
@@ -101,7 +101,7 b' change on trunk to backport'
101 $ cvsci -m"add other text" file1
101 $ cvsci -m"add other text" file1
102 $ cvscall log file1
102 $ cvscall log file1
103
103
104 RCS file: */cvsrepo/proj/file1,v (glob)
104 RCS file: $TESTTMP/cvsrepo/proj/file1,v
105 Working file: file1
105 Working file: file1
106 head: 1.3
106 head: 1.3
107 branch:
107 branch:
@@ -141,7 +141,7 b' backport trunk change to v1_1'
141
141
142 $ cvscall -Q update -rv1_1
142 $ cvscall -Q update -rv1_1
143 $ cvscall -Q update -j1.2 -j1.3 file1
143 $ cvscall -Q update -j1.2 -j1.3 file1
144 RCS file: */cvsrepo/proj/file1,v (glob)
144 RCS file: $TESTTMP/cvsrepo/proj/file1,v
145 retrieving revision 1.2
145 retrieving revision 1.2
146 retrieving revision 1.3
146 retrieving revision 1.3
147 Merging differences between 1.2 and 1.3 into file1
147 Merging differences between 1.2 and 1.3 into file1
@@ -157,7 +157,7 b' fix bug on v1_1, merge to trunk with err'
157 cvs commit: Examining .
157 cvs commit: Examining .
158 $ cvscall -Q update -A
158 $ cvscall -Q update -A
159 $ cvscall -Q update -junmerged -jv1_1
159 $ cvscall -Q update -junmerged -jv1_1
160 RCS file: */cvsrepo/proj/file1,v (glob)
160 RCS file: $TESTTMP/cvsrepo/proj/file1,v
161 retrieving revision 1.1.4.2
161 retrieving revision 1.1.4.2
162 retrieving revision 1.1.4.3
162 retrieving revision 1.1.4.3
163 Merging differences between 1.1.4.2 and 1.1.4.3 into file1
163 Merging differences between 1.1.4.2 and 1.1.4.3 into file1
@@ -173,7 +173,7 b' convert to hg'
173 $ cd ..
173 $ cd ..
174 $ hg convert proj proj.hg
174 $ hg convert proj proj.hg
175 initializing destination proj.hg repository
175 initializing destination proj.hg repository
176 connecting to */cvsrepo (glob)
176 connecting to $TESTTMP/cvsrepo
177 scanning source...
177 scanning source...
178 collecting CVS rlog
178 collecting CVS rlog
179 12 log entries
179 12 log entries
@@ -107,24 +107,24 b' merge file6 from trunk to v1_2'
107 cvs rlog output
107 cvs rlog output
108
108
109 $ cvscall -q rlog proj | egrep '^(RCS file|revision)'
109 $ cvscall -q rlog proj | egrep '^(RCS file|revision)'
110 RCS file: */cvsrepo/proj/file1,v (glob)
110 RCS file: $TESTTMP/cvsrepo/proj/file1,v
111 revision 1.1
111 revision 1.1
112 RCS file: */cvsrepo/proj/Attic/file2,v (glob)
112 RCS file: $TESTTMP/cvsrepo/proj/Attic/file2,v
113 revision 1.1
113 revision 1.1
114 revision 1.1.4.2
114 revision 1.1.4.2
115 revision 1.1.4.1
115 revision 1.1.4.1
116 revision 1.1.2.1
116 revision 1.1.2.1
117 RCS file: */cvsrepo/proj/Attic/file3,v (glob)
117 RCS file: $TESTTMP/cvsrepo/proj/Attic/file3,v
118 revision 1.1
118 revision 1.1
119 revision 1.1.2.1
119 revision 1.1.2.1
120 RCS file: */cvsrepo/proj/Attic/file4,v (glob)
120 RCS file: $TESTTMP/cvsrepo/proj/Attic/file4,v
121 revision 1.1
121 revision 1.1
122 revision 1.1.2.1
122 revision 1.1.2.1
123 RCS file: */cvsrepo/proj/file5,v (glob)
123 RCS file: $TESTTMP/cvsrepo/proj/file5,v
124 revision 1.2
124 revision 1.2
125 revision 1.1
125 revision 1.1
126 revision 1.1.2.1
126 revision 1.1.2.1
127 RCS file: */cvsrepo/proj/file6,v (glob)
127 RCS file: $TESTTMP/cvsrepo/proj/file6,v
128 revision 1.1
128 revision 1.1
129 revision 1.1.2.2
129 revision 1.1.2.2
130 revision 1.1.2.1
130 revision 1.1.2.1
@@ -134,7 +134,7 b' convert to hg (#1)'
134 $ cd ..
134 $ cd ..
135 $ hg convert --datesort proj proj.hg
135 $ hg convert --datesort proj proj.hg
136 initializing destination proj.hg repository
136 initializing destination proj.hg repository
137 connecting to */cvsrepo (glob)
137 connecting to $TESTTMP/cvsrepo
138 scanning source...
138 scanning source...
139 collecting CVS rlog
139 collecting CVS rlog
140 15 log entries
140 15 log entries
@@ -178,7 +178,7 b' convert to hg (#2: with merge detection)'
178 > --datesort \
178 > --datesort \
179 > proj proj.hg2
179 > proj proj.hg2
180 initializing destination proj.hg2 repository
180 initializing destination proj.hg2 repository
181 connecting to */cvsrepo (glob)
181 connecting to $TESTTMP/cvsrepo
182 scanning source...
182 scanning source...
183 collecting CVS rlog
183 collecting CVS rlog
184 15 log entries
184 15 log entries
@@ -66,14 +66,14 b' commit a new revision changing b/c'
66 $ sleep 1
66 $ sleep 1
67 $ echo c >> b/c
67 $ echo c >> b/c
68 $ cvscall -q commit -mci0 . | grep '<--'
68 $ cvscall -q commit -mci0 . | grep '<--'
69 */cvsrepo/src/b/c,v <-- *c (glob)
69 $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob)
70 $ cd ..
70 $ cd ..
71
71
72 convert fresh repo
72 convert fresh repo
73
73
74 $ hg convert src src-hg
74 $ hg convert src src-hg
75 initializing destination src-hg repository
75 initializing destination src-hg repository
76 connecting to */cvsrepo (glob)
76 connecting to $TESTTMP/cvsrepo
77 scanning source...
77 scanning source...
78 collecting CVS rlog
78 collecting CVS rlog
79 5 log entries
79 5 log entries
@@ -98,7 +98,7 b' convert fresh repo with --filemap'
98 $ echo include b/c > filemap
98 $ echo include b/c > filemap
99 $ hg convert --filemap filemap src src-filemap
99 $ hg convert --filemap filemap src src-filemap
100 initializing destination src-filemap repository
100 initializing destination src-filemap repository
101 connecting to */cvsrepo (glob)
101 connecting to $TESTTMP/cvsrepo
102 scanning source...
102 scanning source...
103 collecting CVS rlog
103 collecting CVS rlog
104 5 log entries
104 5 log entries
@@ -135,7 +135,7 b' convert full repository (issue1649)'
135 > | grep -v 'log entries' | grep -v 'hook:' \
135 > | grep -v 'log entries' | grep -v 'hook:' \
136 > | grep -v '^[0-3] .*' # filter instable changeset order
136 > | grep -v '^[0-3] .*' # filter instable changeset order
137 initializing destination srcfull-hg repository
137 initializing destination srcfull-hg repository
138 connecting to */cvsrepo (glob)
138 connecting to $TESTTMP/cvsrepo
139 scanning source...
139 scanning source...
140 collecting CVS rlog
140 collecting CVS rlog
141 creating changesets
141 creating changesets
@@ -155,14 +155,14 b' commit new file revisions'
155 $ echo a >> a
155 $ echo a >> a
156 $ echo c >> b/c
156 $ echo c >> b/c
157 $ cvscall -q commit -mci1 . | grep '<--'
157 $ cvscall -q commit -mci1 . | grep '<--'
158 */cvsrepo/src/a,v <-- a (glob)
158 $TESTTMP/cvsrepo/src/a,v <-- a
159 */cvsrepo/src/b/c,v <-- *c (glob)
159 $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob)
160 $ cd ..
160 $ cd ..
161
161
162 convert again
162 convert again
163
163
164 $ hg convert src src-hg
164 $ hg convert src src-hg
165 connecting to */cvsrepo (glob)
165 connecting to $TESTTMP/cvsrepo
166 scanning source...
166 scanning source...
167 collecting CVS rlog
167 collecting CVS rlog
168 7 log entries
168 7 log entries
@@ -184,7 +184,7 b' convert again'
184 convert again with --filemap
184 convert again with --filemap
185
185
186 $ hg convert --filemap filemap src src-filemap
186 $ hg convert --filemap filemap src src-filemap
187 connecting to */cvsrepo (glob)
187 connecting to $TESTTMP/cvsrepo
188 scanning source...
188 scanning source...
189 collecting CVS rlog
189 collecting CVS rlog
190 7 log entries
190 7 log entries
@@ -216,13 +216,13 b' commit branch'
216 $ cvs -q update -r branch > /dev/null
216 $ cvs -q update -r branch > /dev/null
217 $ echo d >> b/c
217 $ echo d >> b/c
218 $ cvs -q commit -mci2 . | grep '<--'
218 $ cvs -q commit -mci2 . | grep '<--'
219 */cvsrepo/src/b/c,v <-- *c (glob)
219 $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob)
220 $ cd ..
220 $ cd ..
221
221
222 convert again
222 convert again
223
223
224 $ hg convert src src-hg
224 $ hg convert src src-hg
225 connecting to */cvsrepo (glob)
225 connecting to $TESTTMP/cvsrepo
226 scanning source...
226 scanning source...
227 collecting CVS rlog
227 collecting CVS rlog
228 8 log entries
228 8 log entries
@@ -240,7 +240,7 b' convert again'
240 convert again with --filemap
240 convert again with --filemap
241
241
242 $ hg convert --filemap filemap src src-filemap
242 $ hg convert --filemap filemap src src-filemap
243 connecting to */cvsrepo (glob)
243 connecting to $TESTTMP/cvsrepo
244 scanning source...
244 scanning source...
245 collecting CVS rlog
245 collecting CVS rlog
246 8 log entries
246 8 log entries
@@ -277,17 +277,17 b' commit new file revisions with some fuzz'
277 $ sleep 1
277 $ sleep 1
278 $ echo f >> a
278 $ echo f >> a
279 $ cvscall -q commit -mfuzzy . | grep '<--'
279 $ cvscall -q commit -mfuzzy . | grep '<--'
280 */cvsrepo/src/a,v <-- a (glob)
280 $TESTTMP/cvsrepo/src/a,v <-- a
281 $ sleep 4 # the two changes will be split if fuzz < 4
281 $ sleep 4 # the two changes will be split if fuzz < 4
282 $ echo g >> b/c
282 $ echo g >> b/c
283 $ cvscall -q commit -mfuzzy . | grep '<--'
283 $ cvscall -q commit -mfuzzy . | grep '<--'
284 */cvsrepo/src/b/c,v <-- *c (glob)
284 $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob)
285 $ cd ..
285 $ cd ..
286
286
287 convert again
287 convert again
288
288
289 $ hg convert --config convert.cvsps.fuzz=2 src src-hg
289 $ hg convert --config convert.cvsps.fuzz=2 src src-hg
290 connecting to */cvsrepo (glob)
290 connecting to $TESTTMP/cvsrepo
291 scanning source...
291 scanning source...
292 collecting CVS rlog
292 collecting CVS rlog
293 11 log entries
293 11 log entries
@@ -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://*/svn-repo (glob)
17 reparent to file://$TESTTMP/svn-repo
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://*/svn-repo/trunk (glob)
26 reparent to file://$TESTTMP/svn-repo/trunk
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://*/svn-repo/branches/branch%C3%A9 (glob)
36 reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9
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://*/svn-repo (glob)
39 reparent to file://$TESTTMP/svn-repo
40 reparent to file://*/svn-repo/branches/branch%C3%A9 (glob)
40 reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9
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://*/svn-repo/branches/branch%C3%A9e (glob)
43 reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e
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://*/svn-repo (glob)
46 reparent to file://$TESTTMP/svn-repo
47 reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
47 reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e
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://*/svn-repo/trunk (glob)
60 reparent to file://$TESTTMP/svn-repo/trunk
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://*/svn-repo (glob)
73 reparent to file://$TESTTMP/svn-repo
74 reparent to file://*/svn-repo/trunk (glob)
74 reparent to file://$TESTTMP/svn-repo/trunk
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://*/svn-repo (glob)
79 reparent to file://$TESTTMP/svn-repo
80 reparent to file://*/svn-repo/trunk (glob)
80 reparent to file://$TESTTMP/svn-repo/trunk
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://*/svn-repo (glob)
98 reparent to file://$TESTTMP/svn-repo
99 reparent to file://*/svn-repo/trunk (glob)
99 reparent to file://$TESTTMP/svn-repo/trunk
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://*/svn-repo (glob)
102 reparent to file://$TESTTMP/svn-repo
103 reparent to file://*/svn-repo/trunk (glob)
103 reparent to file://$TESTTMP/svn-repo/trunk
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://*/svn-repo/branches/branch%C3%A9 (glob)
111 reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9
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://*svn-repo/branches/branch%C3%A9e (glob)
116 reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e
117 scanning paths: /branches/branchée 0/1 (0.00%)
117 scanning paths: /branches/branchée 0/1 (0.00%)
118 reparent to file://*svn-repo (glob)
118 reparent to file://$TESTTMP/svn-repo
119 reparent to file://*svn-repo/branches/branch%C3%A9e (glob)
119 reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e
120 reparent to file://*svn-repo (glob)
120 reparent to file://$TESTTMP/svn-repo
121 reparent to file://*svn-repo/branches/branch%C3%A9e (glob)
121 reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e
122 updating tags
122 updating tags
123 .hgtags
123 .hgtags
124 run hg sink post-conversion action
124 run hg sink post-conversion action
@@ -18,7 +18,7 b''
18 Push should push to 'default' when 'default-push' not set:
18 Push should push to 'default' when 'default-push' not set:
19
19
20 $ hg --cwd b push
20 $ hg --cwd b push
21 pushing to */a (glob)
21 pushing to $TESTTMP/a
22 searching for changes
22 searching for changes
23 adding changesets
23 adding changesets
24 adding manifests
24 adding manifests
@@ -29,7 +29,7 b" Push should push to 'default-push' when "
29
29
30 $ echo 'default-push = ../c' >> b/.hg/hgrc
30 $ echo 'default-push = ../c' >> b/.hg/hgrc
31 $ hg --cwd b push
31 $ hg --cwd b push
32 pushing to */c (glob)
32 pushing to $TESTTMP/c
33 searching for changes
33 searching for changes
34 adding changesets
34 adding changesets
35 adding manifests
35 adding manifests
@@ -75,7 +75,7 b' Test diff during merge:'
75 Should diff cloned file against wc file:
75 Should diff cloned file against wc file:
76
76
77 $ hg falabala
77 $ hg falabala
78 diffing a.2a13a4d2da36/a */a/a (glob)
78 diffing a.2a13a4d2da36/a $TESTTMP/a/a
79 [1]
79 [1]
80
80
81
81
@@ -44,7 +44,7 b' Should display baz only:'
44
44
45 $ echo "*.o" > .hgignore
45 $ echo "*.o" > .hgignore
46 $ hg status
46 $ hg status
47 abort: */.hgignore: invalid pattern (relre): \*.o (glob)
47 abort: $TESTTMP/.hgignore: invalid pattern (relre): *.o
48 [255]
48 [255]
49
49
50 $ echo ".*\.o" > .hgignore
50 $ echo ".*\.o" > .hgignore
@@ -88,7 +88,7 b' Check it does not ignore the current dir'
88
88
89 $ echo "syntax: invalid" > .hgignore
89 $ echo "syntax: invalid" > .hgignore
90 $ hg status
90 $ hg status
91 */.hgignore: ignoring invalid syntax 'invalid' (glob)
91 $TESTTMP/.hgignore: ignoring invalid syntax 'invalid'
92 A dir/b.o
92 A dir/b.o
93 ? .hgignore
93 ? .hgignore
94 ? a.c
94 ? a.c
@@ -1,6 +1,13 b''
1 Use hgrc within $TESTTMP
2
3 $ HGRCPATH=`pwd`/hgrc
4 $ export HGRCPATH
5
6 Basic syntax error
7
1 $ echo "invalid" > $HGRCPATH
8 $ echo "invalid" > $HGRCPATH
2 $ hg version
9 $ hg version
3 hg: parse error at */.hgrc:1: invalid (glob)
10 hg: parse error at $TESTTMP/hgrc:1: invalid
4 [255]
11 [255]
5 $ echo "" > $HGRCPATH
12 $ echo "" > $HGRCPATH
6
13
@@ -10,7 +17,6 b" Issue1199: Can't use '%' in hgrc (eg url"
10 $ hg clone "foo%bar" foobar
17 $ hg clone "foo%bar" foobar
11 updating to branch default
18 updating to branch default
12 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
19 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
13 $ p=`pwd`
14 $ cd foobar
20 $ cd foobar
15 $ cat .hg/hgrc
21 $ cat .hg/hgrc
16 [paths]
22 [paths]
@@ -27,7 +33,7 b' issue1829: wrong indentation'
27 $ echo '[foo]' > $HGRCPATH
33 $ echo '[foo]' > $HGRCPATH
28 $ echo ' x = y' >> $HGRCPATH
34 $ echo ' x = y' >> $HGRCPATH
29 $ hg version
35 $ hg version
30 hg: parse error at */.hgrc:2: x = y (glob)
36 hg: parse error at $TESTTMP/hgrc:2: x = y
31 [255]
37 [255]
32
38
33 $ python -c "print '[foo]\nbar = a\n b\n c \n de\n fg \nbaz = bif cb \n'" \
39 $ python -c "print '[foo]\nbar = a\n b\n c \n de\n fg \nbaz = bif cb \n'" \
@@ -40,7 +46,7 b' issue1829: wrong indentation'
40 $ export FAKEPATH
46 $ export FAKEPATH
41 $ echo '%include $FAKEPATH/no-such-file' > $HGRCPATH
47 $ echo '%include $FAKEPATH/no-such-file' > $HGRCPATH
42 $ hg version
48 $ hg version
43 hg: parse error at */.hgrc:1: cannot include /path/to/nowhere/no-such-file (No such file or directory) (glob)
49 hg: parse error at $TESTTMP/hgrc:1: cannot include /path/to/nowhere/no-such-file (No such file or directory)
44 [255]
50 [255]
45 $ unset FAKEPATH
51 $ unset FAKEPATH
46
52
@@ -90,23 +96,23 b' HGPLAIN'
90 customized hgrc
96 customized hgrc
91
97
92 $ hg showconfig
98 $ hg showconfig
93 read config from: */.hgrc (glob)
99 read config from: $TESTTMP/hgrc
94 */.hgrc:13: alias.log=log -g (glob)
100 $TESTTMP/hgrc:13: alias.log=log -g
95 */.hgrc:11: defaults.identify=-n (glob)
101 $TESTTMP/hgrc:11: defaults.identify=-n
96 */.hgrc:2: ui.debug=true (glob)
102 $TESTTMP/hgrc:2: ui.debug=true
97 */.hgrc:3: ui.fallbackencoding=ASCII (glob)
103 $TESTTMP/hgrc:3: ui.fallbackencoding=ASCII
98 */.hgrc:4: ui.quiet=true (glob)
104 $TESTTMP/hgrc:4: ui.quiet=true
99 */.hgrc:5: ui.slash=true (glob)
105 $TESTTMP/hgrc:5: ui.slash=true
100 */.hgrc:6: ui.traceback=true (glob)
106 $TESTTMP/hgrc:6: ui.traceback=true
101 */.hgrc:7: ui.verbose=true (glob)
107 $TESTTMP/hgrc:7: ui.verbose=true
102 */.hgrc:8: ui.style=~/.hgstyle (glob)
108 $TESTTMP/hgrc:8: ui.style=~/.hgstyle
103 */.hgrc:9: ui.logtemplate={node} (glob)
109 $TESTTMP/hgrc:9: ui.logtemplate={node}
104
110
105 plain hgrc
111 plain hgrc
106
112
107 $ HGPLAIN=; export HGPLAIN
113 $ HGPLAIN=; export HGPLAIN
108 $ hg showconfig --config ui.traceback=True --debug
114 $ hg showconfig --config ui.traceback=True --debug
109 read config from: */.hgrc (glob)
115 read config from: $TESTTMP/hgrc
110 none: ui.traceback=True
116 none: ui.traceback=True
111 none: ui.verbose=False
117 none: ui.verbose=False
112 none: ui.debug=True
118 none: ui.debug=True
@@ -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/*/a (glob)
20 pretxncommit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 HG_PENDING=$TESTTMP/a
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/*/a (glob)
43 pretxncommit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$TESTTMP/a
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/*/a (glob)
53 pretxncommit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$TESTTMP/a
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/*/a (glob)
63 pretxncommit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd HG_PENDING=$TESTTMP/a
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/*/a (glob)
102 pretxncommit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PENDING=$TESTTMP/a
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/*/a (glob)
136 pretxncommit hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/a
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/*/a (glob)
139 pretxncommit.forbid hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/a
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/*/b HG_SOURCE=pull HG_URL=file: (glob)
195 pretxnchangegroup.forbid hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/b HG_SOURCE=pull HG_URL=file:
196 pulling from ../a
196 pulling from ../a
197 searching for changes
197 searching for changes
198 adding changesets
198 adding changesets
@@ -27,7 +27,7 b' Check that zero-size journals are correc'
27
27
28 $ hg -R foo unbundle repo.hg
28 $ hg -R foo unbundle repo.hg
29 adding changesets
29 adding changesets
30 abort: Permission denied: * (glob)
30 abort: Permission denied: $TESTTMP/foo/.hg/store/.00changelog.i-* (glob)
31 [255]
31 [255]
32
32
33 $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi
33 $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi
@@ -154,7 +154,7 b' hg cat files and symlink, no expansion'
154 do not process $Id:
154 do not process $Id:
155 xxx $
155 xxx $
156 ignore $Id$
156 ignore $Id$
157 a* (glob)
157 a
158
158
159 Test hook execution
159 Test hook execution
160
160
@@ -197,13 +197,13 b' Pull from bundle and trigger notify'
197 MIME-Version: 1.0
197 MIME-Version: 1.0
198 Content-Transfer-Encoding: 7bit
198 Content-Transfer-Encoding: 7bit
199 Date: * (glob)
199 Date: * (glob)
200 Subject: changeset in * (glob)
200 Subject: changeset in $TESTTMP/Test: addsym
201 From: mercurial
201 From: mercurial
202 X-Hg-Notification: changeset a2392c293916
202 X-Hg-Notification: changeset a2392c293916
203 Message-Id: <hg.a2392c293916*> (glob)
203 Message-Id: <hg.a2392c293916*> (glob)
204 To: Test
204 To: Test
205
205
206 changeset a2392c293916 in * (glob)
206 changeset a2392c293916 in $TESTTMP/Test
207 details: *cmd=changeset;node=a2392c293916 (glob)
207 details: *cmd=changeset;node=a2392c293916 (glob)
208 description:
208 description:
209 addsym
209 addsym
@@ -220,14 +220,14 b' Pull from bundle and trigger notify'
220 MIME-Version: 1.0
220 MIME-Version: 1.0
221 Content-Transfer-Encoding: 7bit
221 Content-Transfer-Encoding: 7bit
222 Date:* (glob)
222 Date:* (glob)
223 Subject: changeset in* (glob)
223 Subject: changeset in $TESTTMP/Test: absym
224 From: User Name <user@example.com>
224 From: User Name <user@example.com>
225 X-Hg-Notification: changeset ef63ca68695b
225 X-Hg-Notification: changeset ef63ca68695b
226 Message-Id: <hg.ef63ca68695b*> (glob)
226 Message-Id: <hg.ef63ca68695b*> (glob)
227 To: Test
227 To: Test
228
228
229 changeset ef63ca68695b in * (glob)
229 changeset ef63ca68695b in $TESTTMP/Test
230 details: *cmd=changeset;node=ef63ca68695b (glob)
230 details: $TESTTMP/Test?cmd=changeset;node=ef63ca68695b
231 description:
231 description:
232 absym
232 absym
233
233
@@ -614,7 +614,7 b' Cat and hg cat files before custom expan'
614 do not process $Id:
614 do not process $Id:
615 xxx $
615 xxx $
616 ignore $Id$
616 ignore $Id$
617 a* (glob)
617 a
618
618
619 Write custom keyword and prepare multiline commit message
619 Write custom keyword and prepare multiline commit message
620
620
@@ -664,7 +664,7 b' Stat, verify and show custom expansion ('
664 xxx $
664 xxx $
665 $Xinfo: User Name <user@example.com>: firstline $
665 $Xinfo: User Name <user@example.com>: firstline $
666 ignore $Id$
666 ignore $Id$
667 a* (glob)
667 a
668
668
669 annotate
669 annotate
670
670
@@ -735,7 +735,7 b' Clone to test incoming'
735 > default = ../Test
735 > default = ../Test
736 > EOF
736 > EOF
737 $ hg incoming
737 $ hg incoming
738 comparing with */Test (glob)
738 comparing with $TESTTMP/Test
739 searching for changes
739 searching for changes
740 changeset: 2:bb948857c743
740 changeset: 2:bb948857c743
741 tag: tip
741 tag: tip
@@ -994,7 +994,7 b' Keywords shrunk in working directory, bu'
994 xxx $
994 xxx $
995 $Xinfo: User Name <user@example.com>: firstline $
995 $Xinfo: User Name <user@example.com>: firstline $
996 ignore $Id$
996 ignore $Id$
997 a* (glob)
997 a
998
998
999 Now disable keyword expansion
999 Now disable keyword expansion
1000
1000
@@ -1011,4 +1011,4 b' Now disable keyword expansion'
1011 xxx $
1011 xxx $
1012 $Xinfo$
1012 $Xinfo$
1013 ignore $Id$
1013 ignore $Id$
1014 a* (glob)
1014 a
@@ -32,7 +32,7 b' Create a patch removing a:'
32 Save the patch queue so we can merge it later:
32 Save the patch queue so we can merge it later:
33
33
34 $ hg qsave -c -e
34 $ hg qsave -c -e
35 copy */t/.hg/patches to */t/.hg/patches.1 (glob)
35 copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1
36 $ checkundo
36 $ checkundo
37
37
38 Update b and commit in an "update" changeset:
38 Update b and commit in an "update" changeset:
@@ -52,7 +52,7 b' Update b and commit in an "update" chang'
52 b
52 b
53
53
54 $ hg qpush -a -m
54 $ hg qpush -a -m
55 merging with queue at: */t/.hg/patches.1 (glob)
55 merging with queue at: $TESTTMP/t/.hg/patches.1
56 applying rm_a
56 applying rm_a
57 now at: rm_a
57 now at: rm_a
58
58
@@ -91,14 +91,14 b' Classic MQ merge sequence *with an expli'
91 Create the reference queue:
91 Create the reference queue:
92
92
93 $ hg qsave -c -e -n refqueue
93 $ hg qsave -c -e -n refqueue
94 copy */t2/.hg/patches to */t2/.hg/refqueue (glob)
94 copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue
95 $ hg up -C 1
95 $ hg up -C 1
96 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
96 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
97
97
98 Merge:
98 Merge:
99
99
100 $ HGMERGE=internal:other hg qpush -a -m -n refqueue
100 $ HGMERGE=internal:other hg qpush -a -m -n refqueue
101 merging with queue at: */t2/.hg/refqueue (glob)
101 merging with queue at: $TESTTMP/t2/.hg/refqueue
102 applying patcha
102 applying patcha
103 patching file a
103 patching file a
104 Hunk #1 FAILED at 0
104 Hunk #1 FAILED at 0
@@ -39,7 +39,7 b' qpop/qrefresh on the wrong revision'
39 abort: popping would remove a revision not managed by this patch queue
39 abort: popping would remove a revision not managed by this patch queue
40 [255]
40 [255]
41 $ hg qpop -n patches
41 $ hg qpop -n patches
42 using patch queue: */repo/.hg/patches (glob)
42 using patch queue: $TESTTMP/repo/.hg/patches
43 abort: popping would remove a revision not managed by this patch queue
43 abort: popping would remove a revision not managed by this patch queue
44 [255]
44 [255]
45 $ hg qrefresh
45 $ hg qrefresh
@@ -77,7 +77,7 b''
77 summary: e
77 summary: e
78
78
79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
80 saved backup bundle to * (glob)
80 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
81 % after update 4, strip 4
81 % after update 4, strip 4
82 changeset: 3:65bd5f99a4a3
82 changeset: 3:65bd5f99a4a3
83 tag: tip
83 tag: tip
@@ -96,7 +96,7 b''
96 summary: e
96 summary: e
97
97
98 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
98 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
99 saved backup bundle to * (glob)
99 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
100 % after update 4, strip 3
100 % after update 4, strip 3
101 changeset: 1:ef3a871183d7
101 changeset: 1:ef3a871183d7
102 user: test
102 user: test
@@ -111,7 +111,7 b''
111 date: Thu Jan 01 00:00:00 1970 +0000
111 date: Thu Jan 01 00:00:00 1970 +0000
112 summary: b
112 summary: b
113
113
114 saved backup bundle to * (glob)
114 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
115 % after update 1, strip 4
115 % after update 1, strip 4
116 changeset: 1:ef3a871183d7
116 changeset: 1:ef3a871183d7
117 user: test
117 user: test
@@ -127,7 +127,7 b''
127 date: Thu Jan 01 00:00:00 1970 +0000
127 date: Thu Jan 01 00:00:00 1970 +0000
128 summary: e
128 summary: e
129
129
130 saved backup bundle to * (glob)
130 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
131 % after update 4, strip 2
131 % after update 4, strip 2
132 changeset: 3:443431ffac4f
132 changeset: 3:443431ffac4f
133 tag: tip
133 tag: tip
@@ -146,7 +146,7 b''
146 summary: c
146 summary: c
147
147
148 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
148 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
149 saved backup bundle to * (glob)
149 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
150 % after update 4, strip 1
150 % after update 4, strip 1
151 changeset: 0:9ab35a2d17cb
151 changeset: 0:9ab35a2d17cb
152 tag: tip
152 tag: tip
@@ -157,7 +157,7 b''
157 $ teststrip null 4
157 $ teststrip null 4
158 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
158 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
159 % before update null, strip 4
159 % before update null, strip 4
160 saved backup bundle to * (glob)
160 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
161 % after update null, strip 4
161 % after update null, strip 4
162
162
163 $ hg log
163 $ hg log
@@ -212,7 +212,7 b' before strip of merge parent'
212
212
213 $ hg strip 4
213 $ hg strip 4
214 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
214 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
215 saved backup bundle to * (glob)
215 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
216
216
217 after strip of merge parent
217 after strip of merge parent
218
218
@@ -258,7 +258,7 b' after strip of merge parent'
258 2 is parent of 3, only one strip should happen
258 2 is parent of 3, only one strip should happen
259
259
260 $ hg strip 2 3
260 $ hg strip 2 3
261 saved backup bundle to * (glob)
261 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
262 $ hg glog
262 $ hg glog
263 @ changeset: 2:264128213d29
263 @ changeset: 2:264128213d29
264 | tag: tip
264 | tag: tip
@@ -310,8 +310,8 b' 2 different branches: 2 strips'
310
310
311 $ hg strip 2 4
311 $ hg strip 2 4
312 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
312 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
313 saved backup bundle to * (glob)
313 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
314 saved backup bundle to * (glob)
314 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
315 $ hg glog
315 $ hg glog
316 @ changeset: 2:65bd5f99a4a3
316 @ changeset: 2:65bd5f99a4a3
317 | tag: tip
317 | tag: tip
@@ -335,14 +335,14 b' 2 different branches and a common ancest'
335
335
336 $ hg strip 1 2 4
336 $ hg strip 1 2 4
337 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
337 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
338 saved backup bundle to * (glob)
338 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
339 $ restore
339 $ restore
340
340
341
341
342 remove branchy history for qimport tests
342 remove branchy history for qimport tests
343
343
344 $ hg strip 3
344 $ hg strip 3
345 saved backup bundle to * (glob)
345 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
346
346
347
347
348 strip of applied mq should cleanup status file
348 strip of applied mq should cleanup status file
@@ -364,7 +364,7 b' stripping revision in queue'
364
364
365 $ hg strip 3
365 $ hg strip 3
366 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
366 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
367 saved backup bundle to * (glob)
367 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
368
368
369 applied patches after stripping rev in queue
369 applied patches after stripping rev in queue
370
370
@@ -375,7 +375,7 b' stripping ancestor of queue'
375
375
376 $ hg strip 1
376 $ hg strip 1
377 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
377 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
378 saved backup bundle to * (glob)
378 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
379
379
380 applied patches after stripping ancestor of queue
380 applied patches after stripping ancestor of queue
381
381
@@ -135,7 +135,7 b' qinit -c should create both files if the'
135 guards
135 guards
136 $ cat .hg/patches/series
136 $ cat .hg/patches/series
137 $ hg qinit -c
137 $ hg qinit -c
138 abort: repository * already exists! (glob)
138 abort: repository $TESTTMP/d/.hg/patches already exists!
139 [255]
139 [255]
140 $ cd ..
140 $ cd ..
141
141
@@ -737,7 +737,7 b' strip'
737 adding x
737 adding x
738 $ hg strip tip
738 $ hg strip tip
739 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
739 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
740 saved backup bundle to * (glob)
740 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
741 $ hg unbundle .hg/strip-backup/*
741 $ hg unbundle .hg/strip-backup/*
742 adding changesets
742 adding changesets
743 adding manifests
743 adding manifests
@@ -760,7 +760,7 b' strip with local changes, should complai'
760
760
761 $ hg strip -f tip
761 $ hg strip -f tip
762 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
762 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
763 saved backup bundle to * (glob)
763 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
764
764
765
765
766 cd b; hg qrefresh
766 cd b; hg qrefresh
@@ -1118,7 +1118,7 b' strip again'
1118
1118
1119 $ hg strip 1
1119 $ hg strip 1
1120 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1120 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1121 saved backup bundle to * (glob)
1121 saved backup bundle to $TESTTMP/b/strip/.hg/strip-backup/*-backup.hg (glob)
1122 $ checkundo strip
1122 $ checkundo strip
1123 $ hg log
1123 $ hg log
1124 changeset: 1:20cbbe65cff7
1124 changeset: 1:20cbbe65cff7
@@ -56,12 +56,12 b' push'
56 Message-Id: <*> (glob)
56 Message-Id: <*> (glob)
57 To: baz, foo@bar
57 To: baz, foo@bar
58
58
59 changeset cb9a9f314b8b in */a (glob)
59 changeset cb9a9f314b8b in $TESTTMP/a
60 details: */a?cmd=changeset;node=cb9a9f314b8b (glob)
60 details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
61 summary: a
61 summary: a
62
62
63 changeset ba677d0156c1 in */a (glob)
63 changeset ba677d0156c1 in $TESTTMP/a
64 details: */a?cmd=changeset;node=ba677d0156c1 (glob)
64 details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
65 summary: b
65 summary: b
66
66
67 diffs (6 lines):
67 diffs (6 lines):
@@ -120,14 +120,14 b' pull (minimal config)'
120 MIME-Version: 1.0
120 MIME-Version: 1.0
121 Content-Transfer-Encoding: 7bit
121 Content-Transfer-Encoding: 7bit
122 Date: * (glob)
122 Date: * (glob)
123 Subject: changeset in */b: b (glob)
123 Subject: changeset in $TESTTMP/b: b
124 From: test
124 From: test
125 X-Hg-Notification: changeset 0647d048b600
125 X-Hg-Notification: changeset 0647d048b600
126 Message-Id: <*> (glob)
126 Message-Id: <*> (glob)
127 To: baz, foo@bar
127 To: baz, foo@bar
128
128
129 changeset 0647d048b600 in */b (glob)
129 changeset 0647d048b600 in $TESTTMP/b
130 details: *?cmd=changeset;node=0647d048b600 (glob)
130 details: $TESTTMP/b?cmd=changeset;node=0647d048b600
131 description: b
131 description: b
132
132
133 diffs (6 lines):
133 diffs (6 lines):
@@ -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 */b (glob)
9 comparing with $TESTTMP/b
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 */b (glob)
14 comparing with $TESTTMP/b
15 no changes found
15 no changes found
16 [1]
16 [1]
@@ -20,7 +20,7 b''
20 checking manifests
20 checking manifests
21 crosschecking files in changesets and manifests
21 crosschecking files in changesets and manifests
22 checking files
22 checking files
23 abort: Permission denied: * (glob)
23 abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i
24 [255]
24 [255]
25
25
26 $ chmod +r .hg/store/data/a.i
26 $ chmod +r .hg/store/data/a.i
@@ -37,7 +37,7 b''
37 $ echo barber > a
37 $ echo barber > a
38 $ hg commit -m "2"
38 $ hg commit -m "2"
39 trouble committing a!
39 trouble committing a!
40 abort: Permission denied: * (glob)
40 abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i
41 [255]
41 [255]
42
42
43 $ chmod -w .
43 $ chmod -w .
@@ -40,7 +40,7 b' Expected to fail:'
40 Expected to fail:
40 Expected to fail:
41
41
42 $ hg push
42 $ hg push
43 pushing to * (glob)
43 pushing to $TESTTMP/test
44 searching for changes
44 searching for changes
45 adding changesets
45 adding changesets
46 adding manifests
46 adding manifests
@@ -56,7 +56,7 b' Conflicting rebase:'
56 Abort:
56 Abort:
57
57
58 $ hg rebase --abort
58 $ hg rebase --abort
59 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
59 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
60 rebase aborted
60 rebase aborted
61
61
62 $ hg tglog
62 $ hg tglog
@@ -98,7 +98,7 b' Rebase part of branch2 (5-6) onto branch'
98 0: 'A'
98 0: 'A'
99
99
100 $ hg rebase --detach -s 5 -d 8
100 $ hg rebase --detach -s 5 -d 8
101 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
101 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
102
102
103 $ hg branches
103 $ hg branches
104 branch3 8:c1d4b9719987
104 branch3 8:c1d4b9719987
@@ -159,7 +159,7 b' Rebase head of branch3 (8) onto branch2 '
159 o 0: 'A'
159 o 0: 'A'
160
160
161 $ hg rebase --detach -s 8 -d 6
161 $ hg rebase --detach -s 8 -d 6
162 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
162 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
163
163
164 $ hg branches
164 $ hg branches
165 branch2 8:e1e80ed73210
165 branch2 8:e1e80ed73210
@@ -223,7 +223,7 b' Rebase entire branch3 (7-8) onto branch2'
223 o 0: 'A'
223 o 0: 'A'
224
224
225 $ hg rebase --detach -s 7 -d 6
225 $ hg rebase --detach -s 7 -d 6
226 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
226 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
227
227
228 $ hg branches
228 $ hg branches
229 branch2 7:e1e80ed73210
229 branch2 7:e1e80ed73210
@@ -125,7 +125,7 b' Solve the conflict and go on:'
125 $ rm A.orig
125 $ rm A.orig
126 $ hg resolve -m A
126 $ hg resolve -m A
127 $ hg rebase --continue
127 $ hg rebase --continue
128 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
128 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
129
129
130 $ hg tglog
130 $ hg tglog
131 @ 5: 'F' notdefault
131 @ 5: 'F' notdefault
@@ -77,7 +77,7 b' Rebasing B onto H:'
77 $ cd a1
77 $ cd a1
78
78
79 $ hg rebase --collapse --keepbranches
79 $ hg rebase --collapse --keepbranches
80 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
80 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
81
81
82 $ hg tglog
82 $ hg tglog
83 @ 5: 'Collapsed revision
83 @ 5: 'Collapsed revision
@@ -111,7 +111,7 b' Rebasing G onto H:'
111 $ cd a2
111 $ cd a2
112
112
113 $ hg rebase --base 6 --collapse
113 $ hg rebase --base 6 --collapse
114 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
114 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
115
115
116 $ hg tglog
116 $ hg tglog
117 @ 6: 'Collapsed revision
117 @ 6: 'Collapsed revision
@@ -220,7 +220,7 b' Rebase and collapse - more than one exte'
220 Rebase and collapse - E onto H:
220 Rebase and collapse - E onto H:
221
221
222 $ hg rebase -s 4 --collapse
222 $ hg rebase -s 4 --collapse
223 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
223 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/*-backup.hg (glob)
224
224
225 $ hg tglog
225 $ hg tglog
226 @ 5: 'Collapsed revision
226 @ 5: 'Collapsed revision
@@ -331,7 +331,7 b' Rebase and collapse - E onto I:'
331
331
332 $ hg rebase -s 4 --collapse
332 $ hg rebase -s 4 --collapse
333 merging E
333 merging E
334 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
334 saved backup bundle to $TESTTMP/c1/.hg/strip-backup/*-backup.hg (glob)
335
335
336 $ hg tglog
336 $ hg tglog
337 @ 5: 'Collapsed revision
337 @ 5: 'Collapsed revision
@@ -420,7 +420,7 b' Rebase and collapse - B onto F:'
420 $ cd d1
420 $ cd d1
421
421
422 $ hg rebase -s 1 --collapse
422 $ hg rebase -s 1 --collapse
423 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
423 saved backup bundle to $TESTTMP/d1/.hg/strip-backup/*-backup.hg (glob)
424
424
425 $ hg tglog
425 $ hg tglog
426 @ 2: 'Collapsed revision
426 @ 2: 'Collapsed revision
@@ -73,7 +73,7 b' Conclude rebase:'
73 $ echo 'resolved merge' >common
73 $ echo 'resolved merge' >common
74 $ hg resolve -m common
74 $ hg resolve -m common
75 $ hg rebase --continue
75 $ hg rebase --continue
76 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
76 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
77
77
78 $ hg tglog
78 $ hg tglog
79 @ 5: 'L3'
79 @ 5: 'L3'
@@ -54,7 +54,7 b' Rebasing D onto E detaching from C:'
54 o 0: 'A'
54 o 0: 'A'
55
55
56 $ hg rebase --detach -s 3 -d 4
56 $ hg rebase --detach -s 3 -d 4
57 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
57 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
58
58
59 $ hg tglog
59 $ hg tglog
60 @ 4: 'D'
60 @ 4: 'D'
@@ -92,7 +92,7 b' Rebasing C onto E detaching from B:'
92 o 0: 'A'
92 o 0: 'A'
93
93
94 $ hg rebase --detach -s 2 -d 4
94 $ hg rebase --detach -s 2 -d 4
95 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
95 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
96
96
97 $ hg tglog
97 $ hg tglog
98 @ 4: 'D'
98 @ 4: 'D'
@@ -131,7 +131,7 b' Rebasing B onto E using detach (same as '
131 o 0: 'A'
131 o 0: 'A'
132
132
133 $ hg rebase --detach -s 1 -d 4
133 $ hg rebase --detach -s 1 -d 4
134 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
134 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
135
135
136 $ hg tglog
136 $ hg tglog
137 @ 4: 'D'
137 @ 4: 'D'
@@ -171,7 +171,7 b' Rebasing C onto E detaching from B and c'
171 o 0: 'A'
171 o 0: 'A'
172
172
173 $ hg rebase --detach --collapse -s 2 -d 4
173 $ hg rebase --detach --collapse -s 2 -d 4
174 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
174 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
175
175
176 $ hg tglog
176 $ hg tglog
177 @ 3: 'Collapsed revision
177 @ 3: 'Collapsed revision
@@ -50,7 +50,7 b' Rebase with no arguments - single revisi'
50 $ hg up -q -C 2
50 $ hg up -q -C 2
51
51
52 $ hg rebase
52 $ hg rebase
53 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
53 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
54
54
55 $ hg tglog
55 $ hg tglog
56 @ 4: 'l1'
56 @ 4: 'l1'
@@ -108,7 +108,7 b' Rebase with no arguments - single revisi'
108 $ hg up -q -C 3
108 $ hg up -q -C 3
109
109
110 $ hg rebase
110 $ hg rebase
111 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
111 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
112
112
113 $ hg tglog
113 $ hg tglog
114 @ 4: 'l2'
114 @ 4: 'l2'
@@ -53,7 +53,7 b' Rebase a branch while preserving the bra'
53 $ hg up -q -C 3
53 $ hg up -q -C 3
54
54
55 $ hg rebase -b 4 -d 3 --keepbranches
55 $ hg rebase -b 4 -d 3 --keepbranches
56 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
56 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
57
57
58 $ hg tglog
58 $ hg tglog
59 @ 4: 'r1' notdefault
59 @ 4: 'r1' notdefault
@@ -48,7 +48,7 b' already has one local mq patch'
48 $ hg up -q -C qtip
48 $ hg up -q -C qtip
49
49
50 $ hg rebase
50 $ hg rebase
51 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
51 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
52
52
53 $ hg tglog
53 $ hg tglog
54 @ 3: 'P0' tags: p0.patch qbase qtip tip
54 @ 3: 'P0' tags: p0.patch qbase qtip tip
@@ -111,7 +111,7 b' already has one local mq patch'
111 $ HGMERGE=internal:local hg resolve --all
111 $ HGMERGE=internal:local hg resolve --all
112
112
113 $ hg rebase --continue
113 $ hg rebase --continue
114 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
114 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
115
115
116 $ hg tglog
116 $ hg tglog
117 @ 9: 'r5' tags: 5.diff qtip tip
117 @ 9: 'r5' tags: 5.diff qtip tip
@@ -82,7 +82,7 b' Fix the 2nd conflict:'
82 $ echo mq1r1mq2 > f
82 $ echo mq1r1mq2 > f
83 $ hg resolve -m f
83 $ hg resolve -m f
84 $ hg rebase -c
84 $ hg rebase -c
85 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
85 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
86
86
87 $ hg tglog
87 $ hg tglog
88 @ 3: 'P1' tags: f2.patch qtip tip
88 @ 3: 'P1' tags: f2.patch qtip tip
@@ -191,7 +191,7 b' Adding one git-style patch and one norma'
191 Rebase the applied mq patches:
191 Rebase the applied mq patches:
192
192
193 $ hg rebase -s 2 -d 1
193 $ hg rebase -s 2 -d 1
194 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
194 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
195
195
196 $ hg qci -m 'save patch state'
196 $ hg qci -m 'save patch state'
197
197
@@ -41,7 +41,7 b''
41 $ hg rebase -s 1 -d 3
41 $ hg rebase -s 1 -d 3
42 merging a
42 merging a
43 merging a
43 merging a
44 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
44 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob)
45
45
46 $ hg tglog
46 $ hg tglog
47 @ 3: 'C'
47 @ 3: 'C'
@@ -107,7 +107,7 b' Rebase with no arguments (from 3 onto 7)'
107 $ hg up -q -C 5
107 $ hg up -q -C 5
108
108
109 $ hg rebase
109 $ hg rebase
110 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
110 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
111
111
112 $ hg tglog
112 $ hg tglog
113 @ 7: 'l3'
113 @ 7: 'l3'
@@ -141,7 +141,7 b" Rebase with base == '.' => same as no ar"
141 $ cd a2
141 $ cd a2
142
142
143 $ hg rebase --base .
143 $ hg rebase --base .
144 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
144 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
145
145
146 $ hg tglog
146 $ hg tglog
147 @ 7: 'l3'
147 @ 7: 'l3'
@@ -169,7 +169,7 b' Rebase with dest == `hg branch` => same '
169 $ cd a3
169 $ cd a3
170
170
171 $ hg rebase --dest `hg branch`
171 $ hg rebase --dest `hg branch`
172 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
172 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
173
173
174 $ hg tglog
174 $ hg tglog
175 @ 7: 'l3'
175 @ 7: 'l3'
@@ -197,7 +197,7 b' Specify only source (from 4 onto 7):'
197 $ cd a4
197 $ cd a4
198
198
199 $ hg rebase --source 4
199 $ hg rebase --source 4
200 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
200 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
201
201
202 $ hg tglog
202 $ hg tglog
203 @ 7: 'l3'
203 @ 7: 'l3'
@@ -225,7 +225,7 b' Specify only dest (from 3 onto 6):'
225 $ cd a5
225 $ cd a5
226
226
227 $ hg rebase --dest 6
227 $ hg rebase --dest 6
228 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
228 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob)
229
229
230 $ hg tglog
230 $ hg tglog
231 @ 7: 'l3'
231 @ 7: 'l3'
@@ -253,7 +253,7 b' Specify only base (from 3 onto 7):'
253 $ cd a6
253 $ cd a6
254
254
255 $ hg rebase --base 5
255 $ hg rebase --base 5
256 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
256 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob)
257
257
258 $ hg tglog
258 $ hg tglog
259 @ 7: 'l3'
259 @ 7: 'l3'
@@ -281,7 +281,7 b' Specify source and dest (from 4 onto 6):'
281 $ cd a7
281 $ cd a7
282
282
283 $ hg rebase --source 4 --dest 6
283 $ hg rebase --source 4 --dest 6
284 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
284 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/*-backup.hg (glob)
285
285
286 $ hg tglog
286 $ hg tglog
287 @ 7: 'l3'
287 @ 7: 'l3'
@@ -309,7 +309,7 b' Specify base and dest (from 3 onto 6):'
309 $ cd a8
309 $ cd a8
310
310
311 $ hg rebase --base 4 --dest 6
311 $ hg rebase --base 4 --dest 6
312 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
312 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/*-backup.hg (glob)
313
313
314 $ hg tglog
314 $ hg tglog
315 @ 7: 'l3'
315 @ 7: 'l3'
@@ -48,13 +48,13 b''
48 Now b has one revision to be pulled from a:
48 Now b has one revision to be pulled from a:
49
49
50 $ hg pull --rebase
50 $ hg pull --rebase
51 pulling from */a (glob)
51 pulling from $TESTTMP/a
52 searching for changes
52 searching for changes
53 adding changesets
53 adding changesets
54 adding manifests
54 adding manifests
55 adding file changes
55 adding file changes
56 added 1 changesets with 1 changes to 1 files (+1 heads)
56 added 1 changesets with 1 changes to 1 files (+1 heads)
57 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
57 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
58
58
59 $ hg tglog
59 $ hg tglog
60 @ 3: 'L1'
60 @ 3: 'L1'
@@ -68,7 +68,7 b' Now b has one revision to be pulled from'
68 Re-run:
68 Re-run:
69
69
70 $ hg pull --rebase
70 $ hg pull --rebase
71 pulling from */a (glob)
71 pulling from $TESTTMP/a
72 searching for changes
72 searching for changes
73 no changes found
73 no changes found
74
74
@@ -78,7 +78,7 b' Invoke pull --rebase and nothing to reba'
78 $ cd ../c
78 $ cd ../c
79
79
80 $ hg pull --rebase
80 $ hg pull --rebase
81 pulling from */a (glob)
81 pulling from $TESTTMP/a
82 searching for changes
82 searching for changes
83 adding changesets
83 adding changesets
84 adding manifests
84 adding manifests
@@ -94,7 +94,7 b' Invoke pull --rebase and nothing to reba'
94 pull --rebase --update should ignore --update:
94 pull --rebase --update should ignore --update:
95
95
96 $ hg pull --rebase --update
96 $ hg pull --rebase --update
97 pulling from */a (glob)
97 pulling from $TESTTMP/a
98 searching for changes
98 searching for changes
99 no changes found
99 no changes found
100
100
@@ -103,7 +103,7 b" pull --rebase doesn't update if nothing "
103 $ hg up -q 1
103 $ hg up -q 1
104
104
105 $ hg pull --rebase
105 $ hg pull --rebase
106 pulling from */a (glob)
106 pulling from $TESTTMP/a
107 searching for changes
107 searching for changes
108 no changes found
108 no changes found
109
109
@@ -46,7 +46,7 b' Rename is tracked:'
46 Rebase the revision containing the rename:
46 Rebase the revision containing the rename:
47
47
48 $ hg rebase -s 2 -d 1
48 $ hg rebase -s 2 -d 1
49 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
49 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
50
50
51 $ hg tglog
51 $ hg tglog
52 @ 2: 'rename A'
52 @ 2: 'rename A'
@@ -102,7 +102,7 b' Copy is tracked:'
102 Rebase the revision containing the copy:
102 Rebase the revision containing the copy:
103
103
104 $ hg rebase -s 2 -d 1
104 $ hg rebase -s 2 -d 1
105 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
105 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
106
106
107 $ hg tglog
107 $ hg tglog
108 @ 2: 'copy A'
108 @ 2: 'copy A'
@@ -69,7 +69,7 b' B onto F - simple rebase:'
69 o 0: 'A'
69 o 0: 'A'
70
70
71 $ hg rebase -s 1 -d 5
71 $ hg rebase -s 1 -d 5
72 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
72 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
73
73
74 $ hg tglog
74 $ hg tglog
75 @ 5: 'B'
75 @ 5: 'B'
@@ -93,7 +93,7 b' B onto D - intermediate point:'
93 $ cd a2
93 $ cd a2
94
94
95 $ hg rebase -s 1 -d 3
95 $ hg rebase -s 1 -d 3
96 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
96 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
97
97
98 $ hg tglog
98 $ hg tglog
99 @ 5: 'B'
99 @ 5: 'B'
@@ -117,7 +117,7 b' C onto F - skip of E:'
117 $ cd a3
117 $ cd a3
118
118
119 $ hg rebase -s 2 -d 5
119 $ hg rebase -s 2 -d 5
120 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
120 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
121
121
122 $ hg tglog
122 $ hg tglog
123 @ 4: 'C'
123 @ 4: 'C'
@@ -139,7 +139,7 b' D onto C - rebase of a branching point ('
139 $ cd a4
139 $ cd a4
140
140
141 $ hg rebase -s 3 -d 2
141 $ hg rebase -s 3 -d 2
142 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
142 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
143
143
144 $ hg tglog
144 $ hg tglog
145 @ 4: 'F'
145 @ 4: 'F'
@@ -161,7 +161,7 b' E onto F - merged revision having a pare'
161 $ cd a5
161 $ cd a5
162
162
163 $ hg rebase -s 4 -d 5
163 $ hg rebase -s 4 -d 5
164 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
164 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob)
165
165
166 $ hg tglog
166 $ hg tglog
167 @ 5: 'E'
167 @ 5: 'E'
@@ -185,7 +185,7 b' D onto B - E maintains C as parent:'
185 $ cd a6
185 $ cd a6
186
186
187 $ hg rebase -s 3 -d 1
187 $ hg rebase -s 3 -d 1
188 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
188 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob)
189
189
190 $ hg tglog
190 $ hg tglog
191 @ 5: 'F'
191 @ 5: 'F'
@@ -60,7 +60,7 b' clone and pull to break links'
60 relink
60 relink
61
61
62 $ hg relink --debug | fix_path
62 $ hg relink --debug | fix_path
63 relinking */.hg/store (glob)
63 relinking $TESTTMP/repo/.hg/store to $TESTTMP/clone/.hg/store
64 tip has 2 files, estimated total number of files: 3
64 tip has 2 files, estimated total number of files: 3
65 collecting: 00changelog.i 1/3 files (33.33%)
65 collecting: 00changelog.i 1/3 files (33.33%)
66 collecting: 00manifest.i 2/3 files (66.67%)
66 collecting: 00manifest.i 2/3 files (66.67%)
@@ -26,7 +26,7 b" share shouldn't have a store dir"
26 Some sed versions appends newline, some don't, and some just fails
26 Some sed versions appends newline, some don't, and some just fails
27
27
28 $ cat .hg/sharedpath; echo
28 $ cat .hg/sharedpath; echo
29 */repo1/.hg (glob)
29 $TESTTMP/repo1/.hg
30
30
31 commit in shared clone
31 commit in shared clone
32
32
@@ -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/*/local (glob)
147 comparing with ssh://user@dummy/$TESTTMP/local
148 searching for changes
148 searching for changes
149 changeset: 1:a28a9d1a809c
149 changeset: 1:a28a9d1a809c
150 tag: tip
150 tag: tip
@@ -220,13 +220,13 b' push should succeed even though it has a'
220 $ cd ..
220 $ cd ..
221 $ cat dummylog
221 $ cat dummylog
222 Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio
222 Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio
223 Got arguments 1:user@dummy 2:hg -R */nonexistent serve --stdio (glob)
223 Got arguments 1:user@dummy 2:hg -R /$TESTTMP/nonexistent serve --stdio
224 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
224 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
225 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
225 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
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 /*/local serve --stdio (glob)
229 Got arguments 1:user@dummy 2:hg -R $TESTTMP/local serve --stdio
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
@@ -1,6 +1,5 b''
1 test stripping of filelogs where the linkrev doesn't always increase
1 test stripping of filelogs where the linkrev doesn't always increase
2
2
3 $ . $TESTDIR/helpers.sh
4 $ echo '[extensions]' >> $HGRCPATH
3 $ echo '[extensions]' >> $HGRCPATH
5 $ echo 'hgext.mq =' >> $HGRCPATH
4 $ echo 'hgext.mq =' >> $HGRCPATH
6 $ hg init orig
5 $ hg init orig
@@ -90,13 +89,13 b' 2 1 0 2 0 1 2'
90 $ for i in 0 1 2 3 4; do
89 $ for i in 0 1 2 3 4; do
91 > hg clone -q -U --pull crossed $i
90 > hg clone -q -U --pull crossed $i
92 > echo "% Trying to strip revision $i"
91 > echo "% Trying to strip revision $i"
93 > hg --cwd $i strip $i | hidebackup
92 > hg --cwd $i strip $i
94 > echo "% Verifying"
93 > echo "% Verifying"
95 > hg --cwd $i verify
94 > hg --cwd $i verify
96 > echo
95 > echo
97 > done
96 > done
98 % Trying to strip revision 0
97 % Trying to strip revision 0
99 saved backup bundle to
98 saved backup bundle to $TESTTMP/0/.hg/strip-backup/*-backup.hg (glob)
100 % Verifying
99 % Verifying
101 checking changesets
100 checking changesets
102 checking manifests
101 checking manifests
@@ -105,7 +104,7 b' 2 1 0 2 0 1 2'
105 7 files, 4 changesets, 15 total revisions
104 7 files, 4 changesets, 15 total revisions
106
105
107 % Trying to strip revision 1
106 % Trying to strip revision 1
108 saved backup bundle to
107 saved backup bundle to $TESTTMP/1/.hg/strip-backup/*-backup.hg (glob)
109 % Verifying
108 % Verifying
110 checking changesets
109 checking changesets
111 checking manifests
110 checking manifests
@@ -114,7 +113,7 b' 2 1 0 2 0 1 2'
114 7 files, 4 changesets, 14 total revisions
113 7 files, 4 changesets, 14 total revisions
115
114
116 % Trying to strip revision 2
115 % Trying to strip revision 2
117 saved backup bundle to
116 saved backup bundle to $TESTTMP/2/.hg/strip-backup/*-backup.hg (glob)
118 % Verifying
117 % Verifying
119 checking changesets
118 checking changesets
120 checking manifests
119 checking manifests
@@ -123,7 +122,7 b' 2 1 0 2 0 1 2'
123 7 files, 4 changesets, 14 total revisions
122 7 files, 4 changesets, 14 total revisions
124
123
125 % Trying to strip revision 3
124 % Trying to strip revision 3
126 saved backup bundle to
125 saved backup bundle to $TESTTMP/3/.hg/strip-backup/*-backup.hg (glob)
127 % Verifying
126 % Verifying
128 checking changesets
127 checking changesets
129 checking manifests
128 checking manifests
@@ -132,7 +131,7 b' 2 1 0 2 0 1 2'
132 7 files, 4 changesets, 19 total revisions
131 7 files, 4 changesets, 19 total revisions
133
132
134 % Trying to strip revision 4
133 % Trying to strip revision 4
135 saved backup bundle to
134 saved backup bundle to $TESTTMP/4/.hg/strip-backup/*-backup.hg (glob)
136 % Verifying
135 % Verifying
137 checking changesets
136 checking changesets
138 checking manifests
137 checking manifests
@@ -27,7 +27,7 b" Preparing the 'main' repo which depends "
27 $ echo "sub1 = ../sub1" > main/.hgsub
27 $ echo "sub1 = ../sub1" > main/.hgsub
28 $ hg clone sub1 main/sub1
28 $ hg clone sub1 main/sub1
29 updating to branch default
29 updating to branch default
30 pulling subrepo sub2 from */sub2 (glob)
30 pulling subrepo sub2 from $TESTTMP/sub2
31 requesting all changes
31 requesting all changes
32 adding changesets
32 adding changesets
33 adding manifests
33 adding manifests
@@ -55,13 +55,13 b' Clone main'
55
55
56 $ hg clone main cloned
56 $ hg clone main cloned
57 updating to branch default
57 updating to branch default
58 pulling subrepo sub1 from */sub1 (glob)
58 pulling subrepo sub1 from $TESTTMP/sub1
59 requesting all changes
59 requesting all changes
60 adding changesets
60 adding changesets
61 adding manifests
61 adding manifests
62 adding file changes
62 adding file changes
63 added 1 changesets with 3 changes to 3 files
63 added 1 changesets with 3 changes to 3 files
64 pulling subrepo sub1/sub2 from */sub2 (glob)
64 pulling subrepo sub1/sub2 from $TESTTMP/sub2
65 requesting all changes
65 requesting all changes
66 adding changesets
66 adding changesets
67 adding manifests
67 adding manifests
@@ -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 */outer/.hg/hgrc:2: invalid group reference (glob)
31 abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference
32 [255]
32 [255]
@@ -246,13 +246,13 b' Clone and test outgoing:'
246 $ cd ..
246 $ cd ..
247 $ hg clone repo repo2
247 $ hg clone repo repo2
248 updating to branch default
248 updating to branch default
249 pulling subrepo foo from */repo/foo (glob)
249 pulling subrepo foo from $TESTTMP/repo/foo
250 requesting all changes
250 requesting all changes
251 adding changesets
251 adding changesets
252 adding manifests
252 adding manifests
253 adding file changes
253 adding file changes
254 added 4 changesets with 7 changes to 3 files
254 added 4 changesets with 7 changes to 3 files
255 pulling subrepo foo/bar from */repo/foo/bar (glob)
255 pulling subrepo foo/bar from $TESTTMP/repo/foo/bar
256 requesting all changes
256 requesting all changes
257 adding changesets
257 adding changesets
258 adding manifests
258 adding manifests
@@ -261,13 +261,13 b' Clone and test outgoing:'
261 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
261 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
262 $ cd repo2
262 $ cd repo2
263 $ hg outgoing -S
263 $ hg outgoing -S
264 comparing with */repo (glob)
264 comparing with $TESTTMP/repo
265 searching for changes
265 searching for changes
266 no changes found
266 no changes found
267 comparing with */repo/foo (glob)
267 comparing with $TESTTMP/repo/foo
268 searching for changes
268 searching for changes
269 no changes found
269 no changes found
270 comparing with */repo/foo/bar (glob)
270 comparing with $TESTTMP/repo/foo/bar
271 searching for changes
271 searching for changes
272 no changes found
272 no changes found
273 [1]
273 [1]
@@ -287,7 +287,7 b' Make nested change:'
287 $ hg commit -m 3-4-2
287 $ hg commit -m 3-4-2
288 committing subrepository foo
288 committing subrepository foo
289 $ hg outgoing -S
289 $ hg outgoing -S
290 comparing with */repo (glob)
290 comparing with $TESTTMP/repo
291 searching for changes
291 searching for changes
292 changeset: 3:2655b8ecc4ee
292 changeset: 3:2655b8ecc4ee
293 tag: tip
293 tag: tip
@@ -295,7 +295,7 b' Make nested change:'
295 date: Thu Jan 01 00:00:00 1970 +0000
295 date: Thu Jan 01 00:00:00 1970 +0000
296 summary: 3-4-2
296 summary: 3-4-2
297
297
298 comparing with */repo/foo (glob)
298 comparing with $TESTTMP/repo/foo
299 searching for changes
299 searching for changes
300 changeset: 4:e96193d6cb36
300 changeset: 4:e96193d6cb36
301 tag: tip
301 tag: tip
@@ -303,7 +303,7 b' Make nested change:'
303 date: Thu Jan 01 00:00:00 1970 +0000
303 date: Thu Jan 01 00:00:00 1970 +0000
304 summary: 3-4-2
304 summary: 3-4-2
305
305
306 comparing with */repo/foo/bar (glob)
306 comparing with $TESTTMP/repo/foo/bar
307 searching for changes
307 searching for changes
308 no changes found
308 no changes found
309
309
@@ -317,7 +317,7 b' Switch to original repo and setup defaul'
317 Test incoming:
317 Test incoming:
318
318
319 $ hg incoming -S
319 $ hg incoming -S
320 comparing with */repo2 (glob)
320 comparing with $TESTTMP/repo2
321 searching for changes
321 searching for changes
322 changeset: 3:2655b8ecc4ee
322 changeset: 3:2655b8ecc4ee
323 tag: tip
323 tag: tip
@@ -325,7 +325,7 b' Test incoming:'
325 date: Thu Jan 01 00:00:00 1970 +0000
325 date: Thu Jan 01 00:00:00 1970 +0000
326 summary: 3-4-2
326 summary: 3-4-2
327
327
328 comparing with */repo2/foo (glob)
328 comparing with $TESTTMP/repo2/foo
329 searching for changes
329 searching for changes
330 changeset: 4:e96193d6cb36
330 changeset: 4:e96193d6cb36
331 tag: tip
331 tag: tip
@@ -333,7 +333,7 b' Test incoming:'
333 date: Thu Jan 01 00:00:00 1970 +0000
333 date: Thu Jan 01 00:00:00 1970 +0000
334 summary: 3-4-2
334 summary: 3-4-2
335
335
336 comparing with */repo2/foo/bar (glob)
336 comparing with $TESTTMP/repo2/foo/bar
337 searching for changes
337 searching for changes
338 no changes found
338 no changes found
339
339
@@ -73,7 +73,7 b' debugsub'
73
73
74 $ hg debugsub
74 $ hg debugsub
75 path s
75 path s
76 source file:///*/svn-repo/src (glob)
76 source file://$TESTTMP/svn-repo/src
77 revision 2
77 revision 2
78
78
79 change file in svn and hg, commit
79 change file in svn and hg, commit
@@ -86,13 +86,13 b' change file in svn and hg, commit'
86 Transmitting file data .
86 Transmitting file data .
87 Committed revision 3.
87 Committed revision 3.
88
88
89 Fetching external item into '*/s/externals' (glob)
89 Fetching external item into '$TESTTMP/sub/t/s/externals'
90 External at revision 1.
90 External at revision 1.
91
91
92 At revision 3.
92 At revision 3.
93 $ hg debugsub
93 $ hg debugsub
94 path s
94 path s
95 source file:///*/svn-repo/src (glob)
95 source file://$TESTTMP/svn-repo/src
96 revision 3
96 revision 3
97
97
98 $ echo a > s/a
98 $ echo a > s/a
@@ -192,7 +192,7 b' debugsub in clone'
192
192
193 $ hg debugsub
193 $ hg debugsub
194 path s
194 path s
195 source file:///*/svn-repo/src (glob)
195 source file://$TESTTMP/svn-repo/src
196 revision 3
196 revision 3
197
197
198 verify subrepo is contained within the repo directory
198 verify subrepo is contained within the repo directory
@@ -236,19 +236,19 b' clone'
236 $ cd ..
236 $ cd ..
237 $ hg clone t tc
237 $ hg clone t tc
238 updating to branch default
238 updating to branch default
239 pulling subrepo s from */sub/t/s (glob)
239 pulling subrepo s from $TESTTMP/sub/t/s
240 requesting all changes
240 requesting all changes
241 adding changesets
241 adding changesets
242 adding manifests
242 adding manifests
243 adding file changes
243 adding file changes
244 added 4 changesets with 5 changes to 3 files
244 added 4 changesets with 5 changes to 3 files
245 pulling subrepo s/ss from */sub/t/s/ss (glob)
245 pulling subrepo s/ss from $TESTTMP/sub/t/s/ss
246 requesting all changes
246 requesting all changes
247 adding changesets
247 adding changesets
248 adding manifests
248 adding manifests
249 adding file changes
249 adding file changes
250 added 1 changesets with 1 changes to 1 files
250 added 1 changesets with 1 changes to 1 files
251 pulling subrepo t from */sub/t/t (glob)
251 pulling subrepo t from $TESTTMP/sub/t/t
252 requesting all changes
252 requesting all changes
253 adding changesets
253 adding changesets
254 adding manifests
254 adding manifests
@@ -270,14 +270,14 b' push'
270 $ hg ci -m11
270 $ hg ci -m11
271 committing subrepository t
271 committing subrepository t
272 $ hg push
272 $ hg push
273 pushing *sub/t (glob)
273 pushing to $TESTTMP/sub/t
274 pushing *sub/t/s/ss (glob)
274 pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
275 searching for changes
275 searching for changes
276 no changes found
276 no changes found
277 pushing *sub/t/s (glob)
277 pushing subrepo s to $TESTTMP/sub/t/s
278 searching for changes
278 searching for changes
279 no changes found
279 no changes found
280 pushing *sub/t/t (glob)
280 pushing subrepo t to $TESTTMP/sub/t/t
281 searching for changes
281 searching for changes
282 adding changesets
282 adding changesets
283 adding manifests
283 adding manifests
@@ -295,27 +295,27 b' push -f'
295 $ hg ci -m12
295 $ hg ci -m12
296 committing subrepository s
296 committing subrepository s
297 $ hg push
297 $ hg push
298 pushing *sub/t (glob)
298 pushing to $TESTTMP/sub/t
299 pushing *sub/t/s/ss (glob)
299 pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
300 searching for changes
300 searching for changes
301 no changes found
301 no changes found
302 pushing *sub/t/s (glob)
302 pushing subrepo s to $TESTTMP/sub/t/s
303 searching for changes
303 searching for changes
304 abort: push creates new remote heads on branch 'default'!
304 abort: push creates new remote heads on branch 'default'!
305 (did you forget to merge? use push -f to force)
305 (did you forget to merge? use push -f to force)
306 [255]
306 [255]
307 $ hg push -f
307 $ hg push -f
308 pushing *sub/t (glob)
308 pushing to $TESTTMP/sub/t
309 pushing *sub/t/s/ss (glob)
309 pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
310 searching for changes
310 searching for changes
311 no changes found
311 no changes found
312 pushing *sub/t/s (glob)
312 pushing subrepo s to $TESTTMP/sub/t/s
313 searching for changes
313 searching for changes
314 adding changesets
314 adding changesets
315 adding manifests
315 adding manifests
316 adding file changes
316 adding file changes
317 added 1 changesets with 1 changes to 1 files (+1 heads)
317 added 1 changesets with 1 changes to 1 files (+1 heads)
318 pushing *sub/t/t (glob)
318 pushing subrepo t to $TESTTMP/sub/t/t
319 searching for changes
319 searching for changes
320 no changes found
320 no changes found
321 searching for changes
321 searching for changes
@@ -337,7 +337,7 b' pull'
337
337
338 $ cd ../tc
338 $ cd ../tc
339 $ hg pull
339 $ hg pull
340 pulling *sub/t (glob)
340 pulling from $TESTTMP/sub/t
341 searching for changes
341 searching for changes
342 adding changesets
342 adding changesets
343 adding manifests
343 adding manifests
@@ -348,7 +348,7 b' pull'
348 should pull t
348 should pull t
349
349
350 $ hg up
350 $ hg up
351 pulling subrepo t from */sub/t/t (glob)
351 pulling subrepo t from $TESTTMP/sub/t/t
352 searching for changes
352 searching for changes
353 adding changesets
353 adding changesets
354 adding manifests
354 adding manifests
@@ -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 = */sub/mercurial/nested_absolute (glob)
545 default = $TESTTMP/sub/mercurial/nested_absolute
546 [paths]
546 [paths]
547 default = */sub/mercurial/nested_relative (glob)
547 default = $TESTTMP/sub/mercurial/nested_relative
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
@@ -560,7 +560,7 b' Issue1977: multirepo push should fail if'
560 committing subrepository s
560 committing subrepository s
561 $ hg clone repo repo2
561 $ hg clone repo repo2
562 updating to branch default
562 updating to branch default
563 pulling subrepo s from */sub/repo/s (glob)
563 pulling subrepo s from $TESTTMP/sub/repo/s
564 requesting all changes
564 requesting all changes
565 adding changesets
565 adding changesets
566 adding manifests
566 adding manifests
@@ -299,7 +299,7 b" Don't allow moving tag without -f:"
299 Strip 1: expose an old head:
299 Strip 1: expose an old head:
300
300
301 $ hg --config extensions.mq= strip 5
301 $ hg --config extensions.mq= strip 5
302 saved backup bundle to * (glob)
302 saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob)
303 $ hg tags # partly stale cache
303 $ hg tags # partly stale cache
304 tip 5:735c3ca72986
304 tip 5:735c3ca72986
305 bar 1:78391a272241
305 bar 1:78391a272241
@@ -310,7 +310,7 b' Strip 1: expose an old head:'
310 Strip 2: destroy whole branch, no old head exposed
310 Strip 2: destroy whole branch, no old head exposed
311
311
312 $ hg --config extensions.mq= strip 4
312 $ hg --config extensions.mq= strip 4
313 saved backup bundle to * (glob)
313 saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob)
314 $ hg tags # partly stale
314 $ hg tags # partly stale
315 tip 4:735c3ca72986
315 tip 4:735c3ca72986
316 bar 0:bbd179dfa0a7
316 bar 0:bbd179dfa0a7
@@ -42,7 +42,7 b' Test basic functionality of url#rev synt'
42
42
43 $ cat clone/.hg/hgrc
43 $ cat clone/.hg/hgrc
44 [paths]
44 [paths]
45 default = */repo#foo (glob)
45 default = $TESTTMP/repo#foo
46
46
47 Changing original repo:
47 Changing original repo:
48
48
@@ -216,7 +216,7 b' Test absolute paths:'
216 f beans/pinto beans/pinto
216 f beans/pinto beans/pinto
217 f beans/turtle beans/turtle
217 f beans/turtle beans/turtle
218 $ hg debugwalk `pwd`/..
218 $ hg debugwalk `pwd`/..
219 abort: */.. not under root (glob)
219 abort: $TESTTMP/t/.. not under root
220 [255]
220 [255]
221
221
222 Test patterns:
222 Test patterns:
General Comments 0
You need to be logged in to leave comments. Login now