##// END OF EJS Templates
shelve: allow unlimited shelved changes per name...
Jun Wu -
r32968:4107eb8a default
parent child Browse files
Show More
@@ -316,7 +316,7 b' def getshelvename(repo, parent, opts):'
316 """Decide on the name this shelve is going to have"""
316 """Decide on the name this shelve is going to have"""
317 def gennames():
317 def gennames():
318 yield label
318 yield label
319 for i in xrange(1, 100):
319 for i in itertools.count(1):
320 yield '%s-%02d' % (label, i)
320 yield '%s-%02d' % (label, i)
321 name = opts.get('name')
321 name = opts.get('name')
322 label = repo._activebookmark or parent.branch() or 'default'
322 label = repo._activebookmark or parent.branch() or 'default'
@@ -343,8 +343,6 b' def getshelvename(repo, parent, opts):'
343 if not shelvedfile(repo, n, patchextension).exists():
343 if not shelvedfile(repo, n, patchextension).exists():
344 name = n
344 name = n
345 break
345 break
346 else:
347 raise error.Abort(_("too many shelved changes named '%s'") % label)
348
346
349 return name
347 return name
350
348
General Comments 0
You need to be logged in to leave comments. Login now