Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 28883:032c4c2f802a
pycompat: switch to util.urlreq/util.urlerr for py3 compat
author | timeless <timeless@mozdev.org> |
---|---|
date | Wed, 06 Apr 2016 23:22:12 +0000 |
parents | 79b8f052ee51 |
children | 3f0177d2b8fb dae38633eba8 |
comparison
equal
deleted
inserted
replaced
28882:800ec7c048b0 | 28883:032c4c2f802a |
---|---|
10 import errno | 10 import errno |
11 import inspect | 11 import inspect |
12 import os | 12 import os |
13 import random | 13 import random |
14 import time | 14 import time |
15 import urllib | |
16 import weakref | 15 import weakref |
17 | 16 |
18 from .i18n import _ | 17 from .i18n import _ |
19 from .node import ( | 18 from .node import ( |
20 hex, | 19 hex, |
57 util, | 56 util, |
58 ) | 57 ) |
59 | 58 |
60 release = lockmod.release | 59 release = lockmod.release |
61 propertycache = util.propertycache | 60 propertycache = util.propertycache |
61 urlerr = util.urlerr | |
62 urlreq = util.urlreq | |
62 filecache = scmutil.filecache | 63 filecache = scmutil.filecache |
63 | 64 |
64 class repofilecache(filecache): | 65 class repofilecache(filecache): |
65 """All filecache usage on repo are done for logic that should be unfiltered | 66 """All filecache usage on repo are done for logic that should be unfiltered |
66 """ | 67 """ |
364 | 365 |
365 def _restrictcapabilities(self, caps): | 366 def _restrictcapabilities(self, caps): |
366 if self.ui.configbool('experimental', 'bundle2-advertise', True): | 367 if self.ui.configbool('experimental', 'bundle2-advertise', True): |
367 caps = set(caps) | 368 caps = set(caps) |
368 capsblob = bundle2.encodecaps(bundle2.getrepocaps(self)) | 369 capsblob = bundle2.encodecaps(bundle2.getrepocaps(self)) |
369 caps.add('bundle2=' + urllib.quote(capsblob)) | 370 caps.add('bundle2=' + urlreq.quote(capsblob)) |
370 return caps | 371 return caps |
371 | 372 |
372 def _applyopenerreqs(self): | 373 def _applyopenerreqs(self): |
373 self.svfs.options = dict((r, 1) for r in self.requirements | 374 self.svfs.options = dict((r, 1) for r in self.requirements |
374 if r in self.openerreqs) | 375 if r in self.openerreqs) |