hgsubversion: hgsubversion/maps.py annotate

annotate hgsubversion/maps.py @ 1379:367e65989b41

maps: add custom __setitem__ to author map We add a custom __setitem__ that will encapsulate the meta.caseignoreauthor logic.

author	Sean Farley <sean.michael.farley@gmail.com>
date	Mon, 24 Mar 2014 11:20:58 -0500
parents	abc87a62ff51
children	332ad9ea579b

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
889 7a98fbadcae9 revsets: huge speedups for fromsvn and svnrev Bryan O'Sullivan <bryano@fb.com> parents: 847 diff changeset	3 import errno
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	4 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	5 from mercurial import util as hgutil
1253 c54214bb6c4e maps: avoid O(n) property lookups on the node module Siddharth Agarwal <sid0@fb.com> parents: 1252 diff changeset	6 from mercurial.node import bin, hex, nullid
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	7
1374 a17d8874a099 Added dynamic author mapping. Jerome M. BERGER <jeberger@free.fr> parents: 1356 diff changeset	8 import subprocess
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	9 import svncommands
829 5061640fe5bc revmap: load/save _youngest using new load_string and save_string API Yonggang Luo <luoyonggang@gmail.com> parents: 826 diff changeset	10 import util
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	11
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	12 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	13 '''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	14 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	15
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	16 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	17 attempting to obtain an unknown author will fail with an Abort.
1188 38dd8721fb0d maps: remove trailing whitespace Sean Farley <sean.michael.farley@gmail.com> parents: 1187 diff changeset	18
1097 e015cd34168d authormap: allow case-insensitive authormaps for easier conversions maugustin parents: 976 diff changeset	19 If the 'hgsubversion.caseignoreauthors' configuration option is set to true,
e015cd34168d authormap: allow case-insensitive authormaps for easier conversions maugustin parents: 976 diff changeset	20 the userid from Subversion is always compared lowercase.
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	21 '''
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	22
1194 49791c40a8a5 maps: change authormap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1193 diff changeset	23 def __init__(self, meta):
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	24 '''Initialise a new AuthorMap.
322 05cd4a5138bf Move some .warn() calls to noisy levels instead. Augie Fackler <durin42@gmail.com> parents: 310 diff changeset	25
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	26 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	27
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	28 The path argument is the location of the backing store,
846 7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	29 typically .hg/svn/authors.
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	30 '''
1194 49791c40a8a5 maps: change authormap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1193 diff changeset	31 self.meta = meta
49791c40a8a5 maps: change authormap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1193 diff changeset	32 self.defaulthost = ''
49791c40a8a5 maps: change authormap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1193 diff changeset	33 if meta.defaulthost:
49791c40a8a5 maps: change authormap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1193 diff changeset	34 self.defaulthost = '@%s' % meta.defaulthost.lstrip('@')
49791c40a8a5 maps: change authormap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1193 diff changeset	35
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	36 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	37 self.super.__init__()
1332 ecce8aef4b21 svnmeta: rename authors_file to authormap_file Sean Farley <sean.michael.farley@gmail.com> parents: 1294 diff changeset	38 self.load(self.meta.authormap_file)
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	39
1193 a55339d35066 maps: load commandline authormap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1188 diff changeset	40 # append authors specified from the commandline
1194 49791c40a8a5 maps: change authormap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1193 diff changeset	41 clmap = util.configpath(self.meta.ui, 'authormap')
1193 a55339d35066 maps: load commandline authormap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1188 diff changeset	42 if clmap:
a55339d35066 maps: load commandline authormap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1188 diff changeset	43 self.load(clmap)
a55339d35066 maps: load commandline authormap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1188 diff changeset	44
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	45 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	46 ''' Load mappings from a file at the specified path. '''
818 9aed3bfc92d6 authormap: expand environment variables when evaluating map path maugustin <maugustin@gmx.net> parents: 809 diff changeset	47
9aed3bfc92d6 authormap: expand environment variables when evaluating map path maugustin <maugustin@gmx.net> parents: 809 diff changeset	48 path = os.path.expandvars(path)
359 e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	49 if not os.path.exists(path):
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	50 return
430 2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	51
2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	52 writing = False
1332 ecce8aef4b21 svnmeta: rename authors_file to authormap_file Sean Farley <sean.michael.farley@gmail.com> parents: 1294 diff changeset	53 if path != self.meta.authormap_file:
ecce8aef4b21 svnmeta: rename authors_file to authormap_file Sean Farley <sean.michael.farley@gmail.com> parents: 1294 diff changeset	54 writing = open(self.meta.authormap_file, 'a')
430 2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	55
1194 49791c40a8a5 maps: change authormap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1193 diff changeset	56 self.meta.ui.debug('reading authormap from %s\n' % path)
359 e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	57 f = open(path, 'r')
820 09f7c1c09207 authormap: only append new or changed authors maugustin <maugustin@gmx.net> parents: 818 diff changeset	58 for number, line_org in enumerate(f):
359 e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	59
820 09f7c1c09207 authormap: only append new or changed authors maugustin <maugustin@gmx.net> parents: 818 diff changeset	60 line = line_org.split('#')[0]
359 e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	61 if not line.strip():
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	62 continue
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	63
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	64 try:
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	65 src, dst = line.split('=', 1)
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	66 except (IndexError, ValueError):
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	67 msg = 'ignoring line %i in author map %s: %s\n'
1194 49791c40a8a5 maps: change authormap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1193 diff changeset	68 self.meta.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	69 continue
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	70
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	71 src = src.strip()
e74321f6f8a1 Author maps: code/message style (prevent line continuations). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 358 diff changeset	72 dst = dst.strip()
820 09f7c1c09207 authormap: only append new or changed authors maugustin <maugustin@gmx.net> parents: 818 diff changeset	73
1196 878372849175 maps: use meta.caseignoreauthors intead of accessing ui directly Sean Farley <sean.michael.farley@gmail.com> parents: 1195 diff changeset	74 if self.meta.caseignoreauthors:
1097 e015cd34168d authormap: allow case-insensitive authormaps for easier conversions maugustin parents: 976 diff changeset	75 src = src.lower()
e015cd34168d authormap: allow case-insensitive authormaps for easier conversions maugustin parents: 976 diff changeset	76
820 09f7c1c09207 authormap: only append new or changed authors maugustin <maugustin@gmx.net> parents: 818 diff changeset	77 if writing:
09f7c1c09207 authormap: only append new or changed authors maugustin <maugustin@gmx.net> parents: 818 diff changeset	78 if not src in self:
1194 49791c40a8a5 maps: change authormap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1193 diff changeset	79 self.meta.ui.debug('adding author %s to author map\n' % src)
820 09f7c1c09207 authormap: only append new or changed authors maugustin <maugustin@gmx.net> parents: 818 diff changeset	80 elif dst != self[src]:
09f7c1c09207 authormap: only append new or changed authors maugustin <maugustin@gmx.net> parents: 818 diff changeset	81 msg = 'overriding author: "%s" to "%s" (%s)\n'
1194 49791c40a8a5 maps: change authormap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1193 diff changeset	82 self.meta.ui.status(msg % (self[src], dst, src))
820 09f7c1c09207 authormap: only append new or changed authors maugustin <maugustin@gmx.net> parents: 818 diff changeset	83 writing.write(line_org)
09f7c1c09207 authormap: only append new or changed authors maugustin <maugustin@gmx.net> parents: 818 diff changeset	84
430 2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	85 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	86
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	87 f.close()
430 2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	88 if writing:
2851b81c65ce maps: make sure AuthorMaps don't overwrite themselves, fix overriding Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	89 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	90
1379 367e65989b41 maps: add custom __setitem__ to author map Sean Farley <sean.michael.farley@gmail.com> parents: 1375 diff changeset	91 def __setitem__(self, key, value):
367e65989b41 maps: add custom __setitem__ to author map Sean Farley <sean.michael.farley@gmail.com> parents: 1375 diff changeset	92 '''Similar to dict.__setitem__, except we check caseignoreauthors to
367e65989b41 maps: add custom __setitem__ to author map Sean Farley <sean.michael.farley@gmail.com> parents: 1375 diff changeset	93 use lowercase string or not
367e65989b41 maps: add custom __setitem__ to author map Sean Farley <sean.michael.farley@gmail.com> parents: 1375 diff changeset	94 '''
367e65989b41 maps: add custom __setitem__ to author map Sean Farley <sean.michael.farley@gmail.com> parents: 1375 diff changeset	95 if self.meta.caseignoreauthors:
367e65989b41 maps: add custom __setitem__ to author map Sean Farley <sean.michael.farley@gmail.com> parents: 1375 diff changeset	96 key = key.lower()
367e65989b41 maps: add custom __setitem__ to author map Sean Farley <sean.michael.farley@gmail.com> parents: 1375 diff changeset	97 super(AuthorMap, self).__setitem__(key, value)
367e65989b41 maps: add custom __setitem__ to author map Sean Farley <sean.michael.farley@gmail.com> parents: 1375 diff changeset	98
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	99 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	100 ''' 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	101 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	102 as well as the backing store. '''
735 c2b9e08ecf10 maps: map a missing author to '(no author)' Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 729 diff changeset	103 if author is None:
c2b9e08ecf10 maps: map a missing author to '(no author)' Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 729 diff changeset	104 author = '(no author)'
1097 e015cd34168d authormap: allow case-insensitive authormaps for easier conversions maugustin parents: 976 diff changeset	105
1196 878372849175 maps: use meta.caseignoreauthors intead of accessing ui directly Sean Farley <sean.michael.farley@gmail.com> parents: 1195 diff changeset	106 search_author = author
878372849175 maps: use meta.caseignoreauthors intead of accessing ui directly Sean Farley <sean.michael.farley@gmail.com> parents: 1195 diff changeset	107 if self.meta.caseignoreauthors:
1097 e015cd34168d authormap: allow case-insensitive authormaps for easier conversions maugustin parents: 976 diff changeset	108 search_author = author.lower()
e015cd34168d authormap: allow case-insensitive authormaps for easier conversions maugustin parents: 976 diff changeset	109
1374 a17d8874a099 Added dynamic author mapping. Jerome M. BERGER <jeberger@free.fr> parents: 1356 diff changeset	110 result = None
1097 e015cd34168d authormap: allow case-insensitive authormaps for easier conversions maugustin parents: 976 diff changeset	111 if search_author in self:
e015cd34168d authormap: allow case-insensitive authormaps for easier conversions maugustin parents: 976 diff changeset	112 result = self.super.__getitem__(search_author)
1374 a17d8874a099 Added dynamic author mapping. Jerome M. BERGER <jeberger@free.fr> parents: 1356 diff changeset	113 elif self.meta.mapauthorscmd:
1375 abc87a62ff51 maps: remove python2.7ism from dynamic author mapping Mateusz Kwapich <mitrandir@fb.com> parents: 1374 diff changeset	114 cmd = self.meta.mapauthorscmd % author
abc87a62ff51 maps: remove python2.7ism from dynamic author mapping Mateusz Kwapich <mitrandir@fb.com> parents: 1374 diff changeset	115 process = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
abc87a62ff51 maps: remove python2.7ism from dynamic author mapping Mateusz Kwapich <mitrandir@fb.com> parents: 1374 diff changeset	116 output, err = process.communicate()
abc87a62ff51 maps: remove python2.7ism from dynamic author mapping Mateusz Kwapich <mitrandir@fb.com> parents: 1374 diff changeset	117 retcode = process.poll()
abc87a62ff51 maps: remove python2.7ism from dynamic author mapping Mateusz Kwapich <mitrandir@fb.com> parents: 1374 diff changeset	118 if retcode:
abc87a62ff51 maps: remove python2.7ism from dynamic author mapping Mateusz Kwapich <mitrandir@fb.com> parents: 1374 diff changeset	119 msg = 'map author command "%s" exited with error'
abc87a62ff51 maps: remove python2.7ism from dynamic author mapping Mateusz Kwapich <mitrandir@fb.com> parents: 1374 diff changeset	120 raise hgutil.Abort(msg % cmd)
abc87a62ff51 maps: remove python2.7ism from dynamic author mapping Mateusz Kwapich <mitrandir@fb.com> parents: 1374 diff changeset	121 self[author] = result = output.strip()
1374 a17d8874a099 Added dynamic author mapping. Jerome M. BERGER <jeberger@free.fr> parents: 1356 diff changeset	122 if not result:
a17d8874a099 Added dynamic author mapping. Jerome M. BERGER <jeberger@free.fr> parents: 1356 diff changeset	123 if self.meta.defaultauthors:
a17d8874a099 Added dynamic author mapping. Jerome M. BERGER <jeberger@free.fr> parents: 1356 diff changeset	124 self[author] = result = '%s%s' % (author, self.defaulthost)
a17d8874a099 Added dynamic author mapping. Jerome M. BERGER <jeberger@free.fr> parents: 1356 diff changeset	125 msg = 'substituting author "%s" for default "%s"\n'
a17d8874a099 Added dynamic author mapping. Jerome M. BERGER <jeberger@free.fr> parents: 1356 diff changeset	126 self.meta.ui.debug(msg % (author, result))
a17d8874a099 Added dynamic author mapping. Jerome M. BERGER <jeberger@free.fr> parents: 1356 diff changeset	127 else:
a17d8874a099 Added dynamic author mapping. Jerome M. BERGER <jeberger@free.fr> parents: 1356 diff changeset	128 msg = 'author %s has no entry in the author map!'
a17d8874a099 Added dynamic author mapping. Jerome M. BERGER <jeberger@free.fr> parents: 1356 diff changeset	129 raise hgutil.Abort(msg % author)
1194 49791c40a8a5 maps: change authormap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1193 diff changeset	130 self.meta.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	131 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	132
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	133 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	134 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	135 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	136 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	137 else:
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	138 # 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	139 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	140
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	141
728 cfefeefad199 rename TagMap to Tags, to free up the TagMap name Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 725 diff changeset	142 class Tags(dict):
519 247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	143 """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	144
729 467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	145 tag names are non-empty strings. Tags are saved in a file
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	146 called tagmap, for backwards compatibility reasons.
519 247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	147 """
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	148 VERSION = 2
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	149
1187 30b2139c3931 maps: change tags init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1186 diff changeset	150 def __init__(self, meta, endrev=None):
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	151 dict.__init__(self)
1187 30b2139c3931 maps: change tags init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1186 diff changeset	152 self.meta = meta
725 c787147fa3b7 fix some style nits Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 647 diff changeset	153 self.endrev = endrev
1187 30b2139c3931 maps: change tags init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1186 diff changeset	154 if os.path.isfile(self.meta.tagfile):
30b2139c3931 maps: change tags init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1186 diff changeset	155 self._load()
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	156 else:
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	157 self._write()
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	158
1187 30b2139c3931 maps: change tags init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1186 diff changeset	159 def _load(self):
30b2139c3931 maps: change tags init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1186 diff changeset	160 f = open(self.meta.tagfile)
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	161 ver = int(f.readline())
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	162 if ver < self.VERSION:
1187 30b2139c3931 maps: change tags init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1186 diff changeset	163 self.meta.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	164 f.close()
1187 30b2139c3931 maps: change tags init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1186 diff changeset	165 os.unlink(self.meta.tagfile)
30b2139c3931 maps: change tags init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1186 diff changeset	166 svncommands.rebuildmeta(self.meta.ui, self.meta.repo, ())
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	167 return
bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	168 elif ver != self.VERSION:
891 83cc6e9e8425 kill all 'print' statements in the extension proper Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 889 diff changeset	169 raise hgutil.Abort('tagmap too new -- please upgrade')
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	170 for l in f:
826 8794302f3614 maps: s/hash/ha/ and s/map/m/ to avoid hiding Python builtins Yonggang Luo <luoyonggang@gmail.com> parents: 822 diff changeset	171 ha, revision, tag = l.split(' ', 2)
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	172 revision = int(revision)
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	173 tag = tag[:-1]
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	174 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	175 break
519 247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	176 if not tag:
247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	177 continue
1253 c54214bb6c4e maps: avoid O(n) property lookups on the node module Siddharth Agarwal <sid0@fb.com> parents: 1252 diff changeset	178 dict.__setitem__(self, tag, bin(ha))
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	179 f.close()
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	180
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	181 def _write(self):
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	182 assert self.endrev is None
1187 30b2139c3931 maps: change tags init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1186 diff changeset	183 f = open(self.meta.tagfile, 'w')
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	184 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	185 f.close()
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	186
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	187 def update(self, other):
725 c787147fa3b7 fix some style nits Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 647 diff changeset	188 for k, v in other.iteritems():
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	189 self[k] = v
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	190
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	191 def __contains__(self, tag):
593 eb16630bceb1 maps: fix a % formatting bug Augie Fackler <durin42@gmail.com> parents: 579 diff changeset	192 return (tag and dict.__contains__(self, tag)
1253 c54214bb6c4e maps: avoid O(n) property lookups on the node module Siddharth Agarwal <sid0@fb.com> parents: 1252 diff changeset	193 and dict.__getitem__(self, tag) != nullid)
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	194
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	195 def __getitem__(self, tag):
519 247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	196 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	197 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	198 raise KeyError()
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	199
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	200 def __setitem__(self, tag, info):
519 247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	201 if not tag:
247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	202 raise hgutil.Abort('tag cannot be empty')
826 8794302f3614 maps: s/hash/ha/ and s/map/m/ to avoid hiding Python builtins Yonggang Luo <luoyonggang@gmail.com> parents: 822 diff changeset	203 ha, revision = info
1187 30b2139c3931 maps: change tags init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1186 diff changeset	204 f = open(self.meta.tagfile, 'a')
1253 c54214bb6c4e maps: avoid O(n) property lookups on the node module Siddharth Agarwal <sid0@fb.com> parents: 1252 diff changeset	205 f.write('%s %s %s\n' % (hex(ha), revision, tag))
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	206 f.close()
826 8794302f3614 maps: s/hash/ha/ and s/map/m/ to avoid hiding Python builtins Yonggang Luo <luoyonggang@gmail.com> parents: 822 diff changeset	207 dict.__setitem__(self, tag, ha)
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	208
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	209
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	210 class RevMap(dict):
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	211
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	212 VERSION = 1
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	213
1183 09b20039192c maps: change revmap init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1182 diff changeset	214 def __init__(self, meta):
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	215 dict.__init__(self)
1183 09b20039192c maps: change revmap init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1182 diff changeset	216 self.meta = meta
1294 9a722b5246df maps: cache hashes() for the revmap Mateusz Kwapich <mitrandir@fb.com> parents: 1254 diff changeset	217 self._hashes = None
1183 09b20039192c maps: change revmap init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1182 diff changeset	218
09b20039192c maps: change revmap init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1182 diff changeset	219 if os.path.isfile(self.meta.revmap_file):
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	220 self._load()
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	221 else:
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	222 self._write()
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	223
415 b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	224 def hashes(self):
1294 9a722b5246df maps: cache hashes() for the revmap Mateusz Kwapich <mitrandir@fb.com> parents: 1254 diff changeset	225 if self._hashes is None:
9a722b5246df maps: cache hashes() for the revmap Mateusz Kwapich <mitrandir@fb.com> parents: 1254 diff changeset	226 self._hashes = dict((v, k) for (k, v) in self.iteritems())
9a722b5246df maps: cache hashes() for the revmap Mateusz Kwapich <mitrandir@fb.com> parents: 1254 diff changeset	227 return self._hashes
415 b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	228
b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	229 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	230 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	231 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	232
889 7a98fbadcae9 revsets: huge speedups for fromsvn and svnrev Bryan O'Sullivan <bryano@fb.com> parents: 847 diff changeset	233 @classmethod
1182 8f9619a67565 maps: change readmapfile to take a path instead of repo Sean Farley <sean.michael.farley@gmail.com> parents: 1144 diff changeset	234 def readmapfile(cls, path, missingok=True):
889 7a98fbadcae9 revsets: huge speedups for fromsvn and svnrev Bryan O'Sullivan <bryano@fb.com> parents: 847 diff changeset	235 try:
1182 8f9619a67565 maps: change readmapfile to take a path instead of repo Sean Farley <sean.michael.farley@gmail.com> parents: 1144 diff changeset	236 f = open(path)
889 7a98fbadcae9 revsets: huge speedups for fromsvn and svnrev Bryan O'Sullivan <bryano@fb.com> parents: 847 diff changeset	237 except IOError, err:
7a98fbadcae9 revsets: huge speedups for fromsvn and svnrev Bryan O'Sullivan <bryano@fb.com> parents: 847 diff changeset	238 if not missingok or err.errno != errno.ENOENT:
7a98fbadcae9 revsets: huge speedups for fromsvn and svnrev Bryan O'Sullivan <bryano@fb.com> parents: 847 diff changeset	239 raise
7a98fbadcae9 revsets: huge speedups for fromsvn and svnrev Bryan O'Sullivan <bryano@fb.com> parents: 847 diff changeset	240 return iter([])
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	241 ver = int(f.readline())
889 7a98fbadcae9 revsets: huge speedups for fromsvn and svnrev Bryan O'Sullivan <bryano@fb.com> parents: 847 diff changeset	242 if ver != cls.VERSION:
891 83cc6e9e8425 kill all 'print' statements in the extension proper Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 889 diff changeset	243 raise hgutil.Abort('revmap too new -- please upgrade')
889 7a98fbadcae9 revsets: huge speedups for fromsvn and svnrev Bryan O'Sullivan <bryano@fb.com> parents: 847 diff changeset	244 return f
7a98fbadcae9 revsets: huge speedups for fromsvn and svnrev Bryan O'Sullivan <bryano@fb.com> parents: 847 diff changeset	245
1251 46cec117dda2 maps.RevMap: disable GC while loading the revmap Siddharth Agarwal <sid0@fb.com> parents: 1217 diff changeset	246 @util.gcdisable
889 7a98fbadcae9 revsets: huge speedups for fromsvn and svnrev Bryan O'Sullivan <bryano@fb.com> parents: 847 diff changeset	247 def _load(self):
1252 a321afbc3479 maps.RevMap: while loading, read lastpulled and firstpulled once Siddharth Agarwal <sid0@fb.com> parents: 1251 diff changeset	248 lastpulled = self.meta.lastpulled
a321afbc3479 maps.RevMap: while loading, read lastpulled and firstpulled once Siddharth Agarwal <sid0@fb.com> parents: 1251 diff changeset	249 firstpulled = self.meta.firstpulled
1254 d07ccad28b1a maps.RevMap: avoid O(revs) property lookups on dict Siddharth Agarwal <sid0@fb.com> parents: 1253 diff changeset	250 setitem = dict.__setitem__
1183 09b20039192c maps: change revmap init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1182 diff changeset	251 for l in self.readmapfile(self.meta.revmap_file):
826 8794302f3614 maps: s/hash/ha/ and s/map/m/ to avoid hiding Python builtins Yonggang Luo <luoyonggang@gmail.com> parents: 822 diff changeset	252 revnum, ha, branch = l.split(' ', 2)
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	253 if branch == '\n':
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	254 branch = None
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	255 else:
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	256 branch = branch[:-1]
415 b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	257 revnum = int(revnum)
1252 a321afbc3479 maps.RevMap: while loading, read lastpulled and firstpulled once Siddharth Agarwal <sid0@fb.com> parents: 1251 diff changeset	258 if revnum > lastpulled or not lastpulled:
a321afbc3479 maps.RevMap: while loading, read lastpulled and firstpulled once Siddharth Agarwal <sid0@fb.com> parents: 1251 diff changeset	259 lastpulled = revnum
a321afbc3479 maps.RevMap: while loading, read lastpulled and firstpulled once Siddharth Agarwal <sid0@fb.com> parents: 1251 diff changeset	260 if revnum < firstpulled or not firstpulled:
a321afbc3479 maps.RevMap: while loading, read lastpulled and firstpulled once Siddharth Agarwal <sid0@fb.com> parents: 1251 diff changeset	261 firstpulled = revnum
1254 d07ccad28b1a maps.RevMap: avoid O(revs) property lookups on dict Siddharth Agarwal <sid0@fb.com> parents: 1253 diff changeset	262 setitem(self, (revnum, branch), bin(ha))
1252 a321afbc3479 maps.RevMap: while loading, read lastpulled and firstpulled once Siddharth Agarwal <sid0@fb.com> parents: 1251 diff changeset	263 self.meta.lastpulled = lastpulled
a321afbc3479 maps.RevMap: while loading, read lastpulled and firstpulled once Siddharth Agarwal <sid0@fb.com> parents: 1251 diff changeset	264 self.meta.firstpulled = firstpulled
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	265
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	266 def _write(self):
1183 09b20039192c maps: change revmap init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1182 diff changeset	267 f = open(self.meta.revmap_file, 'w')
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	268 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	269 f.close()
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	270
826 8794302f3614 maps: s/hash/ha/ and s/map/m/ to avoid hiding Python builtins Yonggang Luo <luoyonggang@gmail.com> parents: 822 diff changeset	271 def __setitem__(self, key, ha):
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	272 revnum, branch = key
1183 09b20039192c maps: change revmap init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1182 diff changeset	273 f = open(self.meta.revmap_file, 'a')
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	274 b = branch or ''
1253 c54214bb6c4e maps: avoid O(n) property lookups on the node module Siddharth Agarwal <sid0@fb.com> parents: 1252 diff changeset	275 f.write(str(revnum) + ' ' + hex(ha) + ' ' + b + '\n')
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	276 f.close()
1184 43384d2782dc svnmeta: move revmap.youngest to meta.lastpulled Sean Farley <sean.michael.farley@gmail.com> parents: 1183 diff changeset	277 if revnum > self.meta.lastpulled or not self.meta.lastpulled:
43384d2782dc svnmeta: move revmap.youngest to meta.lastpulled Sean Farley <sean.michael.farley@gmail.com> parents: 1183 diff changeset	278 self.meta.lastpulled = revnum
1186 f9650d24464a svnmeta: move revmap.oldest to meta.firstpulled Sean Farley <sean.michael.farley@gmail.com> parents: 1184 diff changeset	279 if revnum < self.meta.firstpulled or not self.meta.firstpulled:
f9650d24464a svnmeta: move revmap.oldest to meta.firstpulled Sean Farley <sean.michael.farley@gmail.com> parents: 1184 diff changeset	280 self.meta.firstpulled = revnum
826 8794302f3614 maps: s/hash/ha/ and s/map/m/ to avoid hiding Python builtins Yonggang Luo <luoyonggang@gmail.com> parents: 822 diff changeset	281 dict.__setitem__(self, (revnum, branch), ha)
1294 9a722b5246df maps: cache hashes() for the revmap Mateusz Kwapich <mitrandir@fb.com> parents: 1254 diff changeset	282 if self._hashes is not None:
9a722b5246df maps: cache hashes() for the revmap Mateusz Kwapich <mitrandir@fb.com> parents: 1254 diff changeset	283 self._hashes[ha] = (revnum, branch)
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	284
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	285
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	286 class FileMap(object):
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	287
846 7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	288 VERSION = 1
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	289
1217 a10a4fc69364 maps: change filemap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1216 diff changeset	290 def __init__(self, meta):
846 7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	291 '''Initialise a new FileMap.
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	292
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	293 The ui argument is used to print diagnostic messages.
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	294
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	295 The path argument is the location of the backing store,
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	296 typically .hg/svn/filemap.
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	297 '''
1217 a10a4fc69364 maps: change filemap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1216 diff changeset	298 self.meta = meta
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	299 self.include = {}
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	300 self.exclude = {}
1217 a10a4fc69364 maps: change filemap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1216 diff changeset	301 if os.path.isfile(self.meta.filemap_file):
846 7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	302 self._load()
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	303 else:
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	304 self._write()
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	305
1214 2c793092862b maps: load commandline filemap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1213 diff changeset	306 # append file mapping specified from the commandline
1217 a10a4fc69364 maps: change filemap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1216 diff changeset	307 clmap = util.configpath(self.meta.ui, 'filemap')
1214 2c793092862b maps: load commandline filemap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1213 diff changeset	308 if clmap:
2c793092862b maps: load commandline filemap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1213 diff changeset	309 self.load(clmap)
2c793092862b maps: load commandline filemap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1213 diff changeset	310
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	311 def _rpairs(self, name):
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	312 e = len(name)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	313 while e != -1:
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	314 yield name[:e], name[e+1:]
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	315 e = name.rfind('/', 0, e)
847 0de18c5c2e35 Respect filemap rule order (rules that come first are overridden by rules that come later) Vitaliy Filippov <vitalif@yourcmc.ru> parents: 846 diff changeset	316 yield '.', name
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	317
826 8794302f3614 maps: s/hash/ha/ and s/map/m/ to avoid hiding Python builtins Yonggang Luo <luoyonggang@gmail.com> parents: 822 diff changeset	318 def check(self, m, path):
8794302f3614 maps: s/hash/ha/ and s/map/m/ to avoid hiding Python builtins Yonggang Luo <luoyonggang@gmail.com> parents: 822 diff changeset	319 m = getattr(self, m)
8794302f3614 maps: s/hash/ha/ and s/map/m/ to avoid hiding Python builtins Yonggang Luo <luoyonggang@gmail.com> parents: 822 diff changeset	320 for pre, _suf in self._rpairs(path):
847 0de18c5c2e35 Respect filemap rule order (rules that come first are overridden by rules that come later) Vitaliy Filippov <vitalif@yourcmc.ru> parents: 846 diff changeset	321 if pre in m:
0de18c5c2e35 Respect filemap rule order (rules that come first are overridden by rules that come later) Vitaliy Filippov <vitalif@yourcmc.ru> parents: 846 diff changeset	322 return m[pre]
0de18c5c2e35 Respect filemap rule order (rules that come first are overridden by rules that come later) Vitaliy Filippov <vitalif@yourcmc.ru> parents: 846 diff changeset	323 return -1
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	324
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	325 def __contains__(self, path):
847 0de18c5c2e35 Respect filemap rule order (rules that come first are overridden by rules that come later) Vitaliy Filippov <vitalif@yourcmc.ru> parents: 846 diff changeset	326 if not len(path):
0de18c5c2e35 Respect filemap rule order (rules that come first are overridden by rules that come later) Vitaliy Filippov <vitalif@yourcmc.ru> parents: 846 diff changeset	327 return True
0de18c5c2e35 Respect filemap rule order (rules that come first are overridden by rules that come later) Vitaliy Filippov <vitalif@yourcmc.ru> parents: 846 diff changeset	328 if len(self.include):
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	329 inc = self.check('include', path)
847 0de18c5c2e35 Respect filemap rule order (rules that come first are overridden by rules that come later) Vitaliy Filippov <vitalif@yourcmc.ru> parents: 846 diff changeset	330 elif not len(self.exclude):
0de18c5c2e35 Respect filemap rule order (rules that come first are overridden by rules that come later) Vitaliy Filippov <vitalif@yourcmc.ru> parents: 846 diff changeset	331 return True
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	332 else:
847 0de18c5c2e35 Respect filemap rule order (rules that come first are overridden by rules that come later) Vitaliy Filippov <vitalif@yourcmc.ru> parents: 846 diff changeset	333 inc = 0
0de18c5c2e35 Respect filemap rule order (rules that come first are overridden by rules that come later) Vitaliy Filippov <vitalif@yourcmc.ru> parents: 846 diff changeset	334 if len(self.exclude):
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	335 exc = self.check('exclude', path)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	336 else:
847 0de18c5c2e35 Respect filemap rule order (rules that come first are overridden by rules that come later) Vitaliy Filippov <vitalif@yourcmc.ru> parents: 846 diff changeset	337 exc = -1
0de18c5c2e35 Respect filemap rule order (rules that come first are overridden by rules that come later) Vitaliy Filippov <vitalif@yourcmc.ru> parents: 846 diff changeset	338 # respect rule order: newer rules override older
0de18c5c2e35 Respect filemap rule order (rules that come first are overridden by rules that come later) Vitaliy Filippov <vitalif@yourcmc.ru> parents: 846 diff changeset	339 return inc > exc
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	340
822 033b86e0f56d stupid/filemap: disable this since it doesn't currently work Augie Fackler <durin42@gmail.com> parents: 821 diff changeset	341 # Needed so empty filemaps are false
033b86e0f56d stupid/filemap: disable this since it doesn't currently work Augie Fackler <durin42@gmail.com> parents: 821 diff changeset	342 def __len__(self):
033b86e0f56d stupid/filemap: disable this since it doesn't currently work Augie Fackler <durin42@gmail.com> parents: 821 diff changeset	343 return len(self.include) + len(self.exclude)
033b86e0f56d stupid/filemap: disable this since it doesn't currently work Augie Fackler <durin42@gmail.com> parents: 821 diff changeset	344
826 8794302f3614 maps: s/hash/ha/ and s/map/m/ to avoid hiding Python builtins Yonggang Luo <luoyonggang@gmail.com> parents: 822 diff changeset	345 def add(self, fn, m, path):
8794302f3614 maps: s/hash/ha/ and s/map/m/ to avoid hiding Python builtins Yonggang Luo <luoyonggang@gmail.com> parents: 822 diff changeset	346 mapping = getattr(self, m)
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	347 if path in mapping:
593 eb16630bceb1 maps: fix a % formatting bug Augie Fackler <durin42@gmail.com> parents: 579 diff changeset	348 msg = 'duplicate %s entry in %s: "%s"\n'
1217 a10a4fc69364 maps: change filemap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1216 diff changeset	349 self.meta.ui.status(msg % (m, fn, path))
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	350 return
956 24fbba02cb8f maps: fix filemap loading --verbose message Patrick Mezard <patrick@mezard.eu> parents: 891 diff changeset	351 bits = m.rstrip('e'), path
1217 a10a4fc69364 maps: change filemap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1216 diff changeset	352 self.meta.ui.debug('%sing %s\n' % bits)
847 0de18c5c2e35 Respect filemap rule order (rules that come first are overridden by rules that come later) Vitaliy Filippov <vitalif@yourcmc.ru> parents: 846 diff changeset	353 # respect rule order
0de18c5c2e35 Respect filemap rule order (rules that come first are overridden by rules that come later) Vitaliy Filippov <vitalif@yourcmc.ru> parents: 846 diff changeset	354 mapping[path] = len(self)
1217 a10a4fc69364 maps: change filemap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1216 diff changeset	355 if fn != self.meta.filemap_file:
a10a4fc69364 maps: change filemap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1216 diff changeset	356 f = open(self.meta.filemap_file, 'a')
846 7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	357 f.write(m + ' ' + path + '\n')
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	358 f.close()
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	359
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	360 def load(self, fn):
1217 a10a4fc69364 maps: change filemap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1216 diff changeset	361 self.meta.ui.debug('reading file map from %s\n' % fn)
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	362 f = open(fn, 'r')
846 7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	363 self.load_fd(f, fn)
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	364 f.close()
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	365
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	366 def load_fd(self, f, fn):
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	367 for line in f:
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	368 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	369 continue
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	370 try:
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	371 cmd, path = line.split(' ', 1)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	372 cmd = cmd.strip()
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	373 path = path.strip()
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	374 if cmd in ('include', 'exclude'):
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	375 self.add(fn, cmd, path)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	376 continue
1217 a10a4fc69364 maps: change filemap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1216 diff changeset	377 self.meta.ui.warn('unknown filemap command %s\n' % cmd)
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	378 except IndexError:
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	379 msg = 'ignoring bad line in filemap %s: %s\n'
1217 a10a4fc69364 maps: change filemap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1216 diff changeset	380 self.meta.ui.warn(msg % (fn, line.rstrip()))
846 7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	381
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	382 def _load(self):
1217 a10a4fc69364 maps: change filemap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1216 diff changeset	383 self.meta.ui.debug('reading in-repo file map from %s\n' % self.meta.filemap_file)
a10a4fc69364 maps: change filemap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1216 diff changeset	384 f = open(self.meta.filemap_file)
846 7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	385 ver = int(f.readline())
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	386 if ver != self.VERSION:
891 83cc6e9e8425 kill all 'print' statements in the extension proper Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 889 diff changeset	387 raise hgutil.Abort('filemap too new -- please upgrade')
1217 a10a4fc69364 maps: change filemap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1216 diff changeset	388 self.load_fd(f, self.meta.filemap_file)
846 7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	389 f.close()
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	390
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	391 def _write(self):
1217 a10a4fc69364 maps: change filemap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1216 diff changeset	392 f = open(self.meta.filemap_file, 'w')
846 7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	393 f.write('%s\n' % self.VERSION)
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	394 f.close()
574 8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	395
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	396 class BranchMap(dict):
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	397 '''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	398
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	399 oldname = newname
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	400 other = default
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	401
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	402 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	403 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	404 '''
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	405
1213 295d2f0cc275 maps: change branchmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1211 diff changeset	406 def __init__(self, meta):
295d2f0cc275 maps: change branchmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1211 diff changeset	407 self.meta = meta
574 8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	408 self.super = super(BranchMap, self)
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	409 self.super.__init__()
1213 295d2f0cc275 maps: change branchmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1211 diff changeset	410 self.load(self.meta.branchmap_file)
574 8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	411
1211 56d6e0273733 maps: load commandline branchmap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1210 diff changeset	412 # append branch mapping specified from the commandline
1213 295d2f0cc275 maps: change branchmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1211 diff changeset	413 clmap = util.configpath(self.meta.ui, 'branchmap')
1211 56d6e0273733 maps: load commandline branchmap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1210 diff changeset	414 if clmap:
56d6e0273733 maps: load commandline branchmap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1210 diff changeset	415 self.load(clmap)
56d6e0273733 maps: load commandline branchmap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1210 diff changeset	416
574 8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	417 def load(self, path):
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	418 '''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	419 if not os.path.exists(path):
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	420 return
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	421
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	422 writing = False
1213 295d2f0cc275 maps: change branchmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1211 diff changeset	423 if path != self.meta.branchmap_file:
295d2f0cc275 maps: change branchmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1211 diff changeset	424 writing = open(self.meta.branchmap_file, 'a')
574 8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	425
1216 572417ad0313 svnmeta: turn filemap into a lazy property Sean Farley <sean.michael.farley@gmail.com> parents: 1214 diff changeset	426 self.meta.ui.debug('reading branchmap from %s\n' % path)
574 8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	427 f = open(path, 'r')
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	428 for number, line in enumerate(f):
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	429
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	430 if writing:
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	431 writing.write(line)
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	432
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	433 line = line.split('#')[0]
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	434 if not line.strip():
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	435 continue
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	436
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	437 try:
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	438 src, dst = line.split('=', 1)
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	439 except (IndexError, ValueError):
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	440 msg = 'ignoring line %i in branch map %s: %s\n'
1213 295d2f0cc275 maps: change branchmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1211 diff changeset	441 self.meta.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	442 continue
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	443
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	444 src = src.strip()
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	445 dst = dst.strip()
1213 295d2f0cc275 maps: change branchmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1211 diff changeset	446 self.meta.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	447
1356 57d65269d30c maps: allow an empty map to not convert specific branches Sean Farley <sean@farley.io> parents: 1332 diff changeset	448 if dst and 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	449 msg = 'overriding branch: "%s" to "%s" (%s)\n'
1213 295d2f0cc275 maps: change branchmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1211 diff changeset	450 self.meta.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	451 self[src] = dst
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	452
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	453 f.close()
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	454 if writing:
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	455 writing.close()
729 467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	456
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	457 class TagMap(dict):
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	458 '''Facility for controlled renaming of tags. Example:
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	459
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	460 oldname = newname
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	461 other =
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	462
809 ab372e38fb6c maps: clean up whitespace Augie Fackler <durin42@gmail.com> parents: 742 diff changeset	463 The oldname tag from SVN will be represented as newname in the hg tags;
ab372e38fb6c maps: clean up whitespace Augie Fackler <durin42@gmail.com> parents: 742 diff changeset	464 the other tag will not be reflected in the hg repository.
729 467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	465 '''
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	466
1210 a0c6dbd9afbb maps: change tagmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1208 diff changeset	467 def __init__(self, meta):
a0c6dbd9afbb maps: change tagmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1208 diff changeset	468 self.meta = meta
729 467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	469 self.super = super(TagMap, self)
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	470 self.super.__init__()
1210 a0c6dbd9afbb maps: change tagmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1208 diff changeset	471 self.load(self.meta.tagmap_file)
729 467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	472
1208 54d42e59b29c maps: load commandline tagmap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1196 diff changeset	473 # append tag mapping specified from the commandline
1210 a0c6dbd9afbb maps: change tagmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1208 diff changeset	474 clmap = util.configpath(self.meta.ui, 'tagmap')
1208 54d42e59b29c maps: load commandline tagmap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1196 diff changeset	475 if clmap:
54d42e59b29c maps: load commandline tagmap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1196 diff changeset	476 self.load(clmap)
54d42e59b29c maps: load commandline tagmap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1196 diff changeset	477
729 467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	478 def load(self, path):
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	479 '''Load mappings from a file at the specified path.'''
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	480 if not os.path.exists(path):
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	481 return
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	482
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	483 writing = False
1210 a0c6dbd9afbb maps: change tagmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1208 diff changeset	484 if path != self.meta.tagmap_file:
a0c6dbd9afbb maps: change tagmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1208 diff changeset	485 writing = open(self.meta.tagmap_file, 'a')
729 467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	486
1210 a0c6dbd9afbb maps: change tagmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1208 diff changeset	487 self.meta.ui.debug('reading tag renames from %s\n' % path)
729 467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	488 f = open(path, 'r')
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	489 for number, line in enumerate(f):
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	490
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	491 if writing:
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	492 writing.write(line)
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	493
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	494 line = line.split('#')[0]
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	495 if not line.strip():
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	496 continue
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	497
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	498 try:
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	499 src, dst = line.split('=', 1)
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	500 except (IndexError, ValueError):
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	501 msg = 'ignoring line %i in tag renames %s: %s\n'
1210 a0c6dbd9afbb maps: change tagmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1208 diff changeset	502 self.meta.ui.status(msg % (number, path, line.rstrip()))
729 467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	503 continue
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	504
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	505 src = src.strip()
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	506 dst = dst.strip()
1210 a0c6dbd9afbb maps: change tagmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1208 diff changeset	507 self.meta.ui.debug('adding tag %s to tag renames\n' % src)
729 467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	508
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	509 if src in self and dst != self[src]:
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	510 msg = 'overriding tag rename: "%s" to "%s" (%s)\n'
1210 a0c6dbd9afbb maps: change tagmap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1208 diff changeset	511 self.meta.ui.status(msg % (self[src], dst, src))
729 467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	512 self[src] = dst
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	513
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	514 f.close()
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	515 if writing:
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	516 writing.close()

Mercurial > hgsubversion

annotate hgsubversion/maps.py @ 1379:367e65989b41