From patchwork Wed Jun 21 06:40:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [V2] shelve: allow unlimited shelved changes per name From: Jun Wu X-Patchwork-Id: 21581 Message-Id: To: Date: Tue, 20 Jun 2017 23:40:12 -0700 # HG changeset patch # User Jun Wu # Date 1498027199 25200 # Tue Jun 20 23:39:59 2017 -0700 # Node ID ec51ddbbe3afc1fe7308b921253d2e64fd249e67 # Parent 0ce2cbebd74964ffe61e79de8941461bccc9371b # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.org/quark-zju/hg-draft -r ec51ddbbe3af shelve: allow unlimited shelved changes per name Previously, there is a 100 changes limit per name (bookmark or named branch). And the user will get "too many shelved changes named %s" when they are trying to shelve the 101th change. I hit that error message today. This limit was introduced by the shelve extension since the beginning. The function generating the names was called "gennames", under "getshelvename". There is another "gennames" under "backupfilename": def backupfilename(self): def gennames(base): yield base base, ext = base.rsplit('.', 1) for i in itertools.count(1): yield '%s-%d.%s' % (base, i, ext) "itertools.count" is an endless counter. Since the other "gennames" generates unlimited number of names, and the changeset introducing the limit (49d4919d21) does not say why the limit is useful. It seems safe to just remove the limit. The format "%02d" was kept intentionally so existing shelved changes won't break. diff --git a/hgext/shelve.py b/hgext/shelve.py --- a/hgext/shelve.py +++ b/hgext/shelve.py @@ -317,5 +317,5 @@ def getshelvename(repo, parent, opts): def gennames(): yield label - for i in xrange(1, 100): + for i in itertools.count(1): yield '%s-%02d' % (label, i) name = opts.get('name') @@ -344,6 +344,4 @@ def getshelvename(repo, parent, opts): name = n break - else: - raise error.Abort(_("too many shelved changes named '%s'") % label) return name