Show More
@@ -5869,7 +5869,7 b' def summary(ui, repo, **opts):' | |||
|
5869 | 5869 | """summarize working directory state |
|
5870 | 5870 | |
|
5871 | 5871 | This generates a brief summary of the working directory state, |
|
5872 | including parents, branch, commit status, and available updates. | |
|
5872 | including parents, branch, commit status, phase and available updates. | |
|
5873 | 5873 | |
|
5874 | 5874 | With the --remote option, this will check the default paths for |
|
5875 | 5875 | incoming and outgoing changes. This can be time-consuming. |
@@ -5997,6 +5997,25 b' def summary(ui, repo, **opts):' | |||
|
5997 | 5997 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % |
|
5998 | 5998 | (new, len(bheads))) |
|
5999 | 5999 | |
|
6000 | t = [] | |
|
6001 | draft = len(repo.revs('draft()')) | |
|
6002 | if draft: | |
|
6003 | t.append(_('%d draft') % draft) | |
|
6004 | secret = len(repo.revs('secret()')) | |
|
6005 | if secret: | |
|
6006 | t.append(_('%d secret') % secret) | |
|
6007 | ||
|
6008 | if parents: | |
|
6009 | parentphase = max(p.phase() for p in parents) | |
|
6010 | else: | |
|
6011 | parentphase = phases.public | |
|
6012 | ||
|
6013 | if draft or secret: | |
|
6014 | ui.status(_('phases: %s (%s)\n') % (', '.join(t), | |
|
6015 | phases.phasenames[parentphase])) | |
|
6016 | else: | |
|
6017 | ui.note(_('phases: (%s)\n') % phases.phasenames[parentphase]) | |
|
6018 | ||
|
6000 | 6019 | cmdutil.summaryhooks(ui, repo) |
|
6001 | 6020 | |
|
6002 | 6021 | if opts.get('remote'): |
@@ -42,6 +42,7 b' specified explicitly)' | |||
|
42 | 42 | branch: default |
|
43 | 43 | commit: (clean) |
|
44 | 44 | update: (current) |
|
45 | phases: 3 draft (draft) | |
|
45 | 46 | |
|
46 | 47 | commit option |
|
47 | 48 | |
@@ -69,6 +70,7 b' commit option' | |||
|
69 | 70 | branch: default |
|
70 | 71 | commit: (clean) |
|
71 | 72 | update: (current) |
|
73 | phases: 4 draft (draft) | |
|
72 | 74 | |
|
73 | 75 | $ echo ypples > a |
|
74 | 76 | $ hg commit -d '5 0' -m ypples |
@@ -83,6 +85,7 b' commit option' | |||
|
83 | 85 | branch: default |
|
84 | 86 | commit: 1 unresolved (clean) |
|
85 | 87 | update: (current) |
|
88 | phases: 5 draft (draft) | |
|
86 | 89 | |
|
87 | 90 | file that was removed is recreated |
|
88 | 91 | (this also tests that editor is not invoked if the commit message is |
@@ -110,6 +113,7 b' specified explicitly)' | |||
|
110 | 113 | branch: default |
|
111 | 114 | commit: (clean) |
|
112 | 115 | update: (current) |
|
116 | phases: 3 draft (draft) | |
|
113 | 117 | |
|
114 | 118 | backout of backout is as if nothing happened |
|
115 | 119 | |
@@ -124,6 +128,7 b' backout of backout is as if nothing happ' | |||
|
124 | 128 | branch: default |
|
125 | 129 | commit: (clean) |
|
126 | 130 | update: (current) |
|
131 | phases: 4 draft (draft) | |
|
127 | 132 | |
|
128 | 133 | across branch |
|
129 | 134 | |
@@ -144,6 +149,7 b' across branch' | |||
|
144 | 149 | branch: default |
|
145 | 150 | commit: (clean) |
|
146 | 151 | update: 1 new changesets (update) |
|
152 | phases: 2 draft (draft) | |
|
147 | 153 | |
|
148 | 154 | should fail |
|
149 | 155 | |
@@ -160,6 +166,7 b' should fail' | |||
|
160 | 166 | branch: default |
|
161 | 167 | commit: (clean) |
|
162 | 168 | update: 1 new changesets, 2 branch heads (merge) |
|
169 | phases: 3 draft (draft) | |
|
163 | 170 | |
|
164 | 171 | should fail |
|
165 | 172 | |
@@ -172,6 +179,7 b' should fail' | |||
|
172 | 179 | branch: default |
|
173 | 180 | commit: (clean) |
|
174 | 181 | update: 1 new changesets, 2 branch heads (merge) |
|
182 | phases: 3 draft (draft) | |
|
175 | 183 | |
|
176 | 184 | backout with merge |
|
177 | 185 | |
@@ -189,6 +197,7 b' backout with merge' | |||
|
189 | 197 | branch: default |
|
190 | 198 | commit: (clean) |
|
191 | 199 | update: (current) |
|
200 | phases: 1 draft (draft) | |
|
192 | 201 | |
|
193 | 202 | remove line 1 |
|
194 | 203 | |
@@ -213,6 +222,7 b' remove line 1' | |||
|
213 | 222 | branch: default |
|
214 | 223 | commit: (clean) |
|
215 | 224 | update: (current) |
|
225 | phases: 5 draft (draft) | |
|
216 | 226 | |
|
217 | 227 | check line 1 is back |
|
218 | 228 | |
@@ -241,6 +251,7 b' backout should not back out subsequent c' | |||
|
241 | 251 | branch: default |
|
242 | 252 | commit: (clean) |
|
243 | 253 | update: (current) |
|
254 | phases: 3 draft (draft) | |
|
244 | 255 | |
|
245 | 256 | without --merge |
|
246 | 257 | $ hg backout -d '3 0' 1 --tool=true |
@@ -258,6 +269,7 b' without --merge' | |||
|
258 | 269 | branch: default |
|
259 | 270 | commit: (clean) |
|
260 | 271 | update: (current) |
|
272 | phases: 3 draft (draft) | |
|
261 | 273 | |
|
262 | 274 | with --merge |
|
263 | 275 | $ hg backout --merge -d '3 0' 1 --tool=true |
@@ -302,6 +314,7 b' with --merge' | |||
|
302 | 314 | branch: default |
|
303 | 315 | commit: (clean) |
|
304 | 316 | update: (current) |
|
317 | phases: 5 draft (draft) | |
|
305 | 318 | |
|
306 | 319 | backout of merge should fail |
|
307 | 320 | |
@@ -332,6 +345,7 b' backout with valid parent should be ok' | |||
|
332 | 345 | branch: default |
|
333 | 346 | commit: (clean) |
|
334 | 347 | update: (current) |
|
348 | phases: 6 draft (draft) | |
|
335 | 349 | |
|
336 | 350 | $ hg rollback |
|
337 | 351 | repository tip rolled back to revision 4 (undo commit) |
@@ -344,6 +358,7 b' backout with valid parent should be ok' | |||
|
344 | 358 | branch: default |
|
345 | 359 | commit: (clean) |
|
346 | 360 | update: (current) |
|
361 | phases: 5 draft (draft) | |
|
347 | 362 | |
|
348 | 363 | $ hg backout -d '6 0' --parent 3 4 --tool=true |
|
349 | 364 | removing c |
@@ -354,6 +369,7 b' backout with valid parent should be ok' | |||
|
354 | 369 | branch: default |
|
355 | 370 | commit: (clean) |
|
356 | 371 | update: (current) |
|
372 | phases: 6 draft (draft) | |
|
357 | 373 | |
|
358 | 374 | $ cd .. |
|
359 | 375 | |
@@ -394,6 +410,7 b' without --merge' | |||
|
394 | 410 | branch: branch2 |
|
395 | 411 | commit: 1 removed |
|
396 | 412 | update: (current) |
|
413 | phases: 3 draft (draft) | |
|
397 | 414 | |
|
398 | 415 | with --merge |
|
399 | 416 | (this also tests that editor is invoked if '--edit' is specified |
@@ -424,6 +441,7 b" explicitly regardless of '--message')" | |||
|
424 | 441 | branch: branch2 |
|
425 | 442 | commit: 1 removed (merge) |
|
426 | 443 | update: (current) |
|
444 | phases: 4 draft (draft) | |
|
427 | 445 | $ hg update -q -C 2 |
|
428 | 446 | |
|
429 | 447 | on branch2 with branch1 not merged, so file1 should still exist: |
@@ -440,6 +458,7 b' on branch2 with branch1 not merged, so f' | |||
|
440 | 458 | branch: branch2 |
|
441 | 459 | commit: (clean) |
|
442 | 460 | update: 1 new changesets, 2 branch heads (merge) |
|
461 | phases: 4 draft (draft) | |
|
443 | 462 | |
|
444 | 463 | on branch2 with branch1 merged, so file1 should be gone: |
|
445 | 464 | |
@@ -458,6 +477,7 b' on branch2 with branch1 merged, so file1' | |||
|
458 | 477 | branch: branch2 |
|
459 | 478 | commit: (clean) |
|
460 | 479 | update: (current) |
|
480 | phases: 5 draft (draft) | |
|
461 | 481 | |
|
462 | 482 | on branch1, so no file1 and file2: |
|
463 | 483 | |
@@ -474,6 +494,7 b' on branch1, so no file1 and file2:' | |||
|
474 | 494 | branch: branch1 |
|
475 | 495 | commit: (clean) |
|
476 | 496 | update: (current) |
|
497 | phases: 5 draft (draft) | |
|
477 | 498 | |
|
478 | 499 | $ cd .. |
|
479 | 500 | |
@@ -553,6 +574,7 b' Test usage of `hg resolve` in case of co' | |||
|
553 | 574 | branch: default |
|
554 | 575 | commit: 1 unresolved (clean) |
|
555 | 576 | update: (current) |
|
577 | phases: 3 draft (draft) | |
|
556 | 578 | $ hg resolve --all --debug |
|
557 | 579 | picked tool 'internal:merge' for foo (binary False symlink False) |
|
558 | 580 | merging foo |
@@ -570,6 +592,7 b' Test usage of `hg resolve` in case of co' | |||
|
570 | 592 | branch: default |
|
571 | 593 | commit: 1 modified, 1 unknown |
|
572 | 594 | update: (current) |
|
595 | phases: 3 draft (draft) | |
|
573 | 596 | $ cat foo |
|
574 | 597 | one |
|
575 | 598 | two |
@@ -190,6 +190,7 b' bisect test' | |||
|
190 | 190 | branch: default |
|
191 | 191 | commit: (clean) |
|
192 | 192 | update: (current) |
|
193 | phases: 32 draft (draft) | |
|
193 | 194 | $ hg bisect -g 1 |
|
194 | 195 | Testing changeset 16:a2e6ea4973e9 (30 changesets remaining, ~4 tests) |
|
195 | 196 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -393,6 +393,7 b' test summary' | |||
|
393 | 393 | bookmarks: *Z Y x y |
|
394 | 394 | commit: (clean) |
|
395 | 395 | update: 1 new changesets, 2 branch heads (merge) |
|
396 | phases: 3 draft (draft) | |
|
396 | 397 | |
|
397 | 398 | test id |
|
398 | 399 | |
@@ -538,6 +539,7 b" update to current bookmark if it's not t" | |||
|
538 | 539 | bookmarks: *Z Y x y |
|
539 | 540 | commit: 1 added, 1 unknown (new branch head) |
|
540 | 541 | update: 2 new changesets (update) |
|
542 | phases: 5 draft (draft) | |
|
541 | 543 | $ hg update |
|
542 | 544 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
543 | 545 | updating bookmark Z |
@@ -72,6 +72,7 b' Check proper abort for empty message' | |||
|
72 | 72 | branch: default |
|
73 | 73 | commit: 1 added, 1 unknown |
|
74 | 74 | update: (current) |
|
75 | phases: 2 draft (draft) | |
|
75 | 76 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend |
|
76 | 77 | transaction abort! |
|
77 | 78 | rollback completed |
@@ -83,6 +84,7 b' Check proper abort for empty message' | |||
|
83 | 84 | branch: default |
|
84 | 85 | commit: 1 added, 1 unknown |
|
85 | 86 | update: (current) |
|
87 | phases: 2 draft (draft) | |
|
86 | 88 | |
|
87 | 89 | Add new file: |
|
88 | 90 | $ hg ci --amend -m 'amend base1 new file' |
@@ -81,6 +81,7 b' Summary shows we updated to the new cset' | |||
|
81 | 81 | branch: default |
|
82 | 82 | commit: (clean) |
|
83 | 83 | update: (current) |
|
84 | phases: 1 draft (draft) | |
|
84 | 85 | |
|
85 | 86 | Rename empty file |
|
86 | 87 |
@@ -19,6 +19,7 b'' | |||
|
19 | 19 | branch: default |
|
20 | 20 | commit: 1 copied |
|
21 | 21 | update: (current) |
|
22 | phases: 1 draft (draft) | |
|
22 | 23 | $ hg --debug commit -m "2" |
|
23 | 24 | committing files: |
|
24 | 25 | b |
@@ -246,6 +246,7 b' check histedit_source' | |||
|
246 | 246 | branch: default |
|
247 | 247 | commit: 1 added (new branch head) |
|
248 | 248 | update: 1 new changesets (update) |
|
249 | phases: 7 draft (draft) | |
|
249 | 250 | hist: 1 remaining (histedit --continue) |
|
250 | 251 | |
|
251 | 252 | (test also that editor is invoked if histedit is continued for |
@@ -183,6 +183,7 b' abort editing session, after first forci' | |||
|
183 | 183 | branch: default |
|
184 | 184 | commit: 1 added, 1 unknown (new branch head) |
|
185 | 185 | update: 6 new changesets (update) |
|
186 | phases: 7 draft (draft) | |
|
186 | 187 | hist: 2 remaining (histedit --continue) |
|
187 | 188 | |
|
188 | 189 | $ hg histedit --abort 2>&1 | fixbundle |
@@ -990,6 +990,7 b' Issue2102: hg export and hg import speak' | |||
|
990 | 990 | branch: default |
|
991 | 991 | commit: (clean) |
|
992 | 992 | update: (current) |
|
993 | phases: 2 draft (draft) | |
|
993 | 994 | |
|
994 | 995 | $ hg diff --git -c tip |
|
995 | 996 | diff --git a/lib/place-holder b/lib/place-holder |
@@ -228,6 +228,7 b' verify that large files in subrepos hand' | |||
|
228 | 228 | branch: default |
|
229 | 229 | commit: 1 subrepos |
|
230 | 230 | update: (current) |
|
231 | phases: 2 draft (draft) | |
|
231 | 232 | $ hg st |
|
232 | 233 | $ hg st -S |
|
233 | 234 | A subrepo/large.txt |
@@ -245,6 +246,7 b' verify that large files in subrepos hand' | |||
|
245 | 246 | branch: default |
|
246 | 247 | commit: (clean) |
|
247 | 248 | update: (current) |
|
249 | phases: 3 draft (draft) | |
|
248 | 250 | $ echo "rev 2" > subrepo/large.txt |
|
249 | 251 | $ hg st -S |
|
250 | 252 | M subrepo/large.txt |
@@ -254,6 +256,7 b' verify that large files in subrepos hand' | |||
|
254 | 256 | branch: default |
|
255 | 257 | commit: 1 subrepos |
|
256 | 258 | update: (current) |
|
259 | phases: 3 draft (draft) | |
|
257 | 260 | $ hg ci -m "this commit should fail without -S" |
|
258 | 261 | abort: uncommitted changes in subrepository 'subrepo' |
|
259 | 262 | (use --subrepos for recursive commit) |
@@ -567,6 +570,7 b" because it can't be reproduced easily." | |||
|
567 | 570 | branch: default |
|
568 | 571 | commit: (clean) |
|
569 | 572 | update: (current) |
|
573 | phases: 1 draft (draft) | |
|
570 | 574 | largefiles: (no remote repo) |
|
571 | 575 | |
|
572 | 576 | check messages when there is no files to upload: |
@@ -581,6 +585,7 b' check messages when there is no files to' | |||
|
581 | 585 | branch: default |
|
582 | 586 | commit: (clean) |
|
583 | 587 | update: (current) |
|
588 | phases: 1 draft (draft) | |
|
584 | 589 | largefiles: (no files to upload) |
|
585 | 590 | $ hg -R clone2 outgoing --large |
|
586 | 591 | comparing with $TESTTMP/issue3651/src (glob) |
@@ -608,6 +613,7 b' check messages when there are files to u' | |||
|
608 | 613 | branch: default |
|
609 | 614 | commit: (clean) |
|
610 | 615 | update: (current) |
|
616 | phases: 2 draft (draft) | |
|
611 | 617 | largefiles: 1 entities for 1 files to upload |
|
612 | 618 | $ hg -R clone2 outgoing --large |
|
613 | 619 | comparing with $TESTTMP/issue3651/src (glob) |
@@ -643,6 +649,7 b' check messages when there are files to u' | |||
|
643 | 649 | branch: default |
|
644 | 650 | commit: (clean) |
|
645 | 651 | update: (current) |
|
652 | phases: 3 draft (draft) | |
|
646 | 653 | largefiles: 1 entities for 3 files to upload |
|
647 | 654 | $ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n" |
|
648 | 655 | comparing with $TESTTMP/issue3651/src (glob) |
@@ -692,6 +699,7 b' check messages when there are files to u' | |||
|
692 | 699 | branch: default |
|
693 | 700 | commit: (clean) |
|
694 | 701 | update: (current) |
|
702 | phases: 6 draft (draft) | |
|
695 | 703 | largefiles: 3 entities for 3 files to upload |
|
696 | 704 | $ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n" |
|
697 | 705 | comparing with $TESTTMP/issue3651/src (glob) |
@@ -750,6 +758,7 b' and #5 refer it.' | |||
|
750 | 758 | branch: default |
|
751 | 759 | commit: (clean) |
|
752 | 760 | update: (current) |
|
761 | phases: 6 draft (draft) | |
|
753 | 762 | largefiles: 2 entities for 1 files to upload |
|
754 | 763 | $ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n" |
|
755 | 764 | comparing with $TESTTMP/issue3651/src (glob) |
@@ -67,6 +67,7 b' Test status and dirstate of largefiles a' | |||
|
67 | 67 | branch: default |
|
68 | 68 | commit: (clean) |
|
69 | 69 | update: (current) |
|
70 | phases: 2 draft (draft) | |
|
70 | 71 | largefiles: (no remote repo) |
|
71 | 72 | |
|
72 | 73 | Commit preserved largefile contents. |
@@ -999,6 +1000,7 b' Test cloning with --all-largefiles flag' | |||
|
999 | 1000 | branch: default |
|
1000 | 1001 | commit: (clean) |
|
1001 | 1002 | update: 7 new changesets (update) |
|
1003 | phases: 8 draft (draft) | |
|
1002 | 1004 | |
|
1003 | 1005 | $ rm "${USERCACHE}"/* |
|
1004 | 1006 | $ hg clone --all-largefiles -u 1 a a-clone1 |
@@ -1021,6 +1023,7 b' Test cloning with --all-largefiles flag' | |||
|
1021 | 1023 | branch: default |
|
1022 | 1024 | commit: (clean) |
|
1023 | 1025 | update: 6 new changesets (update) |
|
1026 | phases: 8 draft (draft) | |
|
1024 | 1027 | |
|
1025 | 1028 | $ rm "${USERCACHE}"/* |
|
1026 | 1029 | $ hg clone --all-largefiles -U a a-clone-u |
@@ -1030,6 +1033,7 b' Test cloning with --all-largefiles flag' | |||
|
1030 | 1033 | branch: default |
|
1031 | 1034 | commit: (clean) |
|
1032 | 1035 | update: 8 new changesets (update) |
|
1036 | phases: 8 draft (public) | |
|
1033 | 1037 | |
|
1034 | 1038 | Show computed destination directory: |
|
1035 | 1039 |
@@ -40,6 +40,7 b' Test interrupted updates by exploiting o' | |||
|
40 | 40 | branch: default |
|
41 | 41 | commit: (interrupted update) |
|
42 | 42 | update: 1 new changesets (update) |
|
43 | phases: 2 draft (draft) | |
|
43 | 44 | $ rmdir b |
|
44 | 45 | $ hg up |
|
45 | 46 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -49,6 +50,7 b' Test interrupted updates by exploiting o' | |||
|
49 | 50 | branch: default |
|
50 | 51 | commit: (clean) |
|
51 | 52 | update: (current) |
|
53 | phases: 2 draft (draft) | |
|
52 | 54 | |
|
53 | 55 | Prepare a basic merge |
|
54 | 56 |
@@ -164,6 +164,7 b' check that summary does not report them' | |||
|
164 | 164 | branch: default |
|
165 | 165 | commit: (clean) |
|
166 | 166 | update: (current) |
|
167 | phases: 3 draft (draft) | |
|
167 | 168 | remote: 3 outgoing |
|
168 | 169 | |
|
169 | 170 | $ hg summary --remote --hidden |
@@ -172,6 +173,7 b' check that summary does not report them' | |||
|
172 | 173 | branch: default |
|
173 | 174 | commit: (clean) |
|
174 | 175 | update: 3 new changesets, 4 branch heads (merge) |
|
176 | phases: 6 draft (draft) | |
|
175 | 177 | remote: 3 outgoing |
|
176 | 178 | |
|
177 | 179 | check that various commands work well with filtering |
@@ -242,6 +242,25 b' Test secret changeset are not cloned' | |||
|
242 | 242 | 1 0 B |
|
243 | 243 | 0 0 A |
|
244 | 244 | |
|
245 | Test summary | |
|
246 | ||
|
247 | $ hg summary -R clone-dest --verbose | |
|
248 | parent: -1:000000000000 (no revision checked out) | |
|
249 | branch: default | |
|
250 | commit: (clean) | |
|
251 | update: 5 new changesets (update) | |
|
252 | phases: (public) | |
|
253 | $ hg summary -R initialrepo | |
|
254 | parent: 7:17a481b3bccb tip | |
|
255 | merge B' and E | |
|
256 | branch: default | |
|
257 | commit: (clean) | |
|
258 | update: 1 new changesets, 2 branch heads (merge) | |
|
259 | phases: 3 draft, 3 secret (secret) | |
|
260 | $ hg summary -R initialrepo --quiet | |
|
261 | parent: 7:17a481b3bccb tip | |
|
262 | update: 1 new changesets, 2 branch heads (merge) | |
|
263 | ||
|
245 | 264 | Test revset |
|
246 | 265 | |
|
247 | 266 | $ cd initialrepo |
@@ -321,3 +321,4 b' during a rebase (issue4661)' | |||
|
321 | 321 | branch: default |
|
322 | 322 | commit: (clean) |
|
323 | 323 | update: 1 new changesets, 2 branch heads (merge) |
|
324 | phases: 4 draft (draft) |
@@ -476,6 +476,7 b' Test --tool parameter:' | |||
|
476 | 476 | branch: default |
|
477 | 477 | commit: 1 modified, 1 unresolved (merge) |
|
478 | 478 | update: (current) |
|
479 | phases: 3 draft (draft) | |
|
479 | 480 | rebase: 0 rebased, 1 remaining (rebase --continue) |
|
480 | 481 | |
|
481 | 482 | $ hg resolve -l |
@@ -20,6 +20,7 b' rename a single file' | |||
|
20 | 20 | branch: default |
|
21 | 21 | commit: 1 renamed |
|
22 | 22 | update: (current) |
|
23 | phases: 1 draft (draft) | |
|
23 | 24 | $ hg status -C |
|
24 | 25 | A d2/c |
|
25 | 26 | d1/d11/a1 |
@@ -360,6 +360,7 b' merge it with the other head' | |||
|
360 | 360 | branch: default |
|
361 | 361 | commit: 2 modified, 1 removed (merge) |
|
362 | 362 | update: (current) |
|
363 | phases: 3 draft (draft) | |
|
363 | 364 | |
|
364 | 365 | clarifies who added what |
|
365 | 366 |
@@ -782,6 +782,7 b' is a no-op), works (issue4398)' | |||
|
782 | 782 | bookmarks: *test |
|
783 | 783 | commit: 2 unknown (clean) |
|
784 | 784 | update: (current) |
|
785 | phases: 5 draft (draft) | |
|
785 | 786 | |
|
786 | 787 | $ hg shelve --delete --stat |
|
787 | 788 | abort: options '--delete' and '--stat' may not be used together |
@@ -526,6 +526,7 b' Verify strip protects against stripping ' | |||
|
526 | 526 | branch: default |
|
527 | 527 | commit: 1 modified, 1 unknown, 1 unresolved |
|
528 | 528 | update: (current) |
|
529 | phases: 2 draft (draft) | |
|
529 | 530 | mq: 3 unapplied |
|
530 | 531 | |
|
531 | 532 | $ echo c > b |
@@ -553,6 +554,7 b' Verify strip protects against stripping ' | |||
|
553 | 554 | branch: default |
|
554 | 555 | commit: 1 modified, 1 unknown |
|
555 | 556 | update: (current) |
|
557 | phases: 1 draft (draft) | |
|
556 | 558 | mq: 3 unapplied |
|
557 | 559 | |
|
558 | 560 | Strip adds, removes, modifies with --keep |
@@ -72,6 +72,7 b' make sure we avoid empty commits (issue2' | |||
|
72 | 72 | branch: default |
|
73 | 73 | commit: (clean) |
|
74 | 74 | update: (current) |
|
75 | phases: 2 draft (draft) | |
|
75 | 76 | $ hg ci -moops |
|
76 | 77 | nothing changed |
|
77 | 78 | [1] |
@@ -96,6 +97,7 b' change file in svn and hg, commit' | |||
|
96 | 97 | branch: default |
|
97 | 98 | commit: 1 modified, 1 subrepos |
|
98 | 99 | update: (current) |
|
100 | phases: 2 draft (draft) | |
|
99 | 101 | $ hg commit --subrepos -m 'Message!' | grep -v Updating |
|
100 | 102 | committing subrepository s |
|
101 | 103 | Sending*s/alpha (glob) |
@@ -136,6 +138,7 b' bringing any changes.' | |||
|
136 | 138 | branch: default |
|
137 | 139 | commit: (clean) |
|
138 | 140 | update: (current) |
|
141 | phases: 3 draft (draft) | |
|
139 | 142 | |
|
140 | 143 | $ echo a > s/a |
|
141 | 144 |
@@ -38,6 +38,7 b' Issue2232: committing a subrepo without ' | |||
|
38 | 38 | branch: default |
|
39 | 39 | commit: 1 added, 1 subrepos |
|
40 | 40 | update: (current) |
|
41 | phases: 1 draft (draft) | |
|
41 | 42 | $ hg ci -m1 |
|
42 | 43 | |
|
43 | 44 | test handling .hgsubstate "added" explicitly. |
@@ -83,6 +84,7 b' Issue2022: update -C' | |||
|
83 | 84 | branch: default |
|
84 | 85 | commit: 1 subrepos |
|
85 | 86 | update: (current) |
|
87 | phases: 2 draft (draft) | |
|
86 | 88 | $ hg co -C 1 |
|
87 | 89 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
88 | 90 | $ hg sum |
@@ -91,6 +93,7 b' Issue2022: update -C' | |||
|
91 | 93 | branch: default |
|
92 | 94 | commit: (clean) |
|
93 | 95 | update: (current) |
|
96 | phases: 2 draft (draft) | |
|
94 | 97 | |
|
95 | 98 | commands that require a clean repo should respect subrepos |
|
96 | 99 | |
@@ -113,6 +116,7 b' add sub sub' | |||
|
113 | 116 | branch: default |
|
114 | 117 | commit: 1 subrepos |
|
115 | 118 | update: (current) |
|
119 | phases: 2 draft (draft) | |
|
116 | 120 | $ hg ci -m2 |
|
117 | 121 | committing subrepository s |
|
118 | 122 | committing subrepository s/ss (glob) |
@@ -122,6 +126,7 b' add sub sub' | |||
|
122 | 126 | branch: default |
|
123 | 127 | commit: (clean) |
|
124 | 128 | update: (current) |
|
129 | phases: 3 draft (draft) | |
|
125 | 130 | |
|
126 | 131 | test handling .hgsubstate "modified" explicitly. |
|
127 | 132 |
@@ -101,6 +101,7 b' Changing original repo:' | |||
|
101 | 101 | branch: default |
|
102 | 102 | commit: (clean) |
|
103 | 103 | update: (current) |
|
104 | phases: 4 draft (draft) | |
|
104 | 105 | remote: 2 outgoing |
|
105 | 106 | $ hg -q outgoing '../clone#foo' |
|
106 | 107 | 2:faba9097cad4 |
@@ -110,6 +111,7 b' Changing original repo:' | |||
|
110 | 111 | branch: default |
|
111 | 112 | commit: (clean) |
|
112 | 113 | update: (current) |
|
114 | phases: 4 draft (draft) | |
|
113 | 115 | remote: 1 outgoing |
|
114 | 116 | |
|
115 | 117 | $ hg -q --cwd ../clone incoming '../repo#foo' |
@@ -282,6 +284,7 b' Test handling common incoming revisions ' | |||
|
282 | 284 | branch: default |
|
283 | 285 | commit: (clean) |
|
284 | 286 | update: (current) |
|
287 | phases: 1 draft (draft) | |
|
285 | 288 | remote: 1 outgoing |
|
286 | 289 | |
|
287 | 290 | $ hg summary --remote --config paths.default='../clone#foo' --config paths.default-push='../clone' |
@@ -290,6 +293,7 b' Test handling common incoming revisions ' | |||
|
290 | 293 | branch: default |
|
291 | 294 | commit: (clean) |
|
292 | 295 | update: (current) |
|
296 | phases: 1 draft (draft) | |
|
293 | 297 | remote: 2 outgoing |
|
294 | 298 | |
|
295 | 299 | $ hg summary --remote --config paths.default='../clone' --config paths.default-push='../clone#foo' |
@@ -298,6 +302,7 b' Test handling common incoming revisions ' | |||
|
298 | 302 | branch: default |
|
299 | 303 | commit: (clean) |
|
300 | 304 | update: (current) |
|
305 | phases: 1 draft (draft) | |
|
301 | 306 | remote: 1 outgoing |
|
302 | 307 | |
|
303 | 308 | $ hg clone -q -r 0 . ../another |
@@ -311,6 +316,7 b' Test handling common incoming revisions ' | |||
|
311 | 316 | branch: default |
|
312 | 317 | commit: (clean) |
|
313 | 318 | update: (current) |
|
319 | phases: 1 draft (draft) | |
|
314 | 320 | remote: 1 outgoing |
|
315 | 321 | |
|
316 | 322 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now