Show More
@@ -1432,6 +1432,7 class localrepository(object): | |||||
1432 | changed = [] |
|
1432 | changed = [] | |
1433 | removed = list(ctx.removed()) |
|
1433 | removed = list(ctx.removed()) | |
1434 | linkrev = len(self) |
|
1434 | linkrev = len(self) | |
|
1435 | self.ui.note(_("committing files:\n")) | |||
1435 | for f in sorted(ctx.modified() + ctx.added()): |
|
1436 | for f in sorted(ctx.modified() + ctx.added()): | |
1436 | self.ui.note(f + "\n") |
|
1437 | self.ui.note(f + "\n") | |
1437 | try: |
|
1438 | try: | |
@@ -1453,6 +1454,7 class localrepository(object): | |||||
1453 | raise |
|
1454 | raise | |
1454 |
|
1455 | |||
1455 | # update manifest |
|
1456 | # update manifest | |
|
1457 | self.ui.note(_("committing manifest\n")) | |||
1456 | removed = [f for f in sorted(removed) if f in m1 or f in m2] |
|
1458 | removed = [f for f in sorted(removed) if f in m1 or f in m2] | |
1457 | drop = [f for f in removed if f in m] |
|
1459 | drop = [f for f in removed if f in m] | |
1458 | for f in drop: |
|
1460 | for f in drop: | |
@@ -1466,6 +1468,7 class localrepository(object): | |||||
1466 | files = [] |
|
1468 | files = [] | |
1467 |
|
1469 | |||
1468 | # update changelog |
|
1470 | # update changelog | |
|
1471 | self.ui.note(_("committing changelog\n")) | |||
1469 | self.changelog.delayupdate(tr) |
|
1472 | self.changelog.delayupdate(tr) | |
1470 | n = self.changelog.add(mn, files, ctx.description(), |
|
1473 | n = self.changelog.add(mn, files, ctx.description(), | |
1471 | trp, p1.node(), p2.node(), |
|
1474 | trp, p1.node(), p2.node(), |
@@ -6,8 +6,11 | |||||
6 | adding dir/bar |
|
6 | adding dir/bar | |
7 | adding foo |
|
7 | adding foo | |
8 | $ hg -v commit -m "add 1" |
|
8 | $ hg -v commit -m "add 1" | |
|
9 | committing files: | |||
9 | dir/bar |
|
10 | dir/bar | |
10 | foo |
|
11 | foo | |
|
12 | committing manifest | |||
|
13 | committing changelog | |||
11 | committed changeset 0:6f7f953567a2 |
|
14 | committed changeset 0:6f7f953567a2 | |
12 | $ cd dir/ |
|
15 | $ cd dir/ | |
13 | $ touch ../foo_2 bar_2 |
|
16 | $ touch ../foo_2 bar_2 | |
@@ -15,8 +18,11 | |||||
15 | adding dir/bar_2 |
|
18 | adding dir/bar_2 | |
16 | adding foo_2 |
|
19 | adding foo_2 | |
17 | $ hg -v commit -m "add 2" |
|
20 | $ hg -v commit -m "add 2" | |
|
21 | committing files: | |||
18 | dir/bar_2 |
|
22 | dir/bar_2 | |
19 | foo_2 |
|
23 | foo_2 | |
|
24 | committing manifest | |||
|
25 | committing changelog | |||
20 | committed changeset 1:e65414bf35c5 |
|
26 | committed changeset 1:e65414bf35c5 | |
21 | $ cd .. |
|
27 | $ cd .. | |
22 | $ hg forget foo |
|
28 | $ hg forget foo |
@@ -106,7 +106,10 No changes, just a different message: | |||||
106 | $ hg ci -v --amend -m 'no changes, new message' |
|
106 | $ hg ci -v --amend -m 'no changes, new message' | |
107 | amending changeset 74609c7f506e |
|
107 | amending changeset 74609c7f506e | |
108 | copying changeset 74609c7f506e to ad120869acf0 |
|
108 | copying changeset 74609c7f506e to ad120869acf0 | |
|
109 | committing files: | |||
109 | a |
|
110 | a | |
|
111 | committing manifest | |||
|
112 | committing changelog | |||
110 | stripping amended changeset 74609c7f506e |
|
113 | stripping amended changeset 74609c7f506e | |
111 | 1 changesets found |
|
114 | 1 changesets found | |
112 | uncompressed size of bundle content: |
|
115 | uncompressed size of bundle content: | |
@@ -190,7 +193,10 at first, test saving last-message.txt | |||||
190 | $ hg commit --amend -v -m "message given from command line" |
|
193 | $ hg commit --amend -v -m "message given from command line" | |
191 | amending changeset 5f357c7560ab |
|
194 | amending changeset 5f357c7560ab | |
192 | copying changeset 5f357c7560ab to ad120869acf0 |
|
195 | copying changeset 5f357c7560ab to ad120869acf0 | |
|
196 | committing files: | |||
193 | a |
|
197 | a | |
|
198 | committing manifest | |||
|
199 | committing changelog | |||
194 | running hook pretxncommit.test-saving-last-message: false |
|
200 | running hook pretxncommit.test-saving-last-message: false | |
195 | transaction abort! |
|
201 | transaction abort! | |
196 | rollback completed |
|
202 | rollback completed | |
@@ -212,7 +218,10 at first, test saving last-message.txt | |||||
212 | HG: user: foo |
|
218 | HG: user: foo | |
213 | HG: branch 'default' |
|
219 | HG: branch 'default' | |
214 | HG: changed a |
|
220 | HG: changed a | |
|
221 | committing files: | |||
215 | a |
|
222 | a | |
|
223 | committing manifest | |||
|
224 | committing changelog | |||
216 | running hook pretxncommit.test-saving-last-message: false |
|
225 | running hook pretxncommit.test-saving-last-message: false | |
217 | transaction abort! |
|
226 | transaction abort! | |
218 | rollback completed |
|
227 | rollback completed | |
@@ -241,7 +250,10 then, test editing custom commit message | |||||
241 | HG: user: foo |
|
250 | HG: user: foo | |
242 | HG: branch 'default' |
|
251 | HG: branch 'default' | |
243 | HG: changed a |
|
252 | HG: changed a | |
|
253 | committing files: | |||
244 | a |
|
254 | a | |
|
255 | committing manifest | |||
|
256 | committing changelog | |||
245 | stripping amended changeset 5f357c7560ab |
|
257 | stripping amended changeset 5f357c7560ab | |
246 | 1 changesets found |
|
258 | 1 changesets found | |
247 | uncompressed size of bundle content: |
|
259 | uncompressed size of bundle content: | |
@@ -266,7 +278,10 Same, but with changes in working dir (d | |||||
266 | $ echo a >> a |
|
278 | $ echo a >> a | |
267 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v |
|
279 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v | |
268 | amending changeset 7ab3bf440b54 |
|
280 | amending changeset 7ab3bf440b54 | |
|
281 | committing files: | |||
269 | a |
|
282 | a | |
|
283 | committing manifest | |||
|
284 | committing changelog | |||
270 | copying changeset a0ea9b1a4c8c to ad120869acf0 |
|
285 | copying changeset a0ea9b1a4c8c to ad120869acf0 | |
271 | another precious commit message |
|
286 | another precious commit message | |
272 |
|
287 | |||
@@ -277,7 +292,10 Same, but with changes in working dir (d | |||||
277 | HG: user: foo |
|
292 | HG: user: foo | |
278 | HG: branch 'default' |
|
293 | HG: branch 'default' | |
279 | HG: changed a |
|
294 | HG: changed a | |
|
295 | committing files: | |||
280 | a |
|
296 | a | |
|
297 | committing manifest | |||
|
298 | committing changelog | |||
281 | stripping intermediate changeset a0ea9b1a4c8c |
|
299 | stripping intermediate changeset a0ea9b1a4c8c | |
282 | stripping amended changeset 7ab3bf440b54 |
|
300 | stripping amended changeset 7ab3bf440b54 | |
283 | 2 changesets found |
|
301 | 2 changesets found |
@@ -50,7 +50,10 commit added file that has been deleted | |||||
50 | $ hg add |
|
50 | $ hg add | |
51 | adding dir/file (glob) |
|
51 | adding dir/file (glob) | |
52 | $ hg -v commit -m commit-9 dir |
|
52 | $ hg -v commit -m commit-9 dir | |
|
53 | committing files: | |||
53 | dir/file |
|
54 | dir/file | |
|
55 | committing manifest | |||
|
56 | committing changelog | |||
54 | committed changeset 2:d2a76177cb42 |
|
57 | committed changeset 2:d2a76177cb42 | |
55 |
|
58 | |||
56 | $ echo > dir.file |
|
59 | $ echo > dir.file | |
@@ -71,7 +74,10 commit added file that has been deleted | |||||
71 | abort: dir2: no match under directory! |
|
74 | abort: dir2: no match under directory! | |
72 | [255] |
|
75 | [255] | |
73 | $ hg -v commit -m commit-13 ../dir |
|
76 | $ hg -v commit -m commit-13 ../dir | |
|
77 | committing files: | |||
74 | dir/file |
|
78 | dir/file | |
|
79 | committing manifest | |||
|
80 | committing changelog | |||
75 | committed changeset 3:1cd62a2d8db5 |
|
81 | committed changeset 3:1cd62a2d8db5 | |
76 | $ cd .. |
|
82 | $ cd .. | |
77 |
|
83 | |||
@@ -92,7 +98,10 commit added file that has been deleted | |||||
92 | [255] |
|
98 | [255] | |
93 | $ echo >> dir/file |
|
99 | $ echo >> dir/file | |
94 | $ hg -v commit -m commit-17 dir/file |
|
100 | $ hg -v commit -m commit-17 dir/file | |
|
101 | committing files: | |||
95 | dir/file |
|
102 | dir/file | |
|
103 | committing manifest | |||
|
104 | committing changelog | |||
96 | committed changeset 4:49176991390e |
|
105 | committed changeset 4:49176991390e | |
97 |
|
106 | |||
98 | An empty date was interpreted as epoch origin |
|
107 | An empty date was interpreted as epoch origin |
@@ -52,6 +52,7 Convert while testing all possible outpu | |||||
52 | 5 init projA |
|
52 | 5 init projA | |
53 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@1 |
|
53 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@1 | |
54 | converting: 0/6 revisions (0.00%) |
|
54 | converting: 0/6 revisions (0.00%) | |
|
55 | committing changelog | |||
55 | 4 hello |
|
56 | 4 hello | |
56 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@2 |
|
57 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@2 | |
57 | converting: 1/6 revisions (16.67%) |
|
58 | converting: 1/6 revisions (16.67%) | |
@@ -59,10 +60,13 Convert while testing all possible outpu | |||||
59 | scanning paths: /trunk/\xc3\xa0 0/3 (0.00%) (esc) |
|
60 | scanning paths: /trunk/\xc3\xa0 0/3 (0.00%) (esc) | |
60 | scanning paths: /trunk/\xc3\xa0/e\xcc\x81 1/3 (33.33%) (esc) |
|
61 | scanning paths: /trunk/\xc3\xa0/e\xcc\x81 1/3 (33.33%) (esc) | |
61 | scanning paths: /trunk/\xc3\xa9 2/3 (66.67%) (esc) |
|
62 | scanning paths: /trunk/\xc3\xa9 2/3 (66.67%) (esc) | |
|
63 | committing files: | |||
62 | \xc3\xa0/e\xcc\x81 (esc) |
|
64 | \xc3\xa0/e\xcc\x81 (esc) | |
63 | getting files: \xc3\xa0/e\xcc\x81 1/2 (50.00%) (esc) |
|
65 | getting files: \xc3\xa0/e\xcc\x81 1/2 (50.00%) (esc) | |
64 | \xc3\xa9 (esc) |
|
66 | \xc3\xa9 (esc) | |
65 | getting files: \xc3\xa9 2/2 (100.00%) (esc) |
|
67 | getting files: \xc3\xa9 2/2 (100.00%) (esc) | |
|
68 | committing manifest | |||
|
69 | committing changelog | |||
66 | 3 copy files |
|
70 | 3 copy files | |
67 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@3 |
|
71 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@3 | |
68 | converting: 2/6 revisions (33.33%) |
|
72 | converting: 2/6 revisions (33.33%) | |
@@ -80,12 +84,15 Convert while testing all possible outpu | |||||
80 | mark /trunk/\xc3\xb9 came from \xc3\xa0:2 (esc) |
|
84 | mark /trunk/\xc3\xb9 came from \xc3\xa0:2 (esc) | |
81 | getting files: \xc3\xa0/e\xcc\x81 1/4 (25.00%) (esc) |
|
85 | getting files: \xc3\xa0/e\xcc\x81 1/4 (25.00%) (esc) | |
82 | getting files: \xc3\xa9 2/4 (50.00%) (esc) |
|
86 | getting files: \xc3\xa9 2/4 (50.00%) (esc) | |
|
87 | committing files: | |||
83 | \xc3\xa8 (esc) |
|
88 | \xc3\xa8 (esc) | |
84 | getting files: \xc3\xa8 3/4 (75.00%) (esc) |
|
89 | getting files: \xc3\xa8 3/4 (75.00%) (esc) | |
85 | \xc3\xa8: copy \xc3\xa9:6b67ccefd5ce6de77e7ead4f5292843a0255329f (esc) |
|
90 | \xc3\xa8: copy \xc3\xa9:6b67ccefd5ce6de77e7ead4f5292843a0255329f (esc) | |
86 | \xc3\xb9/e\xcc\x81 (esc) |
|
91 | \xc3\xb9/e\xcc\x81 (esc) | |
87 | getting files: \xc3\xb9/e\xcc\x81 4/4 (100.00%) (esc) |
|
92 | getting files: \xc3\xb9/e\xcc\x81 4/4 (100.00%) (esc) | |
88 | \xc3\xb9/e\xcc\x81: copy \xc3\xa0/e\xcc\x81:a9092a3d84a37b9993b5c73576f6de29b7ea50f6 (esc) |
|
93 | \xc3\xb9/e\xcc\x81: copy \xc3\xa0/e\xcc\x81:a9092a3d84a37b9993b5c73576f6de29b7ea50f6 (esc) | |
|
94 | committing manifest | |||
|
95 | committing changelog | |||
89 | 2 remove files |
|
96 | 2 remove files | |
90 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@4 |
|
97 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@4 | |
91 | converting: 3/6 revisions (50.00%) |
|
98 | converting: 3/6 revisions (50.00%) | |
@@ -99,22 +106,30 Convert while testing all possible outpu | |||||
99 | reparent to file://*/svn-repo/trunk (glob) |
|
106 | reparent to file://*/svn-repo/trunk (glob) | |
100 | getting files: \xc3\xa8 1/2 (50.00%) (esc) |
|
107 | getting files: \xc3\xa8 1/2 (50.00%) (esc) | |
101 | getting files: \xc3\xb9/e\xcc\x81 2/2 (100.00%) (esc) |
|
108 | getting files: \xc3\xb9/e\xcc\x81 2/2 (100.00%) (esc) | |
|
109 | committing files: | |||
|
110 | committing manifest | |||
|
111 | committing changelog | |||
102 | 1 branch to branch? |
|
112 | 1 branch to branch? | |
103 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5 |
|
113 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5 | |
104 | converting: 4/6 revisions (66.67%) |
|
114 | converting: 4/6 revisions (66.67%) | |
105 | reparent to file://*/svn-repo/branches/branch%C3%A9 (glob) |
|
115 | reparent to file://*/svn-repo/branches/branch%C3%A9 (glob) | |
106 | scanning paths: /branches/branch\xc3\xa9 0/1 (0.00%) (esc) |
|
116 | scanning paths: /branches/branch\xc3\xa9 0/1 (0.00%) (esc) | |
|
117 | committing changelog | |||
107 | 0 branch to branch?e |
|
118 | 0 branch to branch?e | |
108 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e@6 |
|
119 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e@6 | |
109 | converting: 5/6 revisions (83.33%) |
|
120 | converting: 5/6 revisions (83.33%) | |
110 | reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) |
|
121 | reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) | |
111 | scanning paths: /branches/branch\xc3\xa9e 0/1 (0.00%) (esc) |
|
122 | scanning paths: /branches/branch\xc3\xa9e 0/1 (0.00%) (esc) | |
|
123 | committing changelog | |||
112 | reparent to file://*/svn-repo (glob) |
|
124 | reparent to file://*/svn-repo (glob) | |
113 | reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) |
|
125 | reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) | |
114 | reparent to file://*/svn-repo (glob) |
|
126 | reparent to file://*/svn-repo (glob) | |
115 | reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) |
|
127 | reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) | |
116 | updating tags |
|
128 | updating tags | |
|
129 | committing files: | |||
117 | .hgtags |
|
130 | .hgtags | |
|
131 | committing manifest | |||
|
132 | committing changelog | |||
118 | run hg sink post-conversion action |
|
133 | run hg sink post-conversion action | |
119 | $ cd A-hg |
|
134 | $ cd A-hg | |
120 | $ hg up |
|
135 | $ hg up |
@@ -20,8 +20,11 | |||||
20 | commit: 1 copied |
|
20 | commit: 1 copied | |
21 | update: (current) |
|
21 | update: (current) | |
22 | $ hg --debug commit -m "2" |
|
22 | $ hg --debug commit -m "2" | |
|
23 | committing files: | |||
23 | b |
|
24 | b | |
24 | b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
|
25 | b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 | |
|
26 | committing manifest | |||
|
27 | committing changelog | |||
25 | committed changeset 1:93580a2c28a50a56f63526fb305067e6fbf739c4 |
|
28 | committed changeset 1:93580a2c28a50a56f63526fb305067e6fbf739c4 | |
26 |
|
29 | |||
27 | we should see two history entries |
|
30 | we should see two history entries |
@@ -159,7 +159,10 Graft out of order, skipping a merge and | |||||
159 | merging b and a to b |
|
159 | merging b and a to b | |
160 | my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 |
|
160 | my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 | |
161 | premerge successful |
|
161 | premerge successful | |
|
162 | committing files: | |||
162 | b |
|
163 | b | |
|
164 | committing manifest | |||
|
165 | committing changelog | |||
163 | grafting 5:97f8bfe72746 "5" |
|
166 | grafting 5:97f8bfe72746 "5" | |
164 | searching for copies back to rev 1 |
|
167 | searching for copies back to rev 1 | |
165 | resolving manifests |
|
168 | resolving manifests | |
@@ -169,7 +172,10 Graft out of order, skipping a merge and | |||||
169 | getting e |
|
172 | getting e | |
170 | updating: e 1/1 files (100.00%) |
|
173 | updating: e 1/1 files (100.00%) | |
171 | b: remote unchanged -> k |
|
174 | b: remote unchanged -> k | |
|
175 | committing files: | |||
172 | e |
|
176 | e | |
|
177 | committing manifest | |||
|
178 | committing changelog | |||
173 | grafting 4:9c233e8e184d "4" |
|
179 | grafting 4:9c233e8e184d "4" | |
174 | searching for copies back to rev 1 |
|
180 | searching for copies back to rev 1 | |
175 | resolving manifests |
|
181 | resolving manifests |
@@ -511,7 +511,10 make sure --traceback works | |||||
511 | Automatically installed hook |
|
511 | Automatically installed hook | |
512 | $ echo >> foo |
|
512 | $ echo >> foo | |
513 | $ hg ci --debug -d '0 0' -m 'change foo' |
|
513 | $ hg ci --debug -d '0 0' -m 'change foo' | |
|
514 | committing files: | |||
514 | foo |
|
515 | foo | |
|
516 | committing manifest | |||
|
517 | committing changelog | |||
515 | calling hook commit.auto: hgext_hookext.autohook |
|
518 | calling hook commit.auto: hgext_hookext.autohook | |
516 | Automatically installed hook |
|
519 | Automatically installed hook | |
517 | committed changeset 1:52998019f6252a2b893452765fcb0a47351a5708 |
|
520 | committed changeset 1:52998019f6252a2b893452765fcb0a47351a5708 |
@@ -411,11 +411,17 patches: import patch1 patch2; rollback | |||||
411 | $ hg --cwd b import -v ../patch1 ../patch2 |
|
411 | $ hg --cwd b import -v ../patch1 ../patch2 | |
412 | applying ../patch1 |
|
412 | applying ../patch1 | |
413 | patching file a |
|
413 | patching file a | |
|
414 | committing files: | |||
414 | a |
|
415 | a | |
|
416 | committing manifest | |||
|
417 | committing changelog | |||
415 | created 1d4bd90af0e4 |
|
418 | created 1d4bd90af0e4 | |
416 | applying ../patch2 |
|
419 | applying ../patch2 | |
417 | patching file a |
|
420 | patching file a | |
|
421 | committing files: | |||
418 | a |
|
422 | a | |
|
423 | committing manifest | |||
|
424 | committing changelog | |||
419 | created 6d019af21222 |
|
425 | created 6d019af21222 | |
420 | $ hg --cwd b rollback |
|
426 | $ hg --cwd b rollback | |
421 | repository tip rolled back to revision 0 (undo import) |
|
427 | repository tip rolled back to revision 0 (undo import) |
@@ -28,9 +28,12 http://mercurial.selenic.com/bts/issue11 | |||||
28 | $ hg ci -Am4 a |
|
28 | $ hg ci -Am4 a | |
29 |
|
29 | |||
30 | $ hg ci --debug --traceback -Am5 b |
|
30 | $ hg ci --debug --traceback -Am5 b | |
|
31 | committing files: | |||
31 | b |
|
32 | b | |
32 | b: searching for copy revision for a |
|
33 | b: searching for copy revision for a | |
33 | b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db |
|
34 | b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db | |
|
35 | committing manifest | |||
|
36 | committing changelog | |||
34 | committed changeset 5:732aafbecb501a198b3cc9323ad3899ff04ccf95 |
|
37 | committed changeset 5:732aafbecb501a198b3cc9323ad3899ff04ccf95 | |
35 |
|
38 | |||
36 | $ hg verify |
|
39 | $ hg verify |
@@ -135,8 +135,11 Interrupted commit should not change sta | |||||
135 | Commit with several checks |
|
135 | Commit with several checks | |
136 |
|
136 | |||
137 | $ hg --debug commit -mabsym -u 'User Name <user@example.com>' |
|
137 | $ hg --debug commit -mabsym -u 'User Name <user@example.com>' | |
|
138 | committing files: | |||
138 | a |
|
139 | a | |
139 | b |
|
140 | b | |
|
141 | committing manifest | |||
|
142 | committing changelog | |||
140 | overwriting a expanding keywords |
|
143 | overwriting a expanding keywords | |
141 | running hook commit.test: cp a hooktest |
|
144 | running hook commit.test: cp a hooktest | |
142 | committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 |
|
145 | committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 | |
@@ -475,7 +478,10 record added file alone | |||||
475 | new file mode 100644 |
|
478 | new file mode 100644 | |
476 | examine changes to 'r'? [Ynesfdaq?] y |
|
479 | examine changes to 'r'? [Ynesfdaq?] y | |
477 |
|
480 | |||
|
481 | committing files: | |||
478 | r |
|
482 | r | |
|
483 | committing manifest | |||
|
484 | committing changelog | |||
479 | committed changeset 3:82a2f715724d |
|
485 | committed changeset 3:82a2f715724d | |
480 | overwriting r expanding keywords |
|
486 | overwriting r expanding keywords | |
481 | - status call required for dirstate.normallookup() check |
|
487 | - status call required for dirstate.normallookup() check | |
@@ -500,7 +506,10 record added keyword ignored file | |||||
500 | new file mode 100644 |
|
506 | new file mode 100644 | |
501 | examine changes to 'i'? [Ynesfdaq?] y |
|
507 | examine changes to 'i'? [Ynesfdaq?] y | |
502 |
|
508 | |||
|
509 | committing files: | |||
503 | i |
|
510 | i | |
|
511 | committing manifest | |||
|
512 | committing changelog | |||
504 | committed changeset 3:9f40ceb5a072 |
|
513 | committed changeset 3:9f40ceb5a072 | |
505 | $ cat i |
|
514 | $ cat i | |
506 | $Id$ |
|
515 | $Id$ | |
@@ -585,8 +594,11 Copy and show added kwfiles | |||||
585 | Commit and show expansion in original and copy |
|
594 | Commit and show expansion in original and copy | |
586 |
|
595 | |||
587 | $ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>' |
|
596 | $ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>' | |
|
597 | committing files: | |||
588 | c |
|
598 | c | |
589 | c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
|
599 | c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 | |
|
600 | committing manifest | |||
|
601 | committing changelog | |||
590 | overwriting c expanding keywords |
|
602 | overwriting c expanding keywords | |
591 | committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d |
|
603 | committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d | |
592 | $ cat a c |
|
604 | $ cat a c | |
@@ -756,7 +768,10 Interrupted commit should not change sta | |||||
756 | Commit with multi-line message and custom expansion |
|
768 | Commit with multi-line message and custom expansion | |
757 |
|
769 | |||
758 | $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' |
|
770 | $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' | |
|
771 | committing files: | |||
759 | a |
|
772 | a | |
|
773 | committing manifest | |||
|
774 | committing changelog | |||
760 | overwriting a expanding keywords |
|
775 | overwriting a expanding keywords | |
761 | committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
|
776 | committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 | |
762 | $ rm log |
|
777 | $ rm log | |
@@ -798,6 +813,9 remove with status checks | |||||
798 | $ hg debugrebuildstate |
|
813 | $ hg debugrebuildstate | |
799 | $ hg remove a |
|
814 | $ hg remove a | |
800 | $ hg --debug commit -m rma |
|
815 | $ hg --debug commit -m rma | |
|
816 | committing files: | |||
|
817 | committing manifest | |||
|
818 | committing changelog | |||
801 | committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
|
819 | committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 | |
802 | $ hg status |
|
820 | $ hg status | |
803 | ? c |
|
821 | ? c | |
@@ -868,7 +886,10 Imported patch should not be rejected | |||||
868 | >>> text = re.sub(r'(Id.*)', r'\1 rejecttest', open('a').read()) |
|
886 | >>> text = re.sub(r'(Id.*)', r'\1 rejecttest', open('a').read()) | |
869 | >>> open('a', 'wb').write(text) |
|
887 | >>> open('a', 'wb').write(text) | |
870 | $ hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <user@example.com>' |
|
888 | $ hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <user@example.com>' | |
|
889 | committing files: | |||
871 | a |
|
890 | a | |
|
891 | committing manifest | |||
|
892 | committing changelog | |||
872 | overwriting a expanding keywords |
|
893 | overwriting a expanding keywords | |
873 | committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 |
|
894 | committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 | |
874 | $ hg export -o ../rejecttest.diff tip |
|
895 | $ hg export -o ../rejecttest.diff tip | |
@@ -908,8 +929,11 kwexpand x/a should abort | |||||
908 | [255] |
|
929 | [255] | |
909 | $ cd x |
|
930 | $ cd x | |
910 | $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' |
|
931 | $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' | |
|
932 | committing files: | |||
911 | x/a |
|
933 | x/a | |
912 | x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
|
934 | x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e | |
|
935 | committing manifest | |||
|
936 | committing changelog | |||
913 | overwriting x/a expanding keywords |
|
937 | overwriting x/a expanding keywords | |
914 | committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 |
|
938 | committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 | |
915 | $ cat a |
|
939 | $ cat a |
@@ -270,7 +270,10 should push b.patch | |||||
270 | applying c.patch |
|
270 | applying c.patch | |
271 | patching file c |
|
271 | patching file c | |
272 | adding c |
|
272 | adding c | |
|
273 | committing files: | |||
273 | c |
|
274 | c | |
|
275 | committing manifest | |||
|
276 | committing changelog | |||
274 | now at: c.patch |
|
277 | now at: c.patch | |
275 |
|
278 | |||
276 | guards in series file: +1 +2 -3 |
|
279 | guards in series file: +1 +2 -3 |
@@ -264,7 +264,10 test qpush --force and backup files | |||||
264 | applying p2 |
|
264 | applying p2 | |
265 | saving current version of a as a.orig |
|
265 | saving current version of a as a.orig | |
266 | patching file a |
|
266 | patching file a | |
|
267 | committing files: | |||
267 | a |
|
268 | a | |
|
269 | committing manifest | |||
|
270 | committing changelog | |||
268 | applying p3 |
|
271 | applying p3 | |
269 | saving current version of b as b.orig |
|
272 | saving current version of b as b.orig | |
270 | saving current version of d as d.orig |
|
273 | saving current version of d as d.orig | |
@@ -277,7 +280,10 test qpush --force and backup files | |||||
277 | file e already exists |
|
280 | file e already exists | |
278 | 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
|
281 | 1 out of 1 hunks FAILED -- saving rejects to file e.rej | |
279 | patch failed to apply |
|
282 | patch failed to apply | |
|
283 | committing files: | |||
280 | b |
|
284 | b | |
|
285 | committing manifest | |||
|
286 | committing changelog | |||
281 | patch failed, rejects left in working dir |
|
287 | patch failed, rejects left in working dir | |
282 | errors during apply, please fix and refresh p3 |
|
288 | errors during apply, please fix and refresh p3 | |
283 | [2] |
|
289 | [2] | |
@@ -302,7 +308,10 test qpush --force --no-backup | |||||
302 | $ hg qpush --force --no-backup --verbose |
|
308 | $ hg qpush --force --no-backup --verbose | |
303 | applying p2 |
|
309 | applying p2 | |
304 | patching file a |
|
310 | patching file a | |
|
311 | committing files: | |||
305 | a |
|
312 | a | |
|
313 | committing manifest | |||
|
314 | committing changelog | |||
306 | now at: p2 |
|
315 | now at: p2 | |
307 | $ test -f a.orig && echo 'error: backup with --no-backup' |
|
316 | $ test -f a.orig && echo 'error: backup with --no-backup' | |
308 | [1] |
|
317 | [1] | |
@@ -316,7 +325,10 test qgoto --force --no-backup | |||||
316 | $ hg qgoto --force --no-backup p2 --verbose |
|
325 | $ hg qgoto --force --no-backup p2 --verbose | |
317 | applying p2 |
|
326 | applying p2 | |
318 | patching file a |
|
327 | patching file a | |
|
328 | committing files: | |||
319 | a |
|
329 | a | |
|
330 | committing manifest | |||
|
331 | committing changelog | |||
320 | now at: p2 |
|
332 | now at: p2 | |
321 | $ test -f a.orig && echo 'error: backup with --no-backup' |
|
333 | $ test -f a.orig && echo 'error: backup with --no-backup' | |
322 | [1] |
|
334 | [1] |
@@ -47,7 +47,10 test updating a symlink | |||||
47 | $ hg qpush --debug |
|
47 | $ hg qpush --debug | |
48 | applying updatelink |
|
48 | applying updatelink | |
49 | patching file a |
|
49 | patching file a | |
|
50 | committing files: | |||
50 | a |
|
51 | a | |
|
52 | committing manifest | |||
|
53 | committing changelog | |||
51 | now at: updatelink |
|
54 | now at: updatelink | |
52 | $ "$TESTDIR/readlink.py" a |
|
55 | $ "$TESTDIR/readlink.py" a | |
53 | a -> c |
|
56 | a -> c |
@@ -1400,7 +1400,10 apply force, should discard changes in h | |||||
1400 | applying empty |
|
1400 | applying empty | |
1401 | saving current version of hello.txt as hello.txt.orig |
|
1401 | saving current version of hello.txt as hello.txt.orig | |
1402 | patching file hello.txt |
|
1402 | patching file hello.txt | |
|
1403 | committing files: | |||
1403 | hello.txt |
|
1404 | hello.txt | |
|
1405 | committing manifest | |||
|
1406 | committing changelog | |||
1404 | now at: empty |
|
1407 | now at: empty | |
1405 | $ hg st |
|
1408 | $ hg st | |
1406 | M bye.txt |
|
1409 | M bye.txt |
@@ -68,7 +68,10 import patch | |||||
68 | Hunk #1 succeeded at 43 (offset 34 lines). |
|
68 | Hunk #1 succeeded at 43 (offset 34 lines). | |
69 | Hunk #2 succeeded at 87 (offset 34 lines). |
|
69 | Hunk #2 succeeded at 87 (offset 34 lines). | |
70 | Hunk #3 succeeded at 109 (offset 34 lines). |
|
70 | Hunk #3 succeeded at 109 (offset 34 lines). | |
|
71 | committing files: | |||
71 | a |
|
72 | a | |
|
73 | committing manifest | |||
|
74 | committing changelog | |||
72 | created 189885cecb41 |
|
75 | created 189885cecb41 | |
73 |
|
76 | |||
74 | compare imported changes against reference file |
|
77 | compare imported changes against reference file |
@@ -245,7 +245,10 Check that the right ancestors is used w | |||||
245 | f1.txt: remote is newer -> g |
|
245 | f1.txt: remote is newer -> g | |
246 | getting f1.txt |
|
246 | getting f1.txt | |
247 | updating: f1.txt 1/1 files (100.00%) |
|
247 | updating: f1.txt 1/1 files (100.00%) | |
|
248 | committing files: | |||
248 | f1.txt |
|
249 | f1.txt | |
|
250 | committing manifest | |||
|
251 | committing changelog | |||
249 | rebased as 19c888675e13 |
|
252 | rebased as 19c888675e13 | |
250 | rebasing 10:2f2496ddf49d "merge" (tip) |
|
253 | rebasing 10:2f2496ddf49d "merge" (tip) | |
251 | rebasing: 10:2f2496ddf49d 6/6 changesets (100.00%) |
|
254 | rebasing: 10:2f2496ddf49d 6/6 changesets (100.00%) | |
@@ -261,7 +264,10 Check that the right ancestors is used w | |||||
261 | f1.txt: remote is newer -> g |
|
264 | f1.txt: remote is newer -> g | |
262 | getting f1.txt |
|
265 | getting f1.txt | |
263 | updating: f1.txt 1/1 files (100.00%) |
|
266 | updating: f1.txt 1/1 files (100.00%) | |
|
267 | committing files: | |||
264 | f1.txt |
|
268 | f1.txt | |
|
269 | committing manifest | |||
|
270 | committing changelog | |||
265 | rebased as 2a7f09cac94c |
|
271 | rebased as 2a7f09cac94c | |
266 | rebase merging completed |
|
272 | rebase merging completed | |
267 | update back to initial working directory parent |
|
273 | update back to initial working directory parent |
@@ -56,7 +56,10 already has one local mq patch | |||||
56 | getting r1 |
|
56 | getting r1 | |
57 | resolving manifests |
|
57 | resolving manifests | |
58 | getting p0 |
|
58 | getting p0 | |
|
59 | committing files: | |||
59 | p0 |
|
60 | p0 | |
|
61 | committing manifest | |||
|
62 | committing changelog | |||
60 | rebasing 3:148775c71080 "P1" (p1.patch qtip) |
|
63 | rebasing 3:148775c71080 "P1" (p1.patch qtip) | |
61 | resolving manifests |
|
64 | resolving manifests | |
62 | note: rebase of 3:148775c71080 created no changes to commit |
|
65 | note: rebase of 3:148775c71080 created no changes to commit |
@@ -291,7 +291,10 rebase of merge of ancestors | |||||
291 | end of auction |
|
291 | end of auction | |
292 |
|
292 | |||
293 | getting other |
|
293 | getting other | |
|
294 | committing files: | |||
294 | other |
|
295 | other | |
|
296 | committing manifest | |||
|
297 | committing changelog | |||
295 | rebase merging completed |
|
298 | rebase merging completed | |
296 | 1 changesets found |
|
299 | 1 changesets found | |
297 | uncompressed size of bundle content: |
|
300 | uncompressed size of bundle content: |
General Comments 0
You need to be logged in to leave comments.
Login now