| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/convert/cvsps.py (2 lines) | |||
| M | hgext/convert/subversion.py (2 lines) | |||
| M | hgext/lfs/blobstore.py (2 lines) |
| # in it, slashes, colons and such. So here we take just the | # in it, slashes, colons and such. So here we take just the | ||||
| # alphanumeric characters, concatenated in a way that does not | # alphanumeric characters, concatenated in a way that does not | ||||
| # mix up the various components, so that | # mix up the various components, so that | ||||
| # :pserver:user@server:/path | # :pserver:user@server:/path | ||||
| # and | # and | ||||
| # /pserver/user/server/path | # /pserver/user/server/path | ||||
| # are mapped to different cache file names. | # are mapped to different cache file names. | ||||
| cachefile = root.split(":") + [directory, "cache"] | cachefile = root.split(":") + [directory, "cache"] | ||||
| cachefile = ['-'.join(re.findall(r'\w+', s)) for s in cachefile if s] | cachefile = ['-'.join(re.findall(br'\w+', s)) for s in cachefile if s] | ||||
| cachefile = os.path.join(cachedir, | cachefile = os.path.join(cachedir, | ||||
| '.'.join([s for s in cachefile if s])) | '.'.join([s for s in cachefile if s])) | ||||
| if cache == 'update': | if cache == 'update': | ||||
| try: | try: | ||||
| ui.note(_('reading cvs log cache %s\n') % cachefile) | ui.note(_('reading cvs log cache %s\n') % cachefile) | ||||
| oldlog = pickle.load(open(cachefile, 'rb')) | oldlog = pickle.load(open(cachefile, 'rb')) | ||||
| for e in oldlog: | for e in oldlog: | ||||
| self.wc = None | self.wc = None | ||||
| self.cwd = pycompat.getcwd() | self.cwd = pycompat.getcwd() | ||||
| created = False | created = False | ||||
| if os.path.isfile(os.path.join(path, '.svn', 'entries')): | if os.path.isfile(os.path.join(path, '.svn', 'entries')): | ||||
| self.wc = os.path.realpath(path) | self.wc = os.path.realpath(path) | ||||
| self.run0('update') | self.run0('update') | ||||
| else: | else: | ||||
| if not re.search(r'^(file|http|https|svn|svn\+ssh)\://', path): | if not re.search(br'^(file|http|https|svn|svn\+ssh)\://', path): | ||||
| path = os.path.realpath(path) | path = os.path.realpath(path) | ||||
| if os.path.isdir(os.path.dirname(path)): | if os.path.isdir(os.path.dirname(path)): | ||||
| if not os.path.exists(os.path.join(path, 'db', 'fs-type')): | if not os.path.exists(os.path.join(path, 'db', 'fs-type')): | ||||
| ui.status(_('initializing svn repository %r\n') % | ui.status(_('initializing svn repository %r\n') % | ||||
| os.path.basename(path)) | os.path.basename(path)) | ||||
| commandline(ui, 'svnadmin').run0('create', path) | commandline(ui, 'svnadmin').run0('create', path) | ||||
| created = path | created = path | ||||
| path = util.normpath(path) | path = util.normpath(path) | ||||
| util, | util, | ||||
| vfs as vfsmod, | vfs as vfsmod, | ||||
| worker, | worker, | ||||
| ) | ) | ||||
| from ..largefiles import lfutil | from ..largefiles import lfutil | ||||
| # 64 bytes for SHA256 | # 64 bytes for SHA256 | ||||
| _lfsre = re.compile(r'\A[a-f0-9]{64}\Z') | _lfsre = re.compile(br'\A[a-f0-9]{64}\Z') | ||||
| class lfsvfs(vfsmod.vfs): | class lfsvfs(vfsmod.vfs): | ||||
| def join(self, path): | def join(self, path): | ||||
| """split the path at first two characters, like: XX/XXXXX...""" | """split the path at first two characters, like: XX/XXXXX...""" | ||||
| if not _lfsre.match(path): | if not _lfsre.match(path): | ||||
| raise error.ProgrammingError('unexpected lfs path: %s' % path) | raise error.ProgrammingError('unexpected lfs path: %s' % path) | ||||
| return super(lfsvfs, self).join(path[0:2], path[2:]) | return super(lfsvfs, self).join(path[0:2], path[2:]) | ||||