Show More
@@ -160,7 +160,6 b' def createcmd(ui, repo, pats, opts):' | |||
|
160 | 160 | |
|
161 | 161 | if parent.node() != nullid: |
|
162 | 162 | desc = parent.description().split('\n', 1)[0] |
|
163 | desc = _('shelved from %s (%s): %s') % (label, str(parent)[:8], desc) | |
|
164 | 163 | else: |
|
165 | 164 | desc = '(empty repository)' |
|
166 | 165 | |
@@ -223,7 +222,6 b' def createcmd(ui, repo, pats, opts):' | |||
|
223 | 222 | |
|
224 | 223 | if ui.formatted(): |
|
225 | 224 | desc = util.ellipsis(desc, ui.termwidth()) |
|
226 | ui.status(desc + '\n') | |
|
227 | 225 | ui.status(_('shelved as %s\n') % name) |
|
228 | 226 | hg.update(repo, parent.node()) |
|
229 | 227 | finally: |
@@ -292,10 +290,10 b' def listcmd(ui, repo, pats, opts):' | |||
|
292 | 290 | continue |
|
293 | 291 | ui.write(' ' * (16 - len(sname))) |
|
294 | 292 | used = 16 |
|
295 |
age = ' |
|
|
293 | age = '(%s)' % templatefilters.age(util.makedate(mtime), abbrev=True) | |
|
296 | 294 | ui.write(age, label='shelve.age') |
|
297 |
ui.write(' ' * (1 |
|
|
298 |
used += 1 |
|
|
295 | ui.write(' ' * (12 - len(age))) | |
|
296 | used += 12 | |
|
299 | 297 | fp = open(name + '.patch', 'rb') |
|
300 | 298 | try: |
|
301 | 299 | while True: |
@@ -16,7 +16,6 b'' | |||
|
16 | 16 | shelving in an empty repo should be possible |
|
17 | 17 | |
|
18 | 18 | $ hg shelve |
|
19 | (empty repository) | |
|
20 | 19 | shelved as default |
|
21 | 20 | 0 files updated, 0 files merged, 5 files removed, 0 files unresolved |
|
22 | 21 | |
@@ -44,7 +43,6 b' shelve a change that we will delete late' | |||
|
44 | 43 | |
|
45 | 44 | $ echo a >> a/a |
|
46 | 45 | $ hg shelve |
|
47 | shelved from default (bb4fec6d): second | |
|
48 | 46 | shelved as default |
|
49 | 47 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
50 | 48 | |
@@ -74,7 +72,6 b' prevent some foot-shooting' | |||
|
74 | 72 | the common case - no options or filenames |
|
75 | 73 | |
|
76 | 74 | $ hg shelve |
|
77 | shelved from default (bb4fec6d): second | |
|
78 | 75 | shelved as default-01 |
|
79 | 76 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
80 | 77 | $ hg status -C |
@@ -82,11 +79,11 b' the common case - no options or filename' | |||
|
82 | 79 | ensure that our shelved changes exist |
|
83 | 80 | |
|
84 | 81 | $ hg shelve -l |
|
85 |
default-01 |
|
|
86 |
default |
|
|
82 | default-01 (*) second (glob) | |
|
83 | default (*) second (glob) | |
|
87 | 84 | |
|
88 | 85 | $ hg shelve -l -p default |
|
89 |
default |
|
|
86 | default (*) second (glob) | |
|
90 | 87 | |
|
91 | 88 | diff --git a/a/a b/a/a |
|
92 | 89 | --- a/a/a |
@@ -158,7 +155,7 b' expect "a" to no longer be present, but ' | |||
|
158 | 155 | c |
|
159 | 156 | R b/b |
|
160 | 157 | $ hg shelve -l --stat |
|
161 |
wibble |
|
|
158 | wibble (*) wat (glob) | |
|
162 | 159 | a/a | 1 + |
|
163 | 160 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
164 | 161 | |
@@ -206,11 +203,11 b' force a conflicted merge to occur' | |||
|
206 | 203 | ensure that we have a merge with unresolved conflicts |
|
207 | 204 | |
|
208 | 205 | $ hg heads -q |
|
209 | 3:7ec047b69dc0 | |
|
206 | 3:6ea6529cfc65 | |
|
210 | 207 | 2:ceefc37abe1e |
|
211 | 208 | $ hg parents -q |
|
212 | 209 | 2:ceefc37abe1e |
|
213 | 3:7ec047b69dc0 | |
|
210 | 3:6ea6529cfc65 | |
|
214 | 211 | $ hg status |
|
215 | 212 | M a/a |
|
216 | 213 | M b.rename/b |
@@ -402,11 +399,10 b' if we resolve a conflict while unshelvin' | |||
|
402 | 399 | test keep and cleanup |
|
403 | 400 | |
|
404 | 401 | $ hg shelve |
|
405 | shelved from default (be7e7968): create conflict | |
|
406 | 402 | shelved as default |
|
407 | 403 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
408 | 404 | $ hg shelve --list |
|
409 |
default |
|
|
405 | default (*) create conflict (glob) | |
|
410 | 406 | $ hg unshelve --keep |
|
411 | 407 | unshelving change 'default' |
|
412 | 408 | adding changesets |
@@ -415,6 +411,6 b' test keep and cleanup' | |||
|
415 | 411 | added 1 changesets with 1 changes to 7 files |
|
416 | 412 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
417 | 413 | $ hg shelve --list |
|
418 |
default |
|
|
414 | default (*) create conflict (glob) | |
|
419 | 415 | $ hg shelve --cleanup |
|
420 | 416 | $ hg shelve --list |
General Comments 0
You need to be logged in to leave comments.
Login now