hgsubversion: hgsubversion/maps.py annotate

annotate hgsubversion/maps.py @ 636:d4f433ee709a

branchmap: reject empty mappings

author	Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date	Sat, 10 Jul 2010 14:48:57 +0200
parents	cc25b4c654dc
children	3ff8666b1479

rev	line source
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	1 ''' Module for self-contained maps. '''
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	2
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	3 import os
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	4 from mercurial import util as hgutil
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	5 from mercurial import node
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	6
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	7 import svncommands
bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	8
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	9 class AuthorMap(dict):
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	10 '''A mapping from Subversion-style authors to Mercurial-style
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	11 authors, and back. The data is stored persistently on disk.
322 05cd4a5138bf Move some .warn() calls to noisy levels instead. Augie Fackler <durin42@gmail.com> parents: 310 diff changeset	12
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	13 If the 'hgsubversion.defaultauthors' configuration option is set to false,
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	14 attempting to obtain an unknown author will fail with an Abort.
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	15 '''
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	16
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	17 def __init__(self, ui, path, defaulthost=None):
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	18 '''Initialise a new AuthorMap.
322 05cd4a5138bf Move some .warn() calls to noisy levels instead. Augie Fackler <durin42@gmail.com> parents: 310 diff changeset	19
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	20 The ui argument is used to print diagnostic messages.
322 05cd4a5138bf Move some .warn() calls to noisy levels instead. Augie Fackler <durin42@gmail.com> parents: 310 diff changeset	21
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	22 The path argument is the location of the backing store,
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	23 typically .hg/authormap.
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	24 '''
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	25 self.ui = ui
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	26 self.path = path
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	27 if defaulthost:
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	28 self.defaulthost = '@%s' % defaulthost.lstrip('@')
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	29 else:
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	30 self.defaulthost = ''
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	31 self.super = super(AuthorMap, self)
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	32 self.super.__init__()
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	33 self.load(path)
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	34
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	35 def load(self, path):
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	36 ''' Load mappings from a file at the specified path. '''
359 e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	37 if not os.path.exists(path):
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	38 return
430 2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	39
2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	40 writing = False
2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	41 if path != self.path:
2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	42 writing = open(self.path, 'a')
2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	43
359 e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	44 self.ui.note('reading authormap from %s\n' % path)
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	45 f = open(path, 'r')
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	46 for number, line in enumerate(f):
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	47
430 2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	48 if writing:
2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	49 writing.write(line)
2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	50
360 27e9fea5d114 Author maps: strip comments. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 359 diff changeset	51 line = line.split('#')[0]
359 e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	52 if not line.strip():
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	53 continue
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	54
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	55 try:
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	56 src, dst = line.split('=', 1)
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	57 except (IndexError, ValueError):
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	58 msg = 'ignoring line %i in author map %s: %s\n'
579 21a389e4d8b5 maps: if operation can continue, it should probably not use ui.warn() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 574 diff changeset	59 self.ui.status(msg % (number, path, line.rstrip()))
359 e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	60 continue
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	61
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	62 src = src.strip()
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	63 dst = dst.strip()
430 2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	64 self.ui.debug('adding author %s to author map\n' % src)
359 e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	65 if src in self and dst != self[src]:
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	66 msg = 'overriding author: "%s" to "%s" (%s)\n'
579 21a389e4d8b5 maps: if operation can continue, it should probably not use ui.warn() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 574 diff changeset	67 self.ui.status(msg % (self[src], dst, src))
430 2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	68 self[src] = dst
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	69
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	70 f.close()
430 2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	71 if writing:
2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	72 writing.flush()
2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	73 writing.close()
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	74
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	75 def __getitem__(self, author):
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	76 ''' Similar to dict.__getitem__, except in case of an unknown author.
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	77 In such cases, a new value is generated and added to the dictionary
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	78 as well as the backing store. '''
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	79 if author in self:
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	80 result = self.super.__getitem__(author)
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	81 elif self.ui.configbool('hgsubversion', 'defaultauthors', True):
310 15b8bab03504 Change default author substitution to avoid updating test hashes. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 307 diff changeset	82 self[author] = result = '%s%s' % (author, self.defaulthost)
359 e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	83 msg = 'substituting author "%s" for default "%s"\n'
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	84 self.ui.note(msg % (author, result))
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	85 else:
359 e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	86 msg = 'author %s has no entry in the author map!'
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	87 raise hgutil.Abort(msg % author)
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	88 self.ui.debug('mapping author "%s" to "%s"\n' % (author, result))
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	89 return result
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	90
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	91 def reverselookup(self, author):
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	92 for svnauthor, hgauthor in self.iteritems():
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	93 if author == hgauthor:
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	94 return svnauthor
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	95 else:
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	96 # Mercurial incorrectly splits at e.g. '.', so we roll our own.
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	97 return author.rsplit('@', 1)[0]
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	98
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	99
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	100 class TagMap(dict):
519 247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	101 """Map tags to converted node identifier.
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	102
519 247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	103 tag names are non-empty strings.
247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	104 """
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	105 VERSION = 2
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	106
458 974102998578 rebuildmeta: remove any existing tagmap file. Augie Fackler <durin42@gmail.com> parents: 453 diff changeset	107 @classmethod
974102998578 rebuildmeta: remove any existing tagmap file. Augie Fackler <durin42@gmail.com> parents: 453 diff changeset	108 def filepath(cls, repo):
974102998578 rebuildmeta: remove any existing tagmap file. Augie Fackler <durin42@gmail.com> parents: 453 diff changeset	109 return os.path.join(repo.path, 'svn', 'tagmap')
974102998578 rebuildmeta: remove any existing tagmap file. Augie Fackler <durin42@gmail.com> parents: 453 diff changeset	110
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	111 def __init__(self, repo, endrev=None):
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	112 dict.__init__(self)
458 974102998578 rebuildmeta: remove any existing tagmap file. Augie Fackler <durin42@gmail.com> parents: 453 diff changeset	113 self.path = self.filepath(repo)
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	114 self.endrev=endrev
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	115 if os.path.isfile(self.path):
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	116 self._load(repo)
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	117 else:
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	118 self._write()
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	119
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	120 def _load(self, repo):
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	121 f = open(self.path)
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	122 ver = int(f.readline())
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	123 if ver < self.VERSION:
579 21a389e4d8b5 maps: if operation can continue, it should probably not use ui.warn() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 574 diff changeset	124 repo.ui.status('tag map outdated, running rebuildmeta...\n')
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	125 f.close()
bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	126 os.unlink(self.path)
573 00393e9abff8 svncommands: make repo optional (useful for things like listauthors) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 519 diff changeset	127 svncommands.rebuildmeta(repo.ui, repo, ())
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	128 return
bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	129 elif ver != self.VERSION:
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	130 print 'tagmap too new -- please upgrade'
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	131 raise NotImplementedError
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	132 for l in f:
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	133 hash, revision, tag = l.split(' ', 2)
bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	134 revision = int(revision)
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	135 tag = tag[:-1]
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	136 if self.endrev is not None and revision > self.endrev:
bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	137 break
519 247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	138 if not tag:
247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	139 continue
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	140 dict.__setitem__(self, tag, node.bin(hash))
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	141 f.close()
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	142
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	143 def _write(self):
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	144 assert self.endrev is None
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	145 f = open(self.path, 'w')
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	146 f.write('%s\n' % self.VERSION)
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	147 f.flush()
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	148 f.close()
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	149
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	150 def update(self, other):
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	151 for k,v in other.iteritems():
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	152 self[k] = v
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	153
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	154 def __contains__(self, tag):
593 eb16630bceb1 maps: fix a % formatting bug Augie Fackler <durin42@gmail.com> parents: 579 diff changeset	155 return (tag and dict.__contains__(self, tag)
519 247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	156 and dict.__getitem__(self, tag) != node.nullid)
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	157
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	158 def __getitem__(self, tag):
519 247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	159 if tag and tag in self:
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	160 return dict.__getitem__(self, tag)
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	161 raise KeyError()
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	162
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	163 def __setitem__(self, tag, info):
519 247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	164 if not tag:
247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	165 raise hgutil.Abort('tag cannot be empty')
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	166 hash, revision = info
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	167 f = open(self.path, 'a')
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	168 f.write('%s %s %s\n' % (node.hex(hash), revision, tag))
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	169 f.flush()
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	170 f.close()
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	171 dict.__setitem__(self, tag, hash)
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	172
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	173
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	174 class RevMap(dict):
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	175
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	176 VERSION = 1
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	177
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	178 def __init__(self, repo):
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	179 dict.__init__(self)
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	180 self.path = os.path.join(repo.path, 'svn', 'rev_map')
415 b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	181 self.seen = 0
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	182 if os.path.isfile(self.path):
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	183 self._load()
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	184 else:
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	185 self._write()
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	186
415 b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	187 def hashes(self):
b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	188 return dict((v, k) for (k, v) in self.iteritems())
b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	189
b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	190 def branchedits(self, branch, rev):
b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	191 check = lambda x: x[0][1] == branch and x[0][0] < rev.revnum
b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	192 return sorted(filter(check, self.iteritems()), reverse=True)
b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	193
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	194 def _load(self):
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	195 f = open(self.path)
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	196 ver = int(f.readline())
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	197 if ver != self.VERSION:
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	198 print 'revmap too new -- please upgrade'
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	199 raise NotImplementedError
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	200 for l in f:
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	201 revnum, hash, branch = l.split(' ', 2)
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	202 if branch == '\n':
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	203 branch = None
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	204 else:
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	205 branch = branch[:-1]
415 b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	206 revnum = int(revnum)
b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	207 self.seen = max(self.seen, revnum)
b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	208 dict.__setitem__(self, (revnum, branch), node.bin(hash))
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	209 f.close()
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	210
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	211 def _write(self):
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	212 f = open(self.path, 'w')
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	213 f.write('%s\n' % self.VERSION)
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	214 f.flush()
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	215 f.close()
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	216
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	217 def __setitem__(self, key, hash):
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	218 revnum, branch = key
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	219 f = open(self.path, 'a')
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	220 b = branch or ''
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	221 f.write(str(revnum) + ' ' + node.hex(hash) + ' ' + b + '\n')
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	222 f.flush()
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	223 f.close()
415 b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	224 self.seen = max(self.seen, revnum)
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	225 dict.__setitem__(self, (revnum, branch), hash)
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	226
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	227
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	228 class FileMap(object):
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	229
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	230 def __init__(self, repo):
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	231 self.ui = repo.ui
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	232 self.include = {}
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	233 self.exclude = {}
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	234 filemap = repo.ui.config('hgsubversion', 'filemap')
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	235 if filemap and os.path.exists(filemap):
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	236 self.load(filemap)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	237
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	238 def _rpairs(self, name):
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	239 yield '.', name
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	240 e = len(name)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	241 while e != -1:
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	242 yield name[:e], name[e+1:]
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	243 e = name.rfind('/', 0, e)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	244
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	245 def check(self, map, path):
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	246 map = getattr(self, map)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	247 for pre, suf in self._rpairs(path):
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	248 if pre not in map:
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	249 continue
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	250 return map[pre]
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	251 return None
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	252
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	253 def __contains__(self, path):
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	254 if len(self.include) and len(path):
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	255 inc = self.check('include', path)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	256 else:
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	257 inc = path
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	258 if len(self.exclude) and len(path):
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	259 exc = self.check('exclude', path)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	260 else:
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	261 exc = None
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	262 if inc is None or exc is not None:
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	263 return False
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	264 return True
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	265
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	266 def add(self, fn, map, path):
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	267 mapping = getattr(self, map)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	268 if path in mapping:
593 eb16630bceb1 maps: fix a % formatting bug Augie Fackler <durin42@gmail.com> parents: 579 diff changeset	269 msg = 'duplicate %s entry in %s: "%s"\n'
579 21a389e4d8b5 maps: if operation can continue, it should probably not use ui.warn() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 574 diff changeset	270 self.ui.status(msg % (map, fn, path))
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	271 return
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	272 bits = map.strip('e'), path
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	273 self.ui.debug('%sing %s\n' % bits)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	274 mapping[path] = path
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	275
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	276 def load(self, fn):
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	277 self.ui.note('reading file map from %s\n' % fn)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	278 f = open(fn, 'r')
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	279 for line in f:
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	280 if line.strip() == '' or line.strip()[0] == '#':
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	281 continue
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	282 try:
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	283 cmd, path = line.split(' ', 1)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	284 cmd = cmd.strip()
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	285 path = path.strip()
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	286 if cmd in ('include', 'exclude'):
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	287 self.add(fn, cmd, path)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	288 continue
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	289 self.ui.warn('unknown filemap command %s\n' % cmd)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	290 except IndexError:
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	291 msg = 'ignoring bad line in filemap %s: %s\n'
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	292 self.ui.warn(msg % (fn, line.rstrip()))
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	293 f.close()
574 8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	294
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	295 class BranchMap(dict):
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	296 '''Facility for controlled renaming of branch names. Example:
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	297
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	298 oldname = newname
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	299 other = default
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	300
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	301 All changes on the oldname branch will now be on the newname branch; all
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	302 changes on other will now be on default (have no branch name set).
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	303 '''
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	304
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	305 def __init__(self, ui, path):
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	306 self.ui = ui
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	307 self.path = path
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	308 self.super = super(BranchMap, self)
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	309 self.super.__init__()
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	310 self.load(path)
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	311
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	312 def load(self, path):
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	313 '''Load mappings from a file at the specified path.'''
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	314 if not os.path.exists(path):
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	315 return
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	316
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	317 writing = False
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	318 if path != self.path:
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	319 writing = open(self.path, 'a')
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	320
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	321 self.ui.note('reading branchmap from %s\n' % path)
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	322 f = open(path, 'r')
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	323 for number, line in enumerate(f):
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	324
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	325 if writing:
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	326 writing.write(line)
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	327
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	328 line = line.split('#')[0]
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	329 if not line.strip():
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	330 continue
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	331
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	332 try:
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	333 src, dst = line.split('=', 1)
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	334 except (IndexError, ValueError):
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	335 msg = 'ignoring line %i in branch map %s: %s\n'
579 21a389e4d8b5 maps: if operation can continue, it should probably not use ui.warn() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 574 diff changeset	336 self.ui.status(msg % (number, path, line.rstrip()))
574 8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	337 continue
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	338
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	339 src = src.strip()
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	340 dst = dst.strip()
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	341 self.ui.debug('adding branch %s to branch map\n' % src)
636 d4f433ee709a branchmap: reject empty mappings Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 624 diff changeset	342
d4f433ee709a branchmap: reject empty mappings Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 624 diff changeset	343 if not dst:
d4f433ee709a branchmap: reject empty mappings Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 624 diff changeset	344 # prevent people from assuming such lines are valid
d4f433ee709a branchmap: reject empty mappings Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 624 diff changeset	345 raise hgutil.Abort('removing branches is not supported, yet\n'
d4f433ee709a branchmap: reject empty mappings Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 624 diff changeset	346 '(line %i in branch map %s)'
d4f433ee709a branchmap: reject empty mappings Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 624 diff changeset	347 % (number, path))
d4f433ee709a branchmap: reject empty mappings Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 624 diff changeset	348 elif src in self and dst != self[src]:
574 8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	349 msg = 'overriding branch: "%s" to "%s" (%s)\n'
579 21a389e4d8b5 maps: if operation can continue, it should probably not use ui.warn() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 574 diff changeset	350 self.ui.status(msg % (self[src], dst, src))
574 8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	351 self[src] = dst
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	352
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	353 f.close()
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	354 if writing:
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	355 writing.flush()
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	356 writing.close()

Mercurial > hgsubversion

annotate hgsubversion/maps.py @ 636:d4f433ee709a