Mercurial > hgsubversion
view hgsubversion/maps.py @ 430:2851b81c65ce
maps: make sure AuthorMaps don't overwrite themselves, fix overriding
Author maps for the Python repo got truncated because of the author map stupidly
writing upon itself. This patch implements a better and faster scenario, where
entries will only be written to the saved author map if they're not coming from that
file. They're also now streamed into the file directly, instead of having to re-open
the file on every entry, and formatting is preserved.
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Mon, 15 Jun 2009 16:09:27 +0200 |
parents | b17b2969861c |
children | fbc7cf4fd701 |
line wrap: on
line source
''' Module for self-contained maps. ''' import os from mercurial import util as hgutil from mercurial import node class AuthorMap(dict): '''A mapping from Subversion-style authors to Mercurial-style authors, and back. The data is stored persistently on disk. If the 'hgsubversion.defaultauthors' configuration option is set to false, attempting to obtain an unknown author will fail with an Abort. ''' def __init__(self, ui, path, defaulthost=None): '''Initialise a new AuthorMap. The ui argument is used to print diagnostic messages. The path argument is the location of the backing store, typically .hg/authormap. ''' self.ui = ui self.path = path if defaulthost: self.defaulthost = '@%s' % defaulthost.lstrip('@') else: self.defaulthost = '' self.super = super(AuthorMap, self) self.super.__init__() self.load(path) def load(self, path): ''' Load mappings from a file at the specified path. ''' if not os.path.exists(path): return writing = False if path != self.path: writing = open(self.path, 'a') self.ui.note('reading authormap from %s\n' % path) f = open(path, 'r') for number, line in enumerate(f): if writing: writing.write(line) line = line.split('#')[0] if not line.strip(): continue try: src, dst = line.split('=', 1) except (IndexError, ValueError): msg = 'ignoring line %i in author map %s: %s\n' self.ui.warn(msg % (number, path, line.rstrip())) continue src = src.strip() dst = dst.strip() self.ui.debug('adding author %s to author map\n' % src) if src in self and dst != self[src]: msg = 'overriding author: "%s" to "%s" (%s)\n' self.ui.warn(msg % (self[src], dst, src)) self[src] = dst f.close() if writing: writing.flush() writing.close() def __getitem__(self, author): ''' Similar to dict.__getitem__, except in case of an unknown author. In such cases, a new value is generated and added to the dictionary as well as the backing store. ''' if author in self: result = self.super.__getitem__(author) elif self.ui.configbool('hgsubversion', 'defaultauthors', True): self[author] = result = '%s%s' % (author, self.defaulthost) msg = 'substituting author "%s" for default "%s"\n' self.ui.note(msg % (author, result)) else: msg = 'author %s has no entry in the author map!' raise hgutil.Abort(msg % author) self.ui.debug('mapping author "%s" to "%s"\n' % (author, result)) return result def reverselookup(self, author): for svnauthor, hgauthor in self.iteritems(): if author == hgauthor: return svnauthor else: # Mercurial incorrectly splits at e.g. '.', so we roll our own. return author.rsplit('@', 1)[0] class RevMap(dict): VERSION = 1 def __init__(self, repo): dict.__init__(self) self.path = os.path.join(repo.path, 'svn', 'rev_map') self.seen = 0 if os.path.isfile(self.path): self._load() else: self._write() def hashes(self): return dict((v, k) for (k, v) in self.iteritems()) def branchedits(self, branch, rev): check = lambda x: x[0][1] == branch and x[0][0] < rev.revnum return sorted(filter(check, self.iteritems()), reverse=True) def _load(self): f = open(self.path) ver = int(f.readline()) if ver != self.VERSION: print 'revmap too new -- please upgrade' raise NotImplementedError for l in f: revnum, hash, branch = l.split(' ', 2) if branch == '\n': branch = None else: branch = branch[:-1] revnum = int(revnum) self.seen = max(self.seen, revnum) dict.__setitem__(self, (revnum, branch), node.bin(hash)) f.close() def _write(self): f = open(self.path, 'w') f.write('%s\n' % self.VERSION) f.flush() f.close() def __setitem__(self, key, hash): revnum, branch = key f = open(self.path, 'a') b = branch or '' f.write(str(revnum) + ' ' + node.hex(hash) + ' ' + b + '\n') f.flush() f.close() self.seen = max(self.seen, revnum) dict.__setitem__(self, (revnum, branch), hash) class FileMap(object): def __init__(self, repo): self.ui = repo.ui self.include = {} self.exclude = {} filemap = repo.ui.config('hgsubversion', 'filemap') if filemap and os.path.exists(filemap): self.load(filemap) def _rpairs(self, name): yield '.', name e = len(name) while e != -1: yield name[:e], name[e+1:] e = name.rfind('/', 0, e) def check(self, map, path): map = getattr(self, map) for pre, suf in self._rpairs(path): if pre not in map: continue return map[pre] return None def __contains__(self, path): if len(self.include) and len(path): inc = self.check('include', path) else: inc = path if len(self.exclude) and len(path): exc = self.check('exclude', path) else: exc = None if inc is None or exc is not None: return False return True def add(self, fn, map, path): mapping = getattr(self, map) if path in mapping: msg = 'duplicate %s entry in %s: "%d"\n' self.ui.warn(msg % (map, fn, path)) return bits = map.strip('e'), path self.ui.debug('%sing %s\n' % bits) mapping[path] = path def load(self, fn): self.ui.note('reading file map from %s\n' % fn) f = open(fn, 'r') for line in f: if line.strip() == '' or line.strip()[0] == '#': continue try: cmd, path = line.split(' ', 1) cmd = cmd.strip() path = path.strip() if cmd in ('include', 'exclude'): self.add(fn, cmd, path) continue self.ui.warn('unknown filemap command %s\n' % cmd) except IndexError: msg = 'ignoring bad line in filemap %s: %s\n' self.ui.warn(msg % (fn, line.rstrip())) f.close()