##// END OF EJS Templates
shelve: use colon instead of quotes in 'changes to' description...
Siddharth Agarwal -
r27092:156985f2 default
parent child Browse files
Show More
@@ -276,7 +276,7 b' def createcmd(ui, repo, pats, opts):'
276 repo.mq.checkapplied = saved
276 repo.mq.checkapplied = saved
277
277
278 if parent.node() != nullid:
278 if parent.node() != nullid:
279 desc = "changes to '%s'" % parent.description().split('\n', 1)[0]
279 desc = "changes to: %s" % parent.description().split('\n', 1)[0]
280 else:
280 else:
281 desc = '(changes in empty repository)'
281 desc = '(changes in empty repository)'
282
282
@@ -1204,7 +1204,7 b' Test restricted mode with unshelve'
1204 +xxxx
1204 +xxxx
1205 $ hg shelve -q --name tmp
1205 $ hg shelve -q --name tmp
1206 $ hg shelve --list --patch
1206 $ hg shelve --list --patch
1207 tmp (*) changes to 'localresolve' (glob)
1207 tmp (*)* changes to: localresolve (glob)
1208
1208
1209 diff --git a/a b/a
1209 diff --git a/a b/a
1210 --- a/a
1210 --- a/a
@@ -140,11 +140,11 b' the common case - no options or filename'
140 ensure that our shelved changes exist
140 ensure that our shelved changes exist
141
141
142 $ hg shelve -l
142 $ hg shelve -l
143 default-01 (*)* changes to '[mq]: second.patch' (glob)
143 default-01 (*)* changes to: [mq]: second.patch (glob)
144 default (*)* changes to '[mq]: second.patch' (glob)
144 default (*)* changes to: [mq]: second.patch (glob)
145
145
146 $ hg shelve -l -p default
146 $ hg shelve -l -p default
147 default (*)* changes to '[mq]: second.patch' (glob)
147 default (*)* changes to: [mq]: second.patch (glob)
148
148
149 diff --git a/a/a b/a/a
149 diff --git a/a/a b/a/a
150 --- a/a/a
150 --- a/a/a
@@ -177,7 +177,7 b' local edits should not prevent a shelved'
177 unshelving change 'default-01'
177 unshelving change 'default-01'
178 temporarily committing pending changes (restore with 'hg unshelve --abort')
178 temporarily committing pending changes (restore with 'hg unshelve --abort')
179 rebasing shelved changes
179 rebasing shelved changes
180 rebasing 4:4702e8911fe0 "changes to '[mq]: second.patch'" (tip)
180 rebasing 4:32c69314e062 "changes to: [mq]: second.patch" (tip)
181 merging a/a
181 merging a/a
182
182
183 $ hg revert --all -q
183 $ hg revert --all -q
@@ -299,7 +299,7 b' force a conflicted merge to occur'
299 unshelving change 'default'
299 unshelving change 'default'
300 temporarily committing pending changes (restore with 'hg unshelve --abort')
300 temporarily committing pending changes (restore with 'hg unshelve --abort')
301 rebasing shelved changes
301 rebasing shelved changes
302 rebasing 5:4702e8911fe0 "changes to '[mq]: second.patch'" (tip)
302 rebasing 5:32c69314e062 "changes to: [mq]: second.patch" (tip)
303 merging a/a
303 merging a/a
304 warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
304 warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
305 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
305 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
@@ -329,7 +329,7 b' ensure that we have a merge with unresol'
329 c
329 c
330 +=======
330 +=======
331 +a
331 +a
332 +>>>>>>> source: 4702e8911fe0 - shelve: changes to '[mq]: second.patch'
332 +>>>>>>> source: 32c69314e062 - shelve: changes to: [mq]: second.patch
333 diff --git a/b/b b/b.rename/b
333 diff --git a/b/b b/b.rename/b
334 rename from b/b
334 rename from b/b
335 rename to b.rename/b
335 rename to b.rename/b
@@ -402,7 +402,7 b' attempt to continue'
402 [255]
402 [255]
403
403
404 $ hg unshelve -c
404 $ hg unshelve -c
405 rebasing 5:4702e8911fe0 "changes to '[mq]: second.patch'" (tip)
405 rebasing 5:32c69314e062 "changes to: [mq]: second.patch" (tip)
406 unshelve of 'default' complete
406 unshelve of 'default' complete
407
407
408 ensure the repo is as we hope
408 ensure the repo is as we hope
@@ -473,12 +473,12 b' if we resolve a conflict while unshelvin'
473 unshelving change 'default'
473 unshelving change 'default'
474 temporarily committing pending changes (restore with 'hg unshelve --abort')
474 temporarily committing pending changes (restore with 'hg unshelve --abort')
475 rebasing shelved changes
475 rebasing shelved changes
476 rebasing 6:c5e6910e7601 "changes to 'second'" (tip)
476 rebasing 6:2f694dd83a13 "changes to: second" (tip)
477 merging a/a
477 merging a/a
478 $ hg parents -q
478 $ hg parents -q
479 4:33f7f61e6c5e
479 4:33f7f61e6c5e
480 $ hg shelve -l
480 $ hg shelve -l
481 default (*)* changes to 'second' (glob)
481 default (*)* changes to: second (glob)
482 $ hg status
482 $ hg status
483 M a/a
483 M a/a
484 A foo/foo
484 A foo/foo
@@ -496,9 +496,9 b' if we resolve a conflict while unshelvin'
496 unshelving change 'default'
496 unshelving change 'default'
497 temporarily committing pending changes (restore with 'hg unshelve --abort')
497 temporarily committing pending changes (restore with 'hg unshelve --abort')
498 rebasing shelved changes
498 rebasing shelved changes
499 rebasing 6:c5e6910e7601 "changes to 'second'" (tip)
499 rebasing 6:2f694dd83a13 "changes to: second" (tip)
500 merging a/a
500 merging a/a
501 note: rebase of 6:c5e6910e7601 created no changes to commit
501 note: rebase of 6:2f694dd83a13 created no changes to commit
502 $ hg parents -q
502 $ hg parents -q
503 4:33f7f61e6c5e
503 4:33f7f61e6c5e
504 $ hg shelve -l
504 $ hg shelve -l
@@ -515,11 +515,11 b' test keep and cleanup'
515 shelved as default
515 shelved as default
516 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
516 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
517 $ hg shelve --list
517 $ hg shelve --list
518 default (*) changes to 'create conflict' (glob)
518 default (*)* changes to: create conflict (glob)
519 $ hg unshelve -k
519 $ hg unshelve -k
520 unshelving change 'default'
520 unshelving change 'default'
521 $ hg shelve --list
521 $ hg shelve --list
522 default (*) changes to 'create conflict' (glob)
522 default (*)* changes to: create conflict (glob)
523 $ hg shelve --cleanup
523 $ hg shelve --cleanup
524 $ hg shelve --list
524 $ hg shelve --list
525
525
@@ -554,7 +554,7 b' shelve should still work even if mq is d'
554 shelved as test
554 shelved as test
555 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
555 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
556 $ hg --config extensions.mq=! shelve --list
556 $ hg --config extensions.mq=! shelve --list
557 test (*) changes to 'create conflict' (glob)
557 test (*)* changes to: create conflict (glob)
558 $ hg bookmark
558 $ hg bookmark
559 * test 4:33f7f61e6c5e
559 * test 4:33f7f61e6c5e
560 $ hg --config extensions.mq=! unshelve
560 $ hg --config extensions.mq=! unshelve
@@ -587,7 +587,7 b' shelve should leave dirstate clean (issu'
587 $ hg unshelve
587 $ hg unshelve
588 unshelving change 'default'
588 unshelving change 'default'
589 rebasing shelved changes
589 rebasing shelved changes
590 rebasing 4:b8fefe789ed0 "changes to 'xyz'" (tip)
590 rebasing 4:82a0d7d6ba61 "changes to: xyz" (tip)
591 $ hg status
591 $ hg status
592 M z
592 M z
593
593
@@ -614,7 +614,7 b' shelve should only unshelve pending chan'
614 $ hg unshelve
614 $ hg unshelve
615 unshelving change 'default'
615 unshelving change 'default'
616 rebasing shelved changes
616 rebasing shelved changes
617 rebasing 3:0cae6656c016 "changes to 'c'" (tip)
617 rebasing 3:958bcbd1776e "changes to: c" (tip)
618 $ hg status
618 $ hg status
619 A d
619 A d
620
620
@@ -628,7 +628,7 b' unshelve should work on an ancestor of t'
628 $ hg unshelve
628 $ hg unshelve
629 unshelving change 'default'
629 unshelving change 'default'
630 rebasing shelved changes
630 rebasing shelved changes
631 rebasing 3:be58f65f55fb "changes to 'b'" (tip)
631 rebasing 3:013284d9655e "changes to: b" (tip)
632 $ hg status
632 $ hg status
633 A d
633 A d
634
634
@@ -711,7 +711,7 b' unshelve and conflicts with tracked and '
711 shelved as default
711 shelved as default
712 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
712 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
713 $ hg log -G --template '{rev} {desc|firstline} {author}' -R bundle://.hg/shelved/default.hg -r 'bundle()'
713 $ hg log -G --template '{rev} {desc|firstline} {author}' -R bundle://.hg/shelved/default.hg -r 'bundle()'
714 o 4 changes to 'commit stuff' shelve@localhost
714 o 4 changes to: commit stuff shelve@localhost
715 |
715 |
716 $ hg log -G --template '{rev} {desc|firstline} {author}'
716 $ hg log -G --template '{rev} {desc|firstline} {author}'
717 @ 3 commit stuff test
717 @ 3 commit stuff test
@@ -726,13 +726,13 b' unshelve and conflicts with tracked and '
726 unshelving change 'default'
726 unshelving change 'default'
727 temporarily committing pending changes (restore with 'hg unshelve --abort')
727 temporarily committing pending changes (restore with 'hg unshelve --abort')
728 rebasing shelved changes
728 rebasing shelved changes
729 rebasing 5:23b29cada8ba "changes to 'commit stuff'" (tip)
729 rebasing 5:81152db69da7 "changes to: commit stuff" (tip)
730 merging f
730 merging f
731 warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
731 warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
732 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
732 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
733 [1]
733 [1]
734 $ hg log -G --template '{rev} {desc|firstline} {author} {date|isodate}'
734 $ hg log -G --template '{rev} {desc|firstline} {author} {date|isodate}'
735 @ 5 changes to 'commit stuff' shelve@localhost 1970-01-01 00:00 +0000
735 @ 5 changes to: commit stuff shelve@localhost 1970-01-01 00:00 +0000
736 |
736 |
737 | @ 4 pending changes temporary commit shelve@localhost 2004-01-10 13:37 +0000
737 | @ 4 pending changes temporary commit shelve@localhost 2004-01-10 13:37 +0000
738 |/
738 |/
@@ -750,7 +750,7 b' unshelve and conflicts with tracked and '
750 g
750 g
751 =======
751 =======
752 f
752 f
753 >>>>>>> source: 23b29cada8ba - shelve: changes to 'commit stuff'
753 >>>>>>> source: 81152db69da7 - shelve: changes to: commit stuff
754 $ cat f.orig
754 $ cat f.orig
755 g
755 g
756 $ hg unshelve --abort -t false
756 $ hg unshelve --abort -t false
@@ -766,7 +766,7 b' unshelve and conflicts with tracked and '
766 unshelving change 'default'
766 unshelving change 'default'
767 temporarily committing pending changes (restore with 'hg unshelve --abort')
767 temporarily committing pending changes (restore with 'hg unshelve --abort')
768 rebasing shelved changes
768 rebasing shelved changes
769 rebasing 5:23b29cada8ba "changes to 'commit stuff'" (tip)
769 rebasing 5:81152db69da7 "changes to: commit stuff" (tip)
770 $ hg st
770 $ hg st
771 M a
771 M a
772 A f
772 A f
@@ -782,7 +782,7 b' unshelve and conflicts with tracked and '
782 $ hg unshelve
782 $ hg unshelve
783 unshelving change 'default'
783 unshelving change 'default'
784 rebasing shelved changes
784 rebasing shelved changes
785 rebasing 5:23b29cada8ba "changes to 'commit stuff'" (tip)
785 rebasing 5:81152db69da7 "changes to: commit stuff" (tip)
786 merging f
786 merging f
787 warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
787 warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
788 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
788 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
@@ -795,7 +795,7 b' unshelve and conflicts with tracked and '
795 g
795 g
796 =======
796 =======
797 f
797 f
798 >>>>>>> source: 23b29cada8ba - shelve: changes to 'commit stuff'
798 >>>>>>> source: 81152db69da7 - shelve: changes to: commit stuff
799 $ cat f.orig
799 $ cat f.orig
800 g
800 g
801 $ hg unshelve --abort
801 $ hg unshelve --abort
@@ -825,7 +825,7 b' Recreate some conflict again'
825 $ hg unshelve
825 $ hg unshelve
826 unshelving change 'default'
826 unshelving change 'default'
827 rebasing shelved changes
827 rebasing shelved changes
828 rebasing 5:4b555fdb4e96 "changes to 'second'" (tip)
828 rebasing 5:e42a7da90865 "changes to: second" (tip)
829 merging a/a
829 merging a/a
830 warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
830 warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
831 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
831 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
@@ -841,8 +841,8 b' is a no-op), works (issue4398)'
841 $ hg resolve -m a/a
841 $ hg resolve -m a/a
842 (no more unresolved files)
842 (no more unresolved files)
843 $ hg unshelve -c
843 $ hg unshelve -c
844 rebasing 5:4b555fdb4e96 "changes to 'second'" (tip)
844 rebasing 5:e42a7da90865 "changes to: second" (tip)
845 note: rebase of 5:4b555fdb4e96 created no changes to commit
845 note: rebase of 5:e42a7da90865 created no changes to commit
846 unshelve of 'default' complete
846 unshelve of 'default' complete
847 $ hg bookmark
847 $ hg bookmark
848 * test 4:33f7f61e6c5e
848 * test 4:33f7f61e6c5e
@@ -935,7 +935,7 b' Test interactive shelve'
935 unshelving change 'test'
935 unshelving change 'test'
936 temporarily committing pending changes (restore with 'hg unshelve --abort')
936 temporarily committing pending changes (restore with 'hg unshelve --abort')
937 rebasing shelved changes
937 rebasing shelved changes
938 rebasing 6:65b5d1c34c34 "changes to 'create conflict'" (tip)
938 rebasing 6:96a1354f65f6 "changes to: create conflict" (tip)
939 merging a/a
939 merging a/a
940 $ hg bookmark
940 $ hg bookmark
941 * test 4:33f7f61e6c5e
941 * test 4:33f7f61e6c5e
@@ -969,7 +969,7 b' shelve --patch and shelve --stat should '
969 abort: --stat expects a single shelf
969 abort: --stat expects a single shelf
970 [255]
970 [255]
971 $ hg shelve --patch default
971 $ hg shelve --patch default
972 default (* ago) changes to 'create conflict' (glob)
972 default (*)* changes to: create conflict (glob)
973
973
974 diff --git a/shelf-patch-a b/shelf-patch-a
974 diff --git a/shelf-patch-a b/shelf-patch-a
975 new file mode 100644
975 new file mode 100644
@@ -978,7 +978,7 b' shelve --patch and shelve --stat should '
978 @@ -0,0 +1,1 @@
978 @@ -0,0 +1,1 @@
979 +patch a
979 +patch a
980 $ hg shelve --stat default
980 $ hg shelve --stat default
981 default (* ago) changes to 'create conflict' (glob)
981 default (*)* changes to: create conflict (glob)
982 shelf-patch-a | 1 +
982 shelf-patch-a | 1 +
983 1 files changed, 1 insertions(+), 0 deletions(-)
983 1 files changed, 1 insertions(+), 0 deletions(-)
984 $ hg shelve --patch nonexistentshelf
984 $ hg shelve --patch nonexistentshelf
@@ -1010,7 +1010,7 b' no general delta'
1010 shelved as default
1010 shelved as default
1011 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1011 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1012 $ hg debugbundle .hg/shelved/*.hg
1012 $ hg debugbundle .hg/shelved/*.hg
1013 7e30d8ac6f23cfc84330fd7e698730374615d21a
1013 45993d65fe9dc3c6d8764b9c3b07fa831ee7d92d
1014 $ cd ..
1014 $ cd ..
1015
1015
1016 with general delta
1016 with general delta
@@ -1032,7 +1032,7 b' with general delta'
1032 $ hg debugbundle .hg/shelved/*.hg
1032 $ hg debugbundle .hg/shelved/*.hg
1033 Stream params: {'Compression': 'BZ'}
1033 Stream params: {'Compression': 'BZ'}
1034 changegroup -- "{'version': '02'}"
1034 changegroup -- "{'version': '02'}"
1035 7e30d8ac6f23cfc84330fd7e698730374615d21a
1035 45993d65fe9dc3c6d8764b9c3b07fa831ee7d92d
1036 $ cd ..
1036 $ cd ..
1037
1037
1038 Test visibility of in-memory changes inside transaction to external hook
1038 Test visibility of in-memory changes inside transaction to external hook
@@ -1086,13 +1086,13 b' Test visibility of in-memory changes ins'
1086 $ hg unshelve --keep default
1086 $ hg unshelve --keep default
1087 temporarily committing pending changes (restore with 'hg unshelve --abort')
1087 temporarily committing pending changes (restore with 'hg unshelve --abort')
1088 rebasing shelved changes
1088 rebasing shelved changes
1089 rebasing 7:fcbb97608399 "changes to 'create conflict'" (tip)
1089 rebasing 7:206bf5d4f922 "changes to: create conflict" (tip)
1090 ==== preupdate:
1090 ==== preupdate:
1091 VISIBLE 6:66b86db80ee4
1091 VISIBLE 6:66b86db80ee4
1092 ACTUAL 5:703117a2acfb
1092 ACTUAL 5:703117a2acfb
1093 ====
1093 ====
1094 ==== preupdate:
1094 ==== preupdate:
1095 VISIBLE 8:cb2a4e59c2d5
1095 VISIBLE 8:a0e04704317e
1096 ACTUAL 5:703117a2acfb
1096 ACTUAL 5:703117a2acfb
1097 ====
1097 ====
1098 ==== preupdate:
1098 ==== preupdate:
@@ -1131,10 +1131,10 b' Test visibility of in-memory changes ins'
1131 $ hg unshelve --keep default
1131 $ hg unshelve --keep default
1132 temporarily committing pending changes (restore with 'hg unshelve --abort')
1132 temporarily committing pending changes (restore with 'hg unshelve --abort')
1133 rebasing shelved changes
1133 rebasing shelved changes
1134 rebasing 7:fcbb97608399 "changes to 'create conflict'" (tip)
1134 rebasing 7:206bf5d4f922 "changes to: create conflict" (tip)
1135 ==== update:
1135 ==== update:
1136 VISIBLE 6:66b86db80ee4
1136 VISIBLE 6:66b86db80ee4
1137 VISIBLE 7:fcbb97608399
1137 VISIBLE 7:206bf5d4f922
1138 ACTUAL 5:703117a2acfb
1138 ACTUAL 5:703117a2acfb
1139 ====
1139 ====
1140 ==== update:
1140 ==== update:
General Comments 0
You need to be logged in to leave comments. Login now