Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 20963:ffddabb8aa5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle2: use discard to remove bundle2 cap caps.remove('bundle2') was throwing an exception if bundle2 wasn't present in the capabilities. This was causing test-static-http.t to hang. Let's just use discard, so we don't get an exception.
author Durham Goode <durham@fb.com>
date Tue, 08 Apr 2014 13:05:29 -0700
parents 12f161f08d74
children 7a679918ee2b
line wrap: on
line diff
--- a/mercurial/localrepo.py	Mon Apr 07 11:45:50 2014 -0700
+++ b/mercurial/localrepo.py	Tue Apr 08 13:05:29 2014 -0700
@@ -281,7 +281,7 @@
         # required by the tests (or some brave tester)
         if not self.ui.configbool('server', 'bundle2', False):
             caps = set(caps)
-            caps.remove('bundle2')
+            caps.discard('bundle2')
         return caps
 
     def _applyrequirements(self, requirements):