Show More
@@ -229,7 +229,7 old file -- date clamped to 1980 | |||||
229 | Archive: ../old.zip |
|
229 | Archive: ../old.zip | |
230 | \s*Length.* |
|
230 | \s*Length.* | |
231 | .*-----.* |
|
231 | .*-----.* | |
232 | .*147.*80.*00:00.*old/.hg_archival.txt |
|
232 | .*147.*80.*00:00.*old/\.hg_archival\.txt | |
233 | .*0.*80.*00:00.*old/old |
|
233 | .*0.*80.*00:00.*old/old | |
234 | .*-----.* |
|
234 | .*-----.* | |
235 | \s*147\s+2 files |
|
235 | \s*147\s+2 files |
@@ -78,5 +78,5 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 |
|
81 | abort: No such file or directory: .*/test-audit-path\.t/target//tmp/test | |
82 | [255] |
|
82 | [255] |
@@ -189,7 +189,7 Short help: | |||||
189 | Test short command list with verbose option |
|
189 | Test short command list with verbose option | |
190 |
|
190 | |||
191 | $ hg -v help shortlist |
|
191 | $ hg -v help shortlist | |
192 |
Mercurial Distributed SCM \(version .* |
|
192 | Mercurial Distributed SCM \(version .*\) | |
193 |
|
193 | |||
194 | Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others |
|
194 | Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others | |
195 | This is free software; see the source for copying conditions. There is NO |
|
195 | This is free software; see the source for copying conditions. There is NO |
@@ -44,7 +44,7 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 |
|
47 | abort: .*/\.hgignore: invalid pattern \(relre\): \*\.o | |
48 | [255] |
|
48 | [255] | |
49 |
|
49 | |||
50 | $ echo ".*\.o" > .hgignore |
|
50 | $ echo ".*\.o" > .hgignore | |
@@ -88,7 +88,7 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' |
|
91 | .*/\.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 |
@@ -18,8 +18,8 issue1199: escaping | |||||
18 | $ hg paths |
|
18 | $ hg paths | |
19 | default = .*/foo%bar |
|
19 | default = .*/foo%bar | |
20 | $ hg showconfig |
|
20 | $ hg showconfig | |
21 | bundle.mainreporoot=.*/foobar |
|
21 | bundle\.mainreporoot=.*/foobar | |
22 | paths.default=.*/foo%bar |
|
22 | paths\.default=.*/foo%bar | |
23 | $ cd .. |
|
23 | $ cd .. | |
24 |
|
24 | |||
25 | issue1829: wrong indentation |
|
25 | issue1829: wrong indentation | |
@@ -40,7 +40,7 issue1829: wrong indentation | |||||
40 | $ export FAKEPATH |
|
40 | $ export FAKEPATH | |
41 | $ echo '%include $FAKEPATH/no-such-file' > $HGRCPATH |
|
41 | $ echo '%include $FAKEPATH/no-such-file' > $HGRCPATH | |
42 | $ hg version |
|
42 | $ hg version | |
43 | hg: parse error at .*/.hgrc:1: cannot include /path/to/nowhere/no-such-file \(No such file or directory\) |
|
43 | hg: parse error at .*/\.hgrc:1: cannot include /path/to/nowhere/no-such-file \(No such file or directory\) | |
44 | [255] |
|
44 | [255] | |
45 | $ unset FAKEPATH |
|
45 | $ unset FAKEPATH | |
46 |
|
46 | |||
@@ -90,23 +90,23 HGPLAIN | |||||
90 | customized hgrc |
|
90 | customized hgrc | |
91 |
|
91 | |||
92 | $ hg showconfig |
|
92 | $ hg showconfig | |
93 | read config from: .*/.hgrc |
|
93 | read config from: .*/\.hgrc | |
94 | .*/.hgrc:13: alias.log=log -g |
|
94 | .*/\.hgrc:13: alias\.log=log -g | |
95 | .*/.hgrc:11: defaults.identify=-n |
|
95 | .*/\.hgrc:11: defaults\.identify=-n | |
96 | .*/.hgrc:2: ui.debug=true |
|
96 | .*/\.hgrc:2: ui\.debug=true | |
97 | .*/.hgrc:3: ui.fallbackencoding=ASCII |
|
97 | .*/\.hgrc:3: ui\.fallbackencoding=ASCII | |
98 | .*/.hgrc:4: ui.quiet=true |
|
98 | .*/\.hgrc:4: ui\.quiet=true | |
99 | .*/.hgrc:5: ui.slash=true |
|
99 | .*/\.hgrc:5: ui\.slash=true | |
100 | .*/.hgrc:6: ui.traceback=true |
|
100 | .*/\.hgrc:6: ui\.traceback=true | |
101 | .*/.hgrc:7: ui.verbose=true |
|
101 | .*/\.hgrc:7: ui\.verbose=true | |
102 | .*/.hgrc:8: ui.style=~/.hgstyle |
|
102 | .*/\.hgrc:8: ui\.style=~/.hgstyle | |
103 | .*/.hgrc:9: ui.logtemplate={node} |
|
103 | .*/\.hgrc:9: ui\.logtemplate=\{node\} | |
104 |
|
104 | |||
105 | plain hgrc |
|
105 | plain hgrc | |
106 |
|
106 | |||
107 | $ HGPLAIN=; export HGPLAIN |
|
107 | $ HGPLAIN=; export HGPLAIN | |
108 | $ hg showconfig --config ui.traceback=True --debug |
|
108 | $ hg showconfig --config ui.traceback=True --debug | |
109 | read config from: .*/.hgrc |
|
109 | read config from: .*/\.hgrc | |
110 | none: ui.traceback=True |
|
110 | none: ui.traceback=True | |
111 | none: ui.verbose=False |
|
111 | none: ui.verbose=False | |
112 | none: ui.debug=True |
|
112 | none: ui.debug=True |
@@ -415,12 +415,12 make sure --traceback works | |||||
415 | $ echo >> foo |
|
415 | $ echo >> foo | |
416 | $ hg ci --debug -d '0 0' -m 'change foo' |
|
416 | $ hg ci --debug -d '0 0' -m 'change foo' | |
417 | foo |
|
417 | foo | |
418 | calling hook commit.auto: <function autohook at .*> |
|
418 | calling hook commit\.auto: <function autohook at .*> | |
419 | Automatically installed hook |
|
419 | Automatically installed hook | |
420 | committed changeset 1:52998019f6252a2b893452765fcb0a47351a5708 |
|
420 | committed changeset 1:52998019f6252a2b893452765fcb0a47351a5708 | |
421 |
|
421 | |||
422 | $ hg showconfig hooks |
|
422 | $ hg showconfig hooks | |
423 | hooks.commit.auto=<function autohook at .*> |
|
423 | hooks\.commit\.auto=<function autohook at .*> | |
424 |
|
424 | |||
425 | test python hook configured with python:[file]:[hook] syntax |
|
425 | test python hook configured with python:[file]:[hook] syntax | |
426 |
|
426 |
@@ -1,7 +1,7 | |||||
1 | hg debuginstall |
|
1 | hg debuginstall | |
2 | $ hg debuginstall |
|
2 | $ hg debuginstall | |
3 | Checking encoding (ascii)... |
|
3 | Checking encoding (ascii)... | |
4 | Checking installed modules \(.*/mercurial\)... |
|
4 | Checking installed modules \(.*/mercurial\)\.\.\. | |
5 | Checking templates... |
|
5 | Checking templates... | |
6 | Checking patch... |
|
6 | Checking patch... | |
7 | Checking commit editor... |
|
7 | Checking commit editor... | |
@@ -11,7 +11,7 hg debuginstall | |||||
11 | hg debuginstall with no username |
|
11 | hg debuginstall with no username | |
12 | $ HGUSER= hg debuginstall |
|
12 | $ HGUSER= hg debuginstall | |
13 | Checking encoding (ascii)... |
|
13 | Checking encoding (ascii)... | |
14 | Checking installed modules \(.*/mercurial\)... |
|
14 | Checking installed modules \(.*/mercurial\)\.\.\. | |
15 | Checking templates... |
|
15 | Checking templates... | |
16 | Checking patch... |
|
16 | Checking patch... | |
17 | Checking commit editor... |
|
17 | Checking commit editor... |
@@ -26,14 +26,14 as it would succeed without uisetup othe | |||||
26 | RCSfile = {file|basename},v |
|
26 | RCSfile = {file|basename},v | |
27 | Revision = {node|short} |
|
27 | Revision = {node|short} | |
28 | Source = {root}/{file},v |
|
28 | Source = {root}/{file},v | |
29 |
|
|
29 | $Author: test $ | |
30 | \$Date: ..../../.. ..:..:.. \$ |
|
30 | \$Date: ..../../.. ..:..:.. \$ | |
31 | \$Header: .*/demo.txt,v ............ ..../../.. ..:..:.. test \$ |
|
31 | \$Header: .*/demo\.txt,v ............ ..../../.. ..:..:.. test \$ | |
32 | \$Id: demo.txt,v ............ ..../../.. ..:..:.. test \$ |
|
32 | \$Id: demo\.txt,v ............ ..../../.. ..:..:.. test \$ | |
33 |
|
|
33 | $RCSFile: demo.txt,v $ | |
34 |
|
|
34 | $RCSfile: demo.txt,v $ | |
35 | \$Revision: ............ \$ |
|
35 | \$Revision: ............ \$ | |
36 | \$Source: .*/demo.txt,v \$ |
|
36 | \$Source: .*/demo\.txt,v \$ | |
37 |
|
37 | |||
38 | $ hg --quiet kwdemo "Branch = {branches}" |
|
38 | $ hg --quiet kwdemo "Branch = {branches}" | |
39 | [extensions] |
|
39 | [extensions] | |
@@ -71,7 +71,7 A bundle to test this was made with: | |||||
71 | hg bundle --base null ../test-keyword.hg |
|
71 | hg bundle --base null ../test-keyword.hg | |
72 |
|
72 | |||
73 | $ hg pull -u "$TESTDIR"/test-keyword.hg |
|
73 | $ hg pull -u "$TESTDIR"/test-keyword.hg | |
74 | pulling from .*test-keyword.hg |
|
74 | pulling from .*test-keyword\.hg | |
75 | requesting all changes |
|
75 | requesting all changes | |
76 | adding changesets |
|
76 | adding changesets | |
77 | adding manifests |
|
77 | adding manifests | |
@@ -199,11 +199,11 Pull from bundle and trigger notify | |||||
199 | Subject: changeset in .* |
|
199 | Subject: changeset in .* | |
200 | From: mercurial |
|
200 | From: mercurial | |
201 | X-Hg-Notification: changeset a2392c293916 |
|
201 | X-Hg-Notification: changeset a2392c293916 | |
202 | Message-Id: <hg.a2392c293916.*> |
|
202 | Message-Id: <hg\.a2392c293916.*> | |
203 | To: Test |
|
203 | To: Test | |
204 |
|
204 | |||
205 | changeset a2392c293916 in .* |
|
205 | changeset a2392c293916 in .* | |
206 | details: .*?cmd=changeset;node=a2392c293916 |
|
206 | details: .*\?cmd=changeset;node=a2392c293916 | |
207 | description: |
|
207 | description: | |
208 | addsym |
|
208 | addsym | |
209 |
|
209 | |||
@@ -222,11 +222,11 Pull from bundle and trigger notify | |||||
222 | Subject: changeset in.* |
|
222 | Subject: changeset in.* | |
223 | From: User Name <user@example.com> |
|
223 | From: User Name <user@example.com> | |
224 | X-Hg-Notification: changeset ef63ca68695b |
|
224 | X-Hg-Notification: changeset ef63ca68695b | |
225 | Message-Id: <hg.ef63ca68695b.*> |
|
225 | Message-Id: <hg\.ef63ca68695b.*> | |
226 | To: Test |
|
226 | To: Test | |
227 |
|
227 | |||
228 | changeset ef63ca68695b in .* |
|
228 | changeset ef63ca68695b in .* | |
229 | details: .*?cmd=changeset;node=ef63ca68695b |
|
229 | details: .*\?cmd=changeset;node=ef63ca68695b | |
230 | description: |
|
230 | description: | |
231 | absym |
|
231 | absym | |
232 |
|
232 | |||
@@ -648,7 +648,7 Clone to test incoming | |||||
648 | > default = ../Test |
|
648 | > default = ../Test | |
649 | > EOF |
|
649 | > EOF | |
650 | $ hg incoming |
|
650 | $ hg incoming | |
651 | comparing with .*test-keyword.t/Test |
|
651 | comparing with .*test-keyword\.t/Test | |
652 | searching for changes |
|
652 | searching for changes | |
653 | changeset: 2:bb948857c743 |
|
653 | changeset: 2:bb948857c743 | |
654 | tag: tip |
|
654 | tag: tip |
@@ -32,7 +32,7 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 |
|
35 | copy .*/t/\.hg/patches to .*/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 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 |
|
55 | merging with queue at: .*/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 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 |
|
94 | copy .*/t2/\.hg/patches to .*/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 |
|
101 | merging with queue at: .*/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 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 |
|
42 | using patch queue: .*/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 |
@@ -25,7 +25,7 | |||||
25 | Content-Transfer-Encoding: 7bit |
|
25 | Content-Transfer-Encoding: 7bit | |
26 | Subject: [PATCH] a |
|
26 | Subject: [PATCH] a | |
27 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
27 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab | |
28 | Message-Id: <8580ff50825a50c8f716.60@.* |
|
28 | Message-Id: <8580ff50825a50c8f716\.60@.* | |
29 | User-Agent: Mercurial-patchbomb/.* |
|
29 | User-Agent: Mercurial-patchbomb/.* | |
30 | Date: Thu, 01 Jan 1970 00:01:00 +0000 |
|
30 | Date: Thu, 01 Jan 1970 00:01:00 +0000 | |
31 | From: quux |
|
31 | From: quux | |
@@ -80,7 +80,7 | |||||
80 | MIME-Version: 1.0 |
|
80 | MIME-Version: 1.0 | |
81 | Content-Transfer-Encoding: 7bit |
|
81 | Content-Transfer-Encoding: 7bit | |
82 | Subject: [PATCH 0 of 2] test |
|
82 | Subject: [PATCH 0 of 2] test | |
83 | Message-Id: <patchbomb.120@[^>]*> |
|
83 | Message-Id: <patchbomb\.120@[^>]*> | |
84 | User-Agent: Mercurial-patchbomb/.* |
|
84 | User-Agent: Mercurial-patchbomb/.* | |
85 | Date: Thu, 01 Jan 1970 00:02:00 +0000 |
|
85 | Date: Thu, 01 Jan 1970 00:02:00 +0000 | |
86 | From: quux |
|
86 | From: quux | |
@@ -94,9 +94,9 | |||||
94 | Content-Transfer-Encoding: 7bit |
|
94 | Content-Transfer-Encoding: 7bit | |
95 | Subject: [PATCH 1 of 2] a |
|
95 | Subject: [PATCH 1 of 2] a | |
96 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
96 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab | |
97 | Message-Id: <8580ff50825a50c8f716.121@[^>]*> |
|
97 | Message-Id: <8580ff50825a50c8f716\.121@[^>]*> | |
98 | In-Reply-To: <patchbomb.120@[^>]*> |
|
98 | In-Reply-To: <patchbomb\.120@[^>]*> | |
99 | References: <patchbomb.120@[^>]*> |
|
99 | References: <patchbomb\.120@[^>]*> | |
100 | User-Agent: Mercurial-patchbomb/.* |
|
100 | User-Agent: Mercurial-patchbomb/.* | |
101 | Date: Thu, 01 Jan 1970 00:02:01 +0000 |
|
101 | Date: Thu, 01 Jan 1970 00:02:01 +0000 | |
102 | From: quux |
|
102 | From: quux | |
@@ -122,9 +122,9 | |||||
122 | Content-Transfer-Encoding: 7bit |
|
122 | Content-Transfer-Encoding: 7bit | |
123 | Subject: [PATCH 2 of 2] b |
|
123 | Subject: [PATCH 2 of 2] b | |
124 | X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 |
|
124 | X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 | |
125 | Message-Id: <97d72e5f12c7e84f8506.122@[^>]*> |
|
125 | Message-Id: <97d72e5f12c7e84f8506\.122@[^>]*> | |
126 | In-Reply-To: <patchbomb.120@[^>]*> |
|
126 | In-Reply-To: <patchbomb\.120@[^>]*> | |
127 | References: <patchbomb.120@[^>]*> |
|
127 | References: <patchbomb\.120@[^>]*> | |
128 | User-Agent: Mercurial-patchbomb/.* |
|
128 | User-Agent: Mercurial-patchbomb/.* | |
129 | Date: Thu, 01 Jan 1970 00:02:02 +0000 |
|
129 | Date: Thu, 01 Jan 1970 00:02:02 +0000 | |
130 | From: quux |
|
130 | From: quux | |
@@ -241,7 +241,7 mime encoded mbox (base64): | |||||
241 | Content-Transfer-Encoding: base64 |
|
241 | Content-Transfer-Encoding: base64 | |
242 | Subject: [PATCH] charset=utf-8; content-transfer-encoding: base64 |
|
242 | Subject: [PATCH] charset=utf-8; content-transfer-encoding: base64 | |
243 | X-Mercurial-Node: c3c9e37db9f4fe4882cda39baf42fed6bad8b15a |
|
243 | X-Mercurial-Node: c3c9e37db9f4fe4882cda39baf42fed6bad8b15a | |
244 | Message-Id: <c3c9e37db9f4fe4882cd.240@.* |
|
244 | Message-Id: <c3c9e37db9f4fe4882cd\.240@.* | |
245 | User-Agent: Mercurial-patchbomb/.* |
|
245 | User-Agent: Mercurial-patchbomb/.* | |
246 | Date: Thu, 01 Jan 1970 00:04:00 +0000 |
|
246 | Date: Thu, 01 Jan 1970 00:04:00 +0000 | |
247 | From: quux |
|
247 | From: quux | |
@@ -1810,7 +1810,7 test multi-byte domain parsing: | |||||
1810 | Content-Transfer-Encoding: 7bit |
|
1810 | Content-Transfer-Encoding: 7bit | |
1811 | Subject: [PATCH] test |
|
1811 | Subject: [PATCH] test | |
1812 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
1812 | X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab | |
1813 | Message-Id: <8580ff50825a50c8f716.315532860@.* |
|
1813 | Message-Id: <8580ff50825a50c8f716\.315532860@.* | |
1814 | User-Agent: Mercurial-patchbomb/.* |
|
1814 | User-Agent: Mercurial-patchbomb/.* | |
1815 | Date: Tue, 01 Jan 1980 00:01:00 +0000 |
|
1815 | Date: Tue, 01 Jan 1980 00:01:00 +0000 | |
1816 | From: quux |
|
1816 | From: quux | |
@@ -1857,7 +1857,7 test outgoing: | |||||
1857 | MIME-Version: 1.0 |
|
1857 | MIME-Version: 1.0 | |
1858 | Content-Transfer-Encoding: 7bit |
|
1858 | Content-Transfer-Encoding: 7bit | |
1859 | Subject: [PATCH 0 of 8] test |
|
1859 | Subject: [PATCH 0 of 8] test | |
1860 | Message-Id: <patchbomb.315532860@.* |
|
1860 | Message-Id: <patchbomb\.315532860@.* | |
1861 | User-Agent: Mercurial-patchbomb/.* |
|
1861 | User-Agent: Mercurial-patchbomb/.* | |
1862 | Date: Tue, 01 Jan 1980 00:01:00 +0000 |
|
1862 | Date: Tue, 01 Jan 1980 00:01:00 +0000 | |
1863 | From: test |
|
1863 | From: test | |
@@ -1870,9 +1870,9 test outgoing: | |||||
1870 | Content-Transfer-Encoding: 7bit |
|
1870 | Content-Transfer-Encoding: 7bit | |
1871 | Subject: [PATCH 1 of 8] c |
|
1871 | Subject: [PATCH 1 of 8] c | |
1872 | X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f |
|
1872 | X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f | |
1873 | Message-Id: <ff2c9fa2018b15fa74b3.315532861@.* |
|
1873 | Message-Id: <ff2c9fa2018b15fa74b3\.315532861@.* | |
1874 | In-Reply-To: <patchbomb.315532860@[^>]*> |
|
1874 | In-Reply-To: <patchbomb\.315532860@[^>]*> | |
1875 | References: <patchbomb.315532860@[^>]*> |
|
1875 | References: <patchbomb\.315532860@[^>]*> | |
1876 | User-Agent: Mercurial-patchbomb/.* |
|
1876 | User-Agent: Mercurial-patchbomb/.* | |
1877 | Date: Tue, 01 Jan 1980 00:01:01 +0000 |
|
1877 | Date: Tue, 01 Jan 1980 00:01:01 +0000 | |
1878 | From: test |
|
1878 | From: test | |
@@ -1897,9 +1897,9 test outgoing: | |||||
1897 | Content-Transfer-Encoding: 8bit |
|
1897 | Content-Transfer-Encoding: 8bit | |
1898 | Subject: [PATCH 2 of 8] charset=utf-8; content-transfer-encoding: base64 |
|
1898 | Subject: [PATCH 2 of 8] charset=utf-8; content-transfer-encoding: base64 | |
1899 | X-Mercurial-Node: c3c9e37db9f4fe4882cda39baf42fed6bad8b15a |
|
1899 | X-Mercurial-Node: c3c9e37db9f4fe4882cda39baf42fed6bad8b15a | |
1900 | Message-Id: <c3c9e37db9f4fe4882cd.315532862@.* |
|
1900 | Message-Id: <c3c9e37db9f4fe4882cd\.315532862@.* | |
1901 | In-Reply-To: <patchbomb.315532860@[^>]*> |
|
1901 | In-Reply-To: <patchbomb\.315532860@[^>]*> | |
1902 | References: <patchbomb.315532860@[^>]*> |
|
1902 | References: <patchbomb\.315532860@[^>]*> | |
1903 | User-Agent: Mercurial-patchbomb/.* |
|
1903 | User-Agent: Mercurial-patchbomb/.* | |
1904 | Date: Tue, 01 Jan 1980 00:01:02 +0000 |
|
1904 | Date: Tue, 01 Jan 1980 00:01:02 +0000 | |
1905 | From: test |
|
1905 | From: test | |
@@ -1932,9 +1932,9 test outgoing: | |||||
1932 | Subject: [PATCH 3 of 8] charset=utf-8; |
|
1932 | Subject: [PATCH 3 of 8] charset=utf-8; | |
1933 | content-transfer-encoding: quoted-printable |
|
1933 | content-transfer-encoding: quoted-printable | |
1934 | X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376 |
|
1934 | X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376 | |
1935 | Message-Id: <c655633f8c87700bb38c.315532863@.* |
|
1935 | Message-Id: <c655633f8c87700bb38c\.315532863@.* | |
1936 | In-Reply-To: <patchbomb.315532860@[^>]*> |
|
1936 | In-Reply-To: <patchbomb\.315532860@[^>]*> | |
1937 | References: <patchbomb.315532860@[^>]*> |
|
1937 | References: <patchbomb\.315532860@[^>]*> | |
1938 | User-Agent: Mercurial-patchbomb/.* |
|
1938 | User-Agent: Mercurial-patchbomb/.* | |
1939 | Date: Tue, 01 Jan 1980 00:01:03 +0000 |
|
1939 | Date: Tue, 01 Jan 1980 00:01:03 +0000 | |
1940 | From: test |
|
1940 | From: test | |
@@ -1975,9 +1975,9 test outgoing: | |||||
1975 | Content-Transfer-Encoding: 8bit |
|
1975 | Content-Transfer-Encoding: 8bit | |
1976 | Subject: [PATCH 4 of 8] charset=us-ascii; content-transfer-encoding: 8bit |
|
1976 | Subject: [PATCH 4 of 8] charset=us-ascii; content-transfer-encoding: 8bit | |
1977 | X-Mercurial-Node: 22d0f96be12f5945fd67d101af58f7bc8263c835 |
|
1977 | X-Mercurial-Node: 22d0f96be12f5945fd67d101af58f7bc8263c835 | |
1978 | Message-Id: <22d0f96be12f5945fd67.315532864@.* |
|
1978 | Message-Id: <22d0f96be12f5945fd67\.315532864@.* | |
1979 | In-Reply-To: <patchbomb.315532860@[^>]*> |
|
1979 | In-Reply-To: <patchbomb\.315532860@[^>]*> | |
1980 | References: <patchbomb.315532860@[^>]*> |
|
1980 | References: <patchbomb\.315532860@[^>]*> | |
1981 | User-Agent: Mercurial-patchbomb/.* |
|
1981 | User-Agent: Mercurial-patchbomb/.* | |
1982 | Date: Tue, 01 Jan 1980 00:01:04 +0000 |
|
1982 | Date: Tue, 01 Jan 1980 00:01:04 +0000 | |
1983 | From: test |
|
1983 | From: test | |
@@ -2002,9 +2002,9 test outgoing: | |||||
2002 | Content-Transfer-Encoding: 7bit |
|
2002 | Content-Transfer-Encoding: 7bit | |
2003 | Subject: [PATCH 5 of 8] Added tag zero, zero.foo for changeset 8580ff50825a |
|
2003 | Subject: [PATCH 5 of 8] Added tag zero, zero.foo for changeset 8580ff50825a | |
2004 | X-Mercurial-Node: dd9c2b4b8a8a0934d5523c15f2c119b362360903 |
|
2004 | X-Mercurial-Node: dd9c2b4b8a8a0934d5523c15f2c119b362360903 | |
2005 | Message-Id: <dd9c2b4b8a8a0934d552.315532865@.* |
|
2005 | Message-Id: <dd9c2b4b8a8a0934d552\.315532865@.* | |
2006 | In-Reply-To: <patchbomb.315532860@[^>]*> |
|
2006 | In-Reply-To: <patchbomb\.315532860@[^>]*> | |
2007 | References: <patchbomb.315532860@[^>]*> |
|
2007 | References: <patchbomb\.315532860@[^>]*> | |
2008 | User-Agent: Mercurial-patchbomb/.* |
|
2008 | User-Agent: Mercurial-patchbomb/.* | |
2009 | Date: Tue, 01 Jan 1980 00:01:05 +0000 |
|
2009 | Date: Tue, 01 Jan 1980 00:01:05 +0000 | |
2010 | From: test |
|
2010 | From: test | |
@@ -2030,9 +2030,9 test outgoing: | |||||
2030 | Content-Transfer-Encoding: 7bit |
|
2030 | Content-Transfer-Encoding: 7bit | |
2031 | Subject: [PATCH 6 of 8] Added tag one, one.patch for changeset 97d72e5f12c7 |
|
2031 | Subject: [PATCH 6 of 8] Added tag one, one.patch for changeset 97d72e5f12c7 | |
2032 | X-Mercurial-Node: eae5fcf795eee29d0e45ffc9f519a91cd79fc9ff |
|
2032 | X-Mercurial-Node: eae5fcf795eee29d0e45ffc9f519a91cd79fc9ff | |
2033 | Message-Id: <eae5fcf795eee29d0e45.315532866@.* |
|
2033 | Message-Id: <eae5fcf795eee29d0e45\.315532866@.* | |
2034 | In-Reply-To: <patchbomb.315532860@[^>]*> |
|
2034 | In-Reply-To: <patchbomb\.315532860@[^>]*> | |
2035 | References: <patchbomb.315532860@[^>]*> |
|
2035 | References: <patchbomb\.315532860@[^>]*> | |
2036 | User-Agent: Mercurial-patchbomb/.* |
|
2036 | User-Agent: Mercurial-patchbomb/.* | |
2037 | Date: Tue, 01 Jan 1980 00:01:06 +0000 |
|
2037 | Date: Tue, 01 Jan 1980 00:01:06 +0000 | |
2038 | From: test |
|
2038 | From: test | |
@@ -2060,9 +2060,9 test outgoing: | |||||
2060 | Content-Transfer-Encoding: 7bit |
|
2060 | Content-Transfer-Encoding: 7bit | |
2061 | Subject: [PATCH 7 of 8] Added tag two, two.diff for changeset ff2c9fa2018b |
|
2061 | Subject: [PATCH 7 of 8] Added tag two, two.diff for changeset ff2c9fa2018b | |
2062 | X-Mercurial-Node: e317db6a6f288748d1f6cb064f3810fcba66b1b6 |
|
2062 | X-Mercurial-Node: e317db6a6f288748d1f6cb064f3810fcba66b1b6 | |
2063 | Message-Id: <e317db6a6f288748d1f6.315532867@.* |
|
2063 | Message-Id: <e317db6a6f288748d1f6\.315532867@.* | |
2064 | In-Reply-To: <patchbomb.315532860@[^>]*> |
|
2064 | In-Reply-To: <patchbomb\.315532860@[^>]*> | |
2065 | References: <patchbomb.315532860@[^>]*> |
|
2065 | References: <patchbomb\.315532860@[^>]*> | |
2066 | User-Agent: Mercurial-patchbomb/.* |
|
2066 | User-Agent: Mercurial-patchbomb/.* | |
2067 | Date: Tue, 01 Jan 1980 00:01:07 +0000 |
|
2067 | Date: Tue, 01 Jan 1980 00:01:07 +0000 | |
2068 | From: test |
|
2068 | From: test | |
@@ -2091,9 +2091,9 test outgoing: | |||||
2091 | Content-Transfer-Encoding: 7bit |
|
2091 | Content-Transfer-Encoding: 7bit | |
2092 | Subject: [PATCH 8 of 8] d |
|
2092 | Subject: [PATCH 8 of 8] d | |
2093 | X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268 |
|
2093 | X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268 | |
2094 | Message-Id: <2f9fa9b998c5fe3ac2bd.315532868[^>]*> |
|
2094 | Message-Id: <2f9fa9b998c5fe3ac2bd\.315532868[^>]*> | |
2095 | In-Reply-To: <patchbomb.315532860@[^>]*> |
|
2095 | In-Reply-To: <patchbomb\.315532860@[^>]*> | |
2096 | References: <patchbomb.315532860@[^>]*> |
|
2096 | References: <patchbomb\.315532860@[^>]*> | |
2097 | User-Agent: Mercurial-patchbomb/.* |
|
2097 | User-Agent: Mercurial-patchbomb/.* | |
2098 | Date: Tue, 01 Jan 1980 00:01:08 +0000 |
|
2098 | Date: Tue, 01 Jan 1980 00:01:08 +0000 | |
2099 | From: test |
|
2099 | From: test | |
@@ -2129,7 +2129,7 dest#branch URIs: | |||||
2129 | Content-Transfer-Encoding: 7bit |
|
2129 | Content-Transfer-Encoding: 7bit | |
2130 | Subject: [PATCH] test |
|
2130 | Subject: [PATCH] test | |
2131 | X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268 |
|
2131 | X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268 | |
2132 | Message-Id: <2f9fa9b998c5fe3ac2bd.315532860@.* |
|
2132 | Message-Id: <2f9fa9b998c5fe3ac2bd\.315532860@.* | |
2133 | User-Agent: Mercurial-patchbomb/.* |
|
2133 | User-Agent: Mercurial-patchbomb/.* | |
2134 | Date: Tue, 01 Jan 1980 00:01:00 +0000 |
|
2134 | Date: Tue, 01 Jan 1980 00:01:00 +0000 | |
2135 | From: test |
|
2135 | From: test |
@@ -6,11 +6,11 | |||||
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 |
|
9 | comparing with .*/test-paths\.t/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 .*/test-paths.t/b |
|
14 | comparing with .*/test-paths\.t/b | |
15 | no changes found |
|
15 | no changes found | |
16 | [1] |
|
16 | [1] |
@@ -60,7 +60,7 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 |
|
63 | relinking .*/\.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%) |
@@ -28,5 +28,5 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 |
|
31 | abort: bad subrepository pattern in .*/test-subrepo-paths\.t/outer/\.hg/hgrc:2: invalid group reference | |
32 | [255] |
|
32 | [255] |
@@ -252,13 +252,13 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 |
|
255 | pulling subrepo foo from .*/test-subrepo-recursion\.t/repo/foo | |
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 |
|
261 | pulling subrepo foo/bar from .*/test-subrepo-recursion\.t/repo/foo/bar | |
262 | requesting all changes |
|
262 | requesting all changes | |
263 | adding changesets |
|
263 | adding changesets | |
264 | adding manifests |
|
264 | adding manifests | |
@@ -267,10 +267,10 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 |
|
270 | comparing with .*/test-subrepo-recursion\.t/repo | |
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 |
|
273 | comparing with .*/test-subrepo-recursion\.t/repo/foo | |
274 | searching for changes |
|
274 | searching for changes | |
275 | no changes found |
|
275 | no changes found | |
276 | [1] |
|
276 | [1] | |
@@ -290,7 +290,7 Make nested change: | |||||
290 | $ hg commit -m 3-4-2 |
|
290 | $ hg commit -m 3-4-2 | |
291 | committing subrepository foo |
|
291 | committing subrepository foo | |
292 | $ hg outgoing -S |
|
292 | $ hg outgoing -S | |
293 | comparing with .*/test-subrepo-recursion.t/repo |
|
293 | comparing with .*/test-subrepo-recursion\.t/repo | |
294 | searching for changes |
|
294 | searching for changes | |
295 | changeset: 3:2655b8ecc4ee |
|
295 | changeset: 3:2655b8ecc4ee | |
296 | tag: tip |
|
296 | tag: tip | |
@@ -298,7 +298,7 Make nested change: | |||||
298 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
298 | date: Thu Jan 01 00:00:00 1970 +0000 | |
299 | summary: 3-4-2 |
|
299 | summary: 3-4-2 | |
300 |
|
300 | |||
301 | comparing with .*/test-subrepo-recursion.t/repo/foo |
|
301 | comparing with .*/test-subrepo-recursion\.t/repo/foo | |
302 | searching for changes |
|
302 | searching for changes | |
303 | changeset: 4:e96193d6cb36 |
|
303 | changeset: 4:e96193d6cb36 | |
304 | tag: tip |
|
304 | tag: tip | |
@@ -316,7 +316,7 Switch to original repo and setup defaul | |||||
316 | Test incoming: |
|
316 | Test incoming: | |
317 |
|
317 | |||
318 | $ hg incoming -S |
|
318 | $ hg incoming -S | |
319 | comparing with .*/test-subrepo-recursion.t/repo2 |
|
319 | comparing with .*/test-subrepo-recursion\.t/repo2 | |
320 | searching for changes |
|
320 | searching for changes | |
321 | changeset: 3:2655b8ecc4ee |
|
321 | changeset: 3:2655b8ecc4ee | |
322 | tag: tip |
|
322 | tag: tip | |
@@ -324,7 +324,7 Test incoming: | |||||
324 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
324 | date: Thu Jan 01 00:00:00 1970 +0000 | |
325 | summary: 3-4-2 |
|
325 | summary: 3-4-2 | |
326 |
|
326 | |||
327 | comparing with .*/test-subrepo-recursion.t/repo2/foo |
|
327 | comparing with .*/test-subrepo-recursion\.t/repo2/foo | |
328 | searching for changes |
|
328 | searching for changes | |
329 | changeset: 4:e96193d6cb36 |
|
329 | changeset: 4:e96193d6cb36 | |
330 | tag: tip |
|
330 | tag: tip |
@@ -541,9 +541,9 test repository cloning | |||||
541 | $ cat mercurial2/main/nested_absolute/.hg/hgrc \ |
|
541 | $ cat mercurial2/main/nested_absolute/.hg/hgrc \ | |
542 | > mercurial2/main/nested_relative/.hg/hgrc |
|
542 | > mercurial2/main/nested_relative/.hg/hgrc | |
543 | [paths] |
|
543 | [paths] | |
544 | default = .*/test-subrepo.t/sub/mercurial/nested_absolute |
|
544 | default = .*/test-subrepo\.t/sub/mercurial/nested_absolute | |
545 | [paths] |
|
545 | [paths] | |
546 | default = .*/test-subrepo.t/sub/mercurial/nested_relative |
|
546 | default = .*/test-subrepo\.t/sub/mercurial/nested_relative | |
547 | $ rm -rf mercurial mercurial2 |
|
547 | $ rm -rf mercurial mercurial2 | |
548 |
|
548 | |||
549 | issue 1977 |
|
549 | issue 1977 |
@@ -216,7 +216,7 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 |
|
219 | abort: .*/\.\. 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