hgsubversion: hgsubversion/maps.py annotate

annotate hgsubversion/maps.py @ 1437:43df01d36f22

FileMap: store filename locally FileMap no longer keeps a reference to the svnmeta object.

author	Augie Fackler <raf@durin42.com>
date	Sun, 05 Jun 2016 22:29:07 -0400
parents	18a961672a72
children	59d4b24a0f47

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
1394 c4055968f030 maps: use regex for better comment handling Sean Farley <sean.michael.farley@gmail.com> parents: 1393 diff changeset	5 import re
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 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	7 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	8
1374 a17d8874a099 Added dynamic author mapping. Jerome M. BERGER <jeberger@free.fr> parents: 1356 diff changeset	9 import subprocess
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	10 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	11 import util
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	12
1383 73c76f99ca08 maps: add a basemap class Sean Farley <sean.michael.farley@gmail.com> parents: 1382 diff changeset	13 class BaseMap(dict):
73c76f99ca08 maps: add a basemap class Sean Farley <sean.michael.farley@gmail.com> parents: 1382 diff changeset	14 '''A base class for the different type of mappings: author, branch, and
73c76f99ca08 maps: add a basemap class Sean Farley <sean.michael.farley@gmail.com> parents: 1382 diff changeset	15 tags.'''
73c76f99ca08 maps: add a basemap class Sean Farley <sean.michael.farley@gmail.com> parents: 1382 diff changeset	16 def __init__(self, meta):
73c76f99ca08 maps: add a basemap class Sean Farley <sean.michael.farley@gmail.com> parents: 1382 diff changeset	17 self.meta = meta
73c76f99ca08 maps: add a basemap class Sean Farley <sean.michael.farley@gmail.com> parents: 1382 diff changeset	18 super(BaseMap, self).__init__()
1428 da272633997f maps: store a direct reference to ui Augie Fackler <raf@durin42.com> parents: 1427 diff changeset	19 self._ui = meta.ui
1383 73c76f99ca08 maps: add a basemap class Sean Farley <sean.michael.farley@gmail.com> parents: 1382 diff changeset	20
1394 c4055968f030 maps: use regex for better comment handling Sean Farley <sean.michael.farley@gmail.com> parents: 1393 diff changeset	21 self._commentre = re.compile(r'((^\|[^\\])(\\\\))#.')
1401 70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	22 self.syntaxes = ('re', 'glob')
1394 c4055968f030 maps: use regex for better comment handling Sean Farley <sean.michael.farley@gmail.com> parents: 1393 diff changeset	23
1383 73c76f99ca08 maps: add a basemap class Sean Farley <sean.michael.farley@gmail.com> parents: 1382 diff changeset	24 # trickery: all subclasses have the same name as their file and config
73c76f99ca08 maps: add a basemap class Sean Farley <sean.michael.farley@gmail.com> parents: 1382 diff changeset	25 # names, e.g. AuthorMap is meta.authormap_file for the filename and
73c76f99ca08 maps: add a basemap class Sean Farley <sean.michael.farley@gmail.com> parents: 1382 diff changeset	26 # 'authormap' for the config option
73c76f99ca08 maps: add a basemap class Sean Farley <sean.michael.farley@gmail.com> parents: 1382 diff changeset	27 self.mapname = self.__class__.__name__.lower()
73c76f99ca08 maps: add a basemap class Sean Farley <sean.michael.farley@gmail.com> parents: 1382 diff changeset	28 self.mapfilename = self.mapname + '_file'
1431 066c08918060 BaseMap: record filename on self._filename Augie Fackler <raf@durin42.com> parents: 1430 diff changeset	29 self._filepath = self.meta.__getattribute__(self.mapfilename)
066c08918060 BaseMap: record filename on self._filename Augie Fackler <raf@durin42.com> parents: 1430 diff changeset	30 self.load(self._filepath)
1383 73c76f99ca08 maps: add a basemap class Sean Farley <sean.michael.farley@gmail.com> parents: 1382 diff changeset	31
73c76f99ca08 maps: add a basemap class Sean Farley <sean.michael.farley@gmail.com> parents: 1382 diff changeset	32 # append mappings specified from the commandline
1428 da272633997f maps: store a direct reference to ui Augie Fackler <raf@durin42.com> parents: 1427 diff changeset	33 clmap = util.configpath(self._ui, self.mapname)
1383 73c76f99ca08 maps: add a basemap class Sean Farley <sean.michael.farley@gmail.com> parents: 1382 diff changeset	34 if clmap:
73c76f99ca08 maps: add a basemap class Sean Farley <sean.michael.farley@gmail.com> parents: 1382 diff changeset	35 self.load(clmap)
73c76f99ca08 maps: add a basemap class Sean Farley <sean.michael.farley@gmail.com> parents: 1382 diff changeset	36
1395 53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	37 def _findkey(self, key):
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	38 '''Takes a string and finds the first corresponding key that matches
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	39 via regex'''
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	40 if not key:
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	41 return None
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	42
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	43 # compile a new regex key if we're given a string; can't use
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	44 # hgutil.compilere since we need regex.sub
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	45 k = key
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	46 if isinstance(key, str):
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	47 k = re.compile(re.escape(key))
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	48
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	49 # preference goes to matching the exact pattern, i.e. 'foo' should
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	50 # first match 'foo' before trying regexes
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	51 for regex in self:
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	52 if regex.pattern == k.pattern:
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	53 return regex
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	54
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	55 # if key isn't a string, then we are done; nothing matches
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	56 if not isinstance(key, str):
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	57 return None
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	58
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	59 # now we test the regex; the above loop will be faster and is
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	60 # equivalent to not having regexes (i.e. just doing string compares)
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	61 for regex in self:
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	62 if regex.search(key):
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	63 return regex
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	64 return None
53184be1b1fd maps: add _findkey method Sean Farley <sean.michael.farley@gmail.com> parents: 1394 diff changeset	65
1396 77594c88d91f maps: add custom get method Sean Farley <sean.michael.farley@gmail.com> parents: 1395 diff changeset	66 def get(self, key, default=None):
77594c88d91f maps: add custom get method Sean Farley <sean.michael.farley@gmail.com> parents: 1395 diff changeset	67 '''Similar to dict.get, except we use our own matcher, _findkey.'''
77594c88d91f maps: add custom get method Sean Farley <sean.michael.farley@gmail.com> parents: 1395 diff changeset	68 if self._findkey(key):
77594c88d91f maps: add custom get method Sean Farley <sean.michael.farley@gmail.com> parents: 1395 diff changeset	69 return self[key]
77594c88d91f maps: add custom get method Sean Farley <sean.michael.farley@gmail.com> parents: 1395 diff changeset	70 return default
77594c88d91f maps: add custom get method Sean Farley <sean.michael.farley@gmail.com> parents: 1395 diff changeset	71
1397 304fdb9810a6 maps: add custom __getitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1396 diff changeset	72 def __getitem__(self, key):
304fdb9810a6 maps: add custom __getitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1396 diff changeset	73 '''Similar to dict.get, except we use our own matcher, _findkey. If the key is
304fdb9810a6 maps: add custom __getitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1396 diff changeset	74 a string, then we can use our regex matching to map its value.
304fdb9810a6 maps: add custom __getitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1396 diff changeset	75 '''
304fdb9810a6 maps: add custom __getitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1396 diff changeset	76 k = self._findkey(key)
304fdb9810a6 maps: add custom __getitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1396 diff changeset	77 val = super(BaseMap, self).__getitem__(k)
304fdb9810a6 maps: add custom __getitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1396 diff changeset	78
304fdb9810a6 maps: add custom __getitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1396 diff changeset	79 # if key is a string then we can transform it using our regex, else we
304fdb9810a6 maps: add custom __getitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1396 diff changeset	80 # don't have enough information, so we just return the val
304fdb9810a6 maps: add custom __getitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1396 diff changeset	81 if isinstance(key, str):
304fdb9810a6 maps: add custom __getitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1396 diff changeset	82 val = k.sub(val, key)
304fdb9810a6 maps: add custom __getitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1396 diff changeset	83
304fdb9810a6 maps: add custom __getitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1396 diff changeset	84 return val
304fdb9810a6 maps: add custom __getitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1396 diff changeset	85
1398 75745298d99d maps: add custom __setitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1397 diff changeset	86 def __setitem__(self, key, value):
75745298d99d maps: add custom __setitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1397 diff changeset	87 '''Similar to dict.__setitem__, except we compile the string into a regex, if
75745298d99d maps: add custom __setitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1397 diff changeset	88 need be.
75745298d99d maps: add custom __setitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1397 diff changeset	89 '''
75745298d99d maps: add custom __setitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1397 diff changeset	90 # try to find the regex already in the map
75745298d99d maps: add custom __setitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1397 diff changeset	91 k = self._findkey(key)
75745298d99d maps: add custom __setitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1397 diff changeset	92 # if we found one, then use it
75745298d99d maps: add custom __setitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1397 diff changeset	93 if k:
75745298d99d maps: add custom __setitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1397 diff changeset	94 key = k
75745298d99d maps: add custom __setitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1397 diff changeset	95 # else make a new regex
75745298d99d maps: add custom __setitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1397 diff changeset	96 if isinstance(key, str):
75745298d99d maps: add custom __setitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1397 diff changeset	97 key = re.compile(re.escape(key))
75745298d99d maps: add custom __setitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1397 diff changeset	98 super(BaseMap, self).__setitem__(key, value)
75745298d99d maps: add custom __setitem__ Sean Farley <sean.michael.farley@gmail.com> parents: 1397 diff changeset	99
1399 3b96075bffa7 maps: add custom __contains__ Sean Farley <sean.michael.farley@gmail.com> parents: 1398 diff changeset	100 def __contains__(self, key):
3b96075bffa7 maps: add custom __contains__ Sean Farley <sean.michael.farley@gmail.com> parents: 1398 diff changeset	101 '''Similar to dict.get, except we use our own matcher, _findkey.'''
3b96075bffa7 maps: add custom __contains__ Sean Farley <sean.michael.farley@gmail.com> parents: 1398 diff changeset	102 return self._findkey(key) is not None
3b96075bffa7 maps: add custom __contains__ Sean Farley <sean.michael.farley@gmail.com> parents: 1398 diff changeset	103
1384 2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	104 def load(self, path):
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	105 '''Load mappings from a file at the specified path.'''
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	106 path = os.path.expandvars(path)
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	107 if not os.path.exists(path):
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	108 return
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	109
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	110 writing = False
1431 066c08918060 BaseMap: record filename on self._filename Augie Fackler <raf@durin42.com> parents: 1430 diff changeset	111 mapfile = self._filepath
1384 2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	112 if path != mapfile:
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	113 writing = open(mapfile, 'a')
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	114
1428 da272633997f maps: store a direct reference to ui Augie Fackler <raf@durin42.com> parents: 1427 diff changeset	115 self._ui.debug('reading %s from %s\n' % (self.mapname , path))
1384 2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	116 f = open(path, 'r')
1401 70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	117 syntax = ''
1384 2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	118 for number, line in enumerate(f):
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	119
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	120 if writing:
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	121 writing.write(line)
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	122
1394 c4055968f030 maps: use regex for better comment handling Sean Farley <sean.michael.farley@gmail.com> parents: 1393 diff changeset	123 # strip out comments
c4055968f030 maps: use regex for better comment handling Sean Farley <sean.michael.farley@gmail.com> parents: 1393 diff changeset	124 if "#" in line:
c4055968f030 maps: use regex for better comment handling Sean Farley <sean.michael.farley@gmail.com> parents: 1393 diff changeset	125 # remove comments prefixed by an even number of escapes
c4055968f030 maps: use regex for better comment handling Sean Farley <sean.michael.farley@gmail.com> parents: 1393 diff changeset	126 line = self._commentre.sub(r'\1', line)
c4055968f030 maps: use regex for better comment handling Sean Farley <sean.michael.farley@gmail.com> parents: 1393 diff changeset	127 # fixup properly escaped comments that survived the above
c4055968f030 maps: use regex for better comment handling Sean Farley <sean.michael.farley@gmail.com> parents: 1393 diff changeset	128 line = line.replace("\\#", "#")
c4055968f030 maps: use regex for better comment handling Sean Farley <sean.michael.farley@gmail.com> parents: 1393 diff changeset	129 line = line.rstrip()
c4055968f030 maps: use regex for better comment handling Sean Farley <sean.michael.farley@gmail.com> parents: 1393 diff changeset	130 if not line:
1384 2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	131 continue
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	132
1401 70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	133 if line.startswith('syntax:'):
70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	134 s = line[7:].strip()
70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	135 syntax = ''
70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	136 if s in self.syntaxes:
70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	137 syntax = s
70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	138 continue
70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	139 pat = syntax
70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	140 for s in self.syntaxes:
70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	141 if line.startswith(s + ':'):
70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	142 pat = s
70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	143 line = line[len(s) + 1:]
70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	144 break
70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	145
70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	146 # split on the first '='
1384 2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	147 try:
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	148 src, dst = line.split('=', 1)
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	149 except (IndexError, ValueError):
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	150 msg = 'ignoring line %i in %s %s: %s\n'
1428 da272633997f maps: store a direct reference to ui Augie Fackler <raf@durin42.com> parents: 1427 diff changeset	151 self._ui.status(msg % (number, self.mapname, path,
1384 2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	152 line.rstrip()))
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	153 continue
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	154
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	155 src = src.strip()
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	156 dst = dst.strip()
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	157
1401 70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	158 if pat != 're':
70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	159 src = re.escape(src)
70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	160 if pat == 'glob':
70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	161 src = src.replace('\\', '.')
70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	162 src = re.compile(src)
70cb6ba038fa maps: add ability to parse a regex or glob Sean Farley <sean.michael.farley@gmail.com> parents: 1400 diff changeset	163
1384 2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	164 if src not in self:
1428 da272633997f maps: store a direct reference to ui Augie Fackler <raf@durin42.com> parents: 1427 diff changeset	165 self._ui.debug('adding %s to %s\n' % (src, self.mapname))
1384 2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	166 elif dst != self[src]:
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	167 msg = 'overriding %s: "%s" to "%s" (%s)\n'
1428 da272633997f maps: store a direct reference to ui Augie Fackler <raf@durin42.com> parents: 1427 diff changeset	168 self._ui.status(msg % (self.mapname, self[src], dst, src))
1384 2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	169 self[src] = dst
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	170
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	171 f.close()
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	172 if writing:
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	173 writing.close()
2d1d05e6e46c maps: add a load method to base map Sean Farley <sean.michael.farley@gmail.com> parents: 1383 diff changeset	174
1385 9139d9295a36 maps: make author map inherit from base map Sean Farley <sean.michael.farley@gmail.com> parents: 1384 diff changeset	175 class AuthorMap(BaseMap):
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	176 '''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	177 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	178
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	179 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	180 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	181
1097 e015cd34168d authormap: allow case-insensitive authormaps for easier conversions maugustin parents: 976 diff changeset	182 If the 'hgsubversion.caseignoreauthors' configuration option is set to true,
e015cd34168d authormap: allow case-insensitive authormaps for easier conversions maugustin parents: 976 diff changeset	183 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	184 '''
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	185
1429 3a723188051e AuthorMap: make local implementation concerns stop using self.meta Augie Fackler <raf@durin42.com> parents: 1428 diff changeset	186 def __init__(self, meta, defaulthost, caseignoreauthors,
3a723188051e AuthorMap: make local implementation concerns stop using self.meta Augie Fackler <raf@durin42.com> parents: 1428 diff changeset	187 mapauthorscmd, defaultauthors):
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	188 '''Initialise a new AuthorMap.
322 05cd4a5138bf Move some .warn() calls to noisy levels instead. Augie Fackler <durin42@gmail.com> parents: 310 diff changeset	189
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	190 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	191
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	192 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	193 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	194 '''
1429 3a723188051e AuthorMap: make local implementation concerns stop using self.meta Augie Fackler <raf@durin42.com> parents: 1428 diff changeset	195 if defaulthost:
3a723188051e AuthorMap: make local implementation concerns stop using self.meta Augie Fackler <raf@durin42.com> parents: 1428 diff changeset	196 self.defaulthost = '@%s' % defaulthost.lstrip('@')
3a723188051e AuthorMap: make local implementation concerns stop using self.meta Augie Fackler <raf@durin42.com> parents: 1428 diff changeset	197 else:
3a723188051e AuthorMap: make local implementation concerns stop using self.meta Augie Fackler <raf@durin42.com> parents: 1428 diff changeset	198 self.defaulthost = ''
3a723188051e AuthorMap: make local implementation concerns stop using self.meta Augie Fackler <raf@durin42.com> parents: 1428 diff changeset	199 self._caseignoreauthors = caseignoreauthors
3a723188051e AuthorMap: make local implementation concerns stop using self.meta Augie Fackler <raf@durin42.com> parents: 1428 diff changeset	200 self._mapauthorscmd = mapauthorscmd
3a723188051e AuthorMap: make local implementation concerns stop using self.meta Augie Fackler <raf@durin42.com> parents: 1428 diff changeset	201 self._defaulthost = defaulthost
3a723188051e AuthorMap: make local implementation concerns stop using self.meta Augie Fackler <raf@durin42.com> parents: 1428 diff changeset	202 self._defaultauthors = defaultauthors
1194 49791c40a8a5 maps: change authormap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1193 diff changeset	203
1386 8bd40916106f maps: remove unneeded __init__ code from author map Sean Farley <sean.michael.farley@gmail.com> parents: 1385 diff changeset	204 super(AuthorMap, self).__init__(meta)
1193 a55339d35066 maps: load commandline authormap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1188 diff changeset	205
1400 3e264851f879 maps: protect author map functions from regexes Sean Farley <sean.michael.farley@gmail.com> parents: 1399 diff changeset	206 def _lowercase(self, key):
3e264851f879 maps: protect author map functions from regexes Sean Farley <sean.michael.farley@gmail.com> parents: 1399 diff changeset	207 '''Determine whether or not to lowercase a str or regex using the
3e264851f879 maps: protect author map functions from regexes Sean Farley <sean.michael.farley@gmail.com> parents: 1399 diff changeset	208 meta.caseignoreauthors.'''
3e264851f879 maps: protect author map functions from regexes Sean Farley <sean.michael.farley@gmail.com> parents: 1399 diff changeset	209 k = key
1429 3a723188051e AuthorMap: make local implementation concerns stop using self.meta Augie Fackler <raf@durin42.com> parents: 1428 diff changeset	210 if self._caseignoreauthors:
1400 3e264851f879 maps: protect author map functions from regexes Sean Farley <sean.michael.farley@gmail.com> parents: 1399 diff changeset	211 if isinstance(key, str):
3e264851f879 maps: protect author map functions from regexes Sean Farley <sean.michael.farley@gmail.com> parents: 1399 diff changeset	212 k = key.lower()
3e264851f879 maps: protect author map functions from regexes Sean Farley <sean.michael.farley@gmail.com> parents: 1399 diff changeset	213 else:
3e264851f879 maps: protect author map functions from regexes Sean Farley <sean.michael.farley@gmail.com> parents: 1399 diff changeset	214 k = re.compile(key.pattern.lower())
3e264851f879 maps: protect author map functions from regexes Sean Farley <sean.michael.farley@gmail.com> parents: 1399 diff changeset	215 return k
3e264851f879 maps: protect author map functions from regexes Sean Farley <sean.michael.farley@gmail.com> parents: 1399 diff changeset	216
1379 367e65989b41 maps: add custom __setitem__ to author map Sean Farley <sean.michael.farley@gmail.com> parents: 1375 diff changeset	217 def __setitem__(self, key, value):
367e65989b41 maps: add custom __setitem__ to author map Sean Farley <sean.michael.farley@gmail.com> parents: 1375 diff changeset	218 '''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	219 use lowercase string or not
367e65989b41 maps: add custom __setitem__ to author map Sean Farley <sean.michael.farley@gmail.com> parents: 1375 diff changeset	220 '''
1400 3e264851f879 maps: protect author map functions from regexes Sean Farley <sean.michael.farley@gmail.com> parents: 1399 diff changeset	221 super(AuthorMap, self).__setitem__(self._lowercase(key), value)
1379 367e65989b41 maps: add custom __setitem__ to author map Sean Farley <sean.michael.farley@gmail.com> parents: 1375 diff changeset	222
1380 332ad9ea579b maps: add custom __contains__ to author map Sean Farley <sean.michael.farley@gmail.com> parents: 1379 diff changeset	223 def __contains__(self, key):
332ad9ea579b maps: add custom __contains__ to author map Sean Farley <sean.michael.farley@gmail.com> parents: 1379 diff changeset	224 '''Similar to dict.__contains__, except we check caseignoreauthors to
332ad9ea579b maps: add custom __contains__ to author map Sean Farley <sean.michael.farley@gmail.com> parents: 1379 diff changeset	225 use lowercase string or not
332ad9ea579b maps: add custom __contains__ to author map Sean Farley <sean.michael.farley@gmail.com> parents: 1379 diff changeset	226 '''
1400 3e264851f879 maps: protect author map functions from regexes Sean Farley <sean.michael.farley@gmail.com> parents: 1399 diff changeset	227 return super(AuthorMap, self).__contains__(self._lowercase(key))
1380 332ad9ea579b maps: add custom __contains__ to author map Sean Farley <sean.michael.farley@gmail.com> parents: 1379 diff changeset	228
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	229 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	230 ''' 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	231 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	232 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	233 if author is None:
c2b9e08ecf10 maps: map a missing author to '(no author)' Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 729 diff changeset	234 author = '(no author)'
1097 e015cd34168d authormap: allow case-insensitive authormaps for easier conversions maugustin parents: 976 diff changeset	235
1400 3e264851f879 maps: protect author map functions from regexes Sean Farley <sean.michael.farley@gmail.com> parents: 1399 diff changeset	236 if not isinstance(author, str):
3e264851f879 maps: protect author map functions from regexes Sean Farley <sean.michael.farley@gmail.com> parents: 1399 diff changeset	237 return super(AuthorMap, self).__getitem__(author)
3e264851f879 maps: protect author map functions from regexes Sean Farley <sean.michael.farley@gmail.com> parents: 1399 diff changeset	238
1196 878372849175 maps: use meta.caseignoreauthors intead of accessing ui directly Sean Farley <sean.michael.farley@gmail.com> parents: 1195 diff changeset	239 search_author = author
1429 3a723188051e AuthorMap: make local implementation concerns stop using self.meta Augie Fackler <raf@durin42.com> parents: 1428 diff changeset	240 if self._caseignoreauthors:
1097 e015cd34168d authormap: allow case-insensitive authormaps for easier conversions maugustin parents: 976 diff changeset	241 search_author = author.lower()
e015cd34168d authormap: allow case-insensitive authormaps for easier conversions maugustin parents: 976 diff changeset	242
1374 a17d8874a099 Added dynamic author mapping. Jerome M. BERGER <jeberger@free.fr> parents: 1356 diff changeset	243 result = None
1097 e015cd34168d authormap: allow case-insensitive authormaps for easier conversions maugustin parents: 976 diff changeset	244 if search_author in self:
1382 d996850ac4e8 maps: call super directly instead of self.super Sean Farley <sean.michael.farley@gmail.com> parents: 1381 diff changeset	245 result = super(AuthorMap, self).__getitem__(search_author)
1429 3a723188051e AuthorMap: make local implementation concerns stop using self.meta Augie Fackler <raf@durin42.com> parents: 1428 diff changeset	246 elif self._mapauthorscmd:
3a723188051e AuthorMap: make local implementation concerns stop using self.meta Augie Fackler <raf@durin42.com> parents: 1428 diff changeset	247 cmd = self._mapauthorscmd % author
1375 abc87a62ff51 maps: remove python2.7ism from dynamic author mapping Mateusz Kwapich <mitrandir@fb.com> parents: 1374 diff changeset	248 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	249 output, err = process.communicate()
abc87a62ff51 maps: remove python2.7ism from dynamic author mapping Mateusz Kwapich <mitrandir@fb.com> parents: 1374 diff changeset	250 retcode = process.poll()
abc87a62ff51 maps: remove python2.7ism from dynamic author mapping Mateusz Kwapich <mitrandir@fb.com> parents: 1374 diff changeset	251 if retcode:
abc87a62ff51 maps: remove python2.7ism from dynamic author mapping Mateusz Kwapich <mitrandir@fb.com> parents: 1374 diff changeset	252 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	253 raise hgutil.Abort(msg % cmd)
abc87a62ff51 maps: remove python2.7ism from dynamic author mapping Mateusz Kwapich <mitrandir@fb.com> parents: 1374 diff changeset	254 self[author] = result = output.strip()
1374 a17d8874a099 Added dynamic author mapping. Jerome M. BERGER <jeberger@free.fr> parents: 1356 diff changeset	255 if not result:
1429 3a723188051e AuthorMap: make local implementation concerns stop using self.meta Augie Fackler <raf@durin42.com> parents: 1428 diff changeset	256 if self._defaultauthors:
1374 a17d8874a099 Added dynamic author mapping. Jerome M. BERGER <jeberger@free.fr> parents: 1356 diff changeset	257 self[author] = result = '%s%s' % (author, self.defaulthost)
a17d8874a099 Added dynamic author mapping. Jerome M. BERGER <jeberger@free.fr> parents: 1356 diff changeset	258 msg = 'substituting author "%s" for default "%s"\n'
1428 da272633997f maps: store a direct reference to ui Augie Fackler <raf@durin42.com> parents: 1427 diff changeset	259 self._ui.debug(msg % (author, result))
1374 a17d8874a099 Added dynamic author mapping. Jerome M. BERGER <jeberger@free.fr> parents: 1356 diff changeset	260 else:
a17d8874a099 Added dynamic author mapping. Jerome M. BERGER <jeberger@free.fr> parents: 1356 diff changeset	261 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	262 raise hgutil.Abort(msg % author)
1428 da272633997f maps: store a direct reference to ui Augie Fackler <raf@durin42.com> parents: 1427 diff changeset	263 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	264 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	265
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	266 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	267 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	268 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	269 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	270 else:
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: diff changeset	271 # 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	272 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	273
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	274
728 cfefeefad199 rename TagMap to Tags, to free up the TagMap name Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 725 diff changeset	275 class Tags(dict):
519 247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	276 """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	277
729 467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	278 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	279 called tagmap, for backwards compatibility reasons.
519 247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	280 """
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	281 VERSION = 2
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	282
1187 30b2139c3931 maps: change tags init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1186 diff changeset	283 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	284 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	285 self.meta = meta
1432 a2ef2c1e3644 TagMap: record filepath explicitly Augie Fackler <raf@durin42.com> parents: 1431 diff changeset	286 self._filepath = meta.tagfile
1428 da272633997f maps: store a direct reference to ui Augie Fackler <raf@durin42.com> parents: 1427 diff changeset	287 self._ui = meta.ui
725 c787147fa3b7 fix some style nits Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 647 diff changeset	288 self.endrev = endrev
1432 a2ef2c1e3644 TagMap: record filepath explicitly Augie Fackler <raf@durin42.com> parents: 1431 diff changeset	289 if os.path.isfile(self._filepath):
1187 30b2139c3931 maps: change tags init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1186 diff changeset	290 self._load()
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	291 else:
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	292 self._write()
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	293
1187 30b2139c3931 maps: change tags init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1186 diff changeset	294 def _load(self):
1432 a2ef2c1e3644 TagMap: record filepath explicitly Augie Fackler <raf@durin42.com> parents: 1431 diff changeset	295 f = open(self._filepath)
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	296 ver = int(f.readline())
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	297 if ver < self.VERSION:
1428 da272633997f maps: store a direct reference to ui Augie Fackler <raf@durin42.com> parents: 1427 diff changeset	298 self._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	299 f.close()
1432 a2ef2c1e3644 TagMap: record filepath explicitly Augie Fackler <raf@durin42.com> parents: 1431 diff changeset	300 os.unlink(self._filepath)
1428 da272633997f maps: store a direct reference to ui Augie Fackler <raf@durin42.com> parents: 1427 diff changeset	301 svncommands.rebuildmeta(self._ui, self.meta.repo, ())
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	302 return
bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	303 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	304 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	305 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	306 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	307 revision = int(revision)
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	308 tag = tag[:-1]
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	309 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	310 break
519 247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	311 if not tag:
247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	312 continue
1253 c54214bb6c4e maps: avoid O(n) property lookups on the node module Siddharth Agarwal <sid0@fb.com> parents: 1252 diff changeset	313 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	314 f.close()
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	315
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	316 def _write(self):
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	317 assert self.endrev is None
1432 a2ef2c1e3644 TagMap: record filepath explicitly Augie Fackler <raf@durin42.com> parents: 1431 diff changeset	318 f = open(self._filepath, 'w')
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	319 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	320 f.close()
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	321
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	322 def update(self, other):
725 c787147fa3b7 fix some style nits Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 647 diff changeset	323 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	324 self[k] = v
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	325
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	326 def __contains__(self, tag):
593 eb16630bceb1 maps: fix a % formatting bug Augie Fackler <durin42@gmail.com> parents: 579 diff changeset	327 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	328 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	329
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	330 def __getitem__(self, tag):
519 247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	331 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	332 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	333 raise KeyError()
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	334
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	335 def __setitem__(self, tag, info):
519 247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	336 if not tag:
247110c633f7 maps: TagMap tags are non-empty strings Patrick Mezard <pmezard@gmail.com> parents: 460 diff changeset	337 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	338 ha, revision = info
1432 a2ef2c1e3644 TagMap: record filepath explicitly Augie Fackler <raf@durin42.com> parents: 1431 diff changeset	339 f = open(self._filepath, 'a')
1253 c54214bb6c4e maps: avoid O(n) property lookups on the node module Siddharth Agarwal <sid0@fb.com> parents: 1252 diff changeset	340 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	341 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	342 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	343
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 430 diff changeset	344
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	345 class RevMap(dict):
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	346
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	347 VERSION = 1
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	348
1183 09b20039192c maps: change revmap init to accept svnmeta not a repo Sean Farley <sean.michael.farley@gmail.com> parents: 1182 diff changeset	349 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	350 dict.__init__(self)
1430 48beb467b2e5 RevMap: use self._filepath instead of using meta Augie Fackler <raf@durin42.com> parents: 1429 diff changeset	351 self._filepath = meta.revmap_file
1434 0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	352 self._lastpulled_file = os.path.join(meta.metapath, 'lastpulled')
1294 9a722b5246df maps: cache hashes() for the revmap Mateusz Kwapich <mitrandir@fb.com> parents: 1254 diff changeset	353 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	354
1434 0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	355 self.firstpulled = 0
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	356 if os.path.exists(self._lastpulled_file):
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	357 with open(self._lastpulled_file) as f:
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	358 self._lastpulled = int(f.read())
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	359 else:
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	360 self._lastpulled = 0
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	361
1430 48beb467b2e5 RevMap: use self._filepath instead of using meta Augie Fackler <raf@durin42.com> parents: 1429 diff changeset	362 if os.path.isfile(self._filepath):
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	363 self._load()
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	364 else:
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	365 self._write()
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	366
1434 0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	367 def _writelastpulled(self):
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	368 with open(self._lastpulled_file, 'w') as f:
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	369 f.write('%d\n' % self.lastpulled)
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	370
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	371 @property
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	372 def lastpulled(self):
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	373 return self._lastpulled
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	374
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	375 @lastpulled.setter
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	376 def lastpulled(self, value):
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	377 self._lastpulled = value
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	378 self._writelastpulled()
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	379
415 b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	380 def hashes(self):
1294 9a722b5246df maps: cache hashes() for the revmap Mateusz Kwapich <mitrandir@fb.com> parents: 1254 diff changeset	381 if self._hashes is None:
9a722b5246df maps: cache hashes() for the revmap Mateusz Kwapich <mitrandir@fb.com> parents: 1254 diff changeset	382 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	383 return self._hashes
415 b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	384
b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	385 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	386 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	387 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	388
1422 372afb75f465 maps: add the "branchmaxrevnum" method to RevMap Jun Wu <quark@fb.com> parents: 1421 diff changeset	389 def branchmaxrevnum(self, branch, maxrevnum):
372afb75f465 maps: add the "branchmaxrevnum" method to RevMap Jun Wu <quark@fb.com> parents: 1421 diff changeset	390 result = 0
372afb75f465 maps: add the "branchmaxrevnum" method to RevMap Jun Wu <quark@fb.com> parents: 1421 diff changeset	391 for num, br in self.iterkeys():
372afb75f465 maps: add the "branchmaxrevnum" method to RevMap Jun Wu <quark@fb.com> parents: 1421 diff changeset	392 if br == branch and num <= maxrevnum and num > result:
372afb75f465 maps: add the "branchmaxrevnum" method to RevMap Jun Wu <quark@fb.com> parents: 1421 diff changeset	393 result = num
372afb75f465 maps: add the "branchmaxrevnum" method to RevMap Jun Wu <quark@fb.com> parents: 1421 diff changeset	394 return result
372afb75f465 maps: add the "branchmaxrevnum" method to RevMap Jun Wu <quark@fb.com> parents: 1421 diff changeset	395
1419 2e4145e452cd maps: add "lasthash" property to RevMap Jun Wu <quark@fb.com> parents: 1414 diff changeset	396 @property
2e4145e452cd maps: add "lasthash" property to RevMap Jun Wu <quark@fb.com> parents: 1414 diff changeset	397 def lasthash(self):
1421 0094f222c5dc maps: make readmapfile of RevMap a private instance method Jun Wu <quark@fb.com> parents: 1419 diff changeset	398 lines = list(self._readmapfile())
1419 2e4145e452cd maps: add "lasthash" property to RevMap Jun Wu <quark@fb.com> parents: 1414 diff changeset	399 if not lines:
2e4145e452cd maps: add "lasthash" property to RevMap Jun Wu <quark@fb.com> parents: 1414 diff changeset	400 return None
2e4145e452cd maps: add "lasthash" property to RevMap Jun Wu <quark@fb.com> parents: 1414 diff changeset	401 return bin(lines[-1].split(' ', 2)[1])
2e4145e452cd maps: add "lasthash" property to RevMap Jun Wu <quark@fb.com> parents: 1414 diff changeset	402
1413 951a87f2f2bd maps: add the "revhashes" method to RevMap Jun Wu <quark@fb.com> parents: 1412 diff changeset	403 def revhashes(self, revnum):
951a87f2f2bd maps: add the "revhashes" method to RevMap Jun Wu <quark@fb.com> parents: 1412 diff changeset	404 for key, value in self.iteritems():
951a87f2f2bd maps: add the "revhashes" method to RevMap Jun Wu <quark@fb.com> parents: 1412 diff changeset	405 if key[0] == revnum:
951a87f2f2bd maps: add the "revhashes" method to RevMap Jun Wu <quark@fb.com> parents: 1412 diff changeset	406 yield value
951a87f2f2bd maps: add the "revhashes" method to RevMap Jun Wu <quark@fb.com> parents: 1412 diff changeset	407
1411 025e849d22f0 maps: add the "clear" method to RevMap Jun Wu <quark@fb.com> parents: 1401 diff changeset	408 def clear(self):
025e849d22f0 maps: add the "clear" method to RevMap Jun Wu <quark@fb.com> parents: 1401 diff changeset	409 self._write()
025e849d22f0 maps: add the "clear" method to RevMap Jun Wu <quark@fb.com> parents: 1401 diff changeset	410 dict.clear(self)
025e849d22f0 maps: add the "clear" method to RevMap Jun Wu <quark@fb.com> parents: 1401 diff changeset	411 self._hashes = None
025e849d22f0 maps: add the "clear" method to RevMap Jun Wu <quark@fb.com> parents: 1401 diff changeset	412
1434 0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	413 def batchset(self, items, lastpulled):
1412 7e98352a37db maps: add the "batchset" method to RevMap Jun Wu <quark@fb.com> parents: 1411 diff changeset	414 '''Set items in batches
7e98352a37db maps: add the "batchset" method to RevMap Jun Wu <quark@fb.com> parents: 1411 diff changeset	415
7e98352a37db maps: add the "batchset" method to RevMap Jun Wu <quark@fb.com> parents: 1411 diff changeset	416 items is an array of (rev num, branch, binary hash)
7e98352a37db maps: add the "batchset" method to RevMap Jun Wu <quark@fb.com> parents: 1411 diff changeset	417
1424 a794cbc174a9 maps: document RevMap.batchset will not update internal state Jun Wu <quark@fb.com> parents: 1422 diff changeset	418 For performance reason, internal in-memory state is not updated.
a794cbc174a9 maps: document RevMap.batchset will not update internal state Jun Wu <quark@fb.com> parents: 1422 diff changeset	419 To get an up-to-date RevMap, reconstruct the object.
1412 7e98352a37db maps: add the "batchset" method to RevMap Jun Wu <quark@fb.com> parents: 1411 diff changeset	420 '''
1435 18a961672a72 maps: switch many file opens to using the with statement Augie Fackler <raf@durin42.com> parents: 1434 diff changeset	421 with open(self._filepath, 'a') as f:
18a961672a72 maps: switch many file opens to using the with statement Augie Fackler <raf@durin42.com> parents: 1434 diff changeset	422 f.write(''.join('%s %s %s\n' % (revnum, hex(binhash), br or '')
18a961672a72 maps: switch many file opens to using the with statement Augie Fackler <raf@durin42.com> parents: 1434 diff changeset	423 for revnum, br, binhash in items))
1434 0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	424 with open(self._lastpulled_file, 'w') as f:
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	425 f.write('%s\n' % lastpulled)
1412 7e98352a37db maps: add the "batchset" method to RevMap Jun Wu <quark@fb.com> parents: 1411 diff changeset	426
1421 0094f222c5dc maps: make readmapfile of RevMap a private instance method Jun Wu <quark@fb.com> parents: 1419 diff changeset	427 def _readmapfile(self):
1430 48beb467b2e5 RevMap: use self._filepath instead of using meta Augie Fackler <raf@durin42.com> parents: 1429 diff changeset	428 path = self._filepath
889 7a98fbadcae9 revsets: huge speedups for fromsvn and svnrev Bryan O'Sullivan <bryano@fb.com> parents: 847 diff changeset	429 try:
1182 8f9619a67565 maps: change readmapfile to take a path instead of repo Sean Farley <sean.michael.farley@gmail.com> parents: 1144 diff changeset	430 f = open(path)
889 7a98fbadcae9 revsets: huge speedups for fromsvn and svnrev Bryan O'Sullivan <bryano@fb.com> parents: 847 diff changeset	431 except IOError, err:
1421 0094f222c5dc maps: make readmapfile of RevMap a private instance method Jun Wu <quark@fb.com> parents: 1419 diff changeset	432 if err.errno != errno.ENOENT:
889 7a98fbadcae9 revsets: huge speedups for fromsvn and svnrev Bryan O'Sullivan <bryano@fb.com> parents: 847 diff changeset	433 raise
7a98fbadcae9 revsets: huge speedups for fromsvn and svnrev Bryan O'Sullivan <bryano@fb.com> parents: 847 diff changeset	434 return iter([])
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	435 ver = int(f.readline())
1421 0094f222c5dc maps: make readmapfile of RevMap a private instance method Jun Wu <quark@fb.com> parents: 1419 diff changeset	436 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	437 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	438 return f
7a98fbadcae9 revsets: huge speedups for fromsvn and svnrev Bryan O'Sullivan <bryano@fb.com> parents: 847 diff changeset	439
1414 99bc6003ac56 maps: add the "exists" method to RevMap Jun Wu <quark@fb.com> parents: 1413 diff changeset	440 @classmethod
99bc6003ac56 maps: add the "exists" method to RevMap Jun Wu <quark@fb.com> parents: 1413 diff changeset	441 def exists(cls, meta):
99bc6003ac56 maps: add the "exists" method to RevMap Jun Wu <quark@fb.com> parents: 1413 diff changeset	442 return os.path.exists(meta.revmap_file)
99bc6003ac56 maps: add the "exists" method to RevMap Jun Wu <quark@fb.com> parents: 1413 diff changeset	443
1251 46cec117dda2 maps.RevMap: disable GC while loading the revmap Siddharth Agarwal <sid0@fb.com> parents: 1217 diff changeset	444 @util.gcdisable
889 7a98fbadcae9 revsets: huge speedups for fromsvn and svnrev Bryan O'Sullivan <bryano@fb.com> parents: 847 diff changeset	445 def _load(self):
1434 0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	446 lastpulled = self.lastpulled
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	447 firstpulled = self.firstpulled
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	448 if os.path.exists(self._lastpulled_file):
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	449 with open(self._lastpulled_file) as f:
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	450 lastpulled = int(f.read())
1254 d07ccad28b1a maps.RevMap: avoid O(revs) property lookups on dict Siddharth Agarwal <sid0@fb.com> parents: 1253 diff changeset	451 setitem = dict.__setitem__
1421 0094f222c5dc maps: make readmapfile of RevMap a private instance method Jun Wu <quark@fb.com> parents: 1419 diff changeset	452 for l in self._readmapfile():
826 8794302f3614 maps: s/hash/ha/ and s/map/m/ to avoid hiding Python builtins Yonggang Luo <luoyonggang@gmail.com> parents: 822 diff changeset	453 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	454 if branch == '\n':
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	455 branch = None
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	456 else:
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	457 branch = branch[:-1]
415 b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	458 revnum = int(revnum)
1252 a321afbc3479 maps.RevMap: while loading, read lastpulled and firstpulled once Siddharth Agarwal <sid0@fb.com> parents: 1251 diff changeset	459 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	460 lastpulled = revnum
a321afbc3479 maps.RevMap: while loading, read lastpulled and firstpulled once Siddharth Agarwal <sid0@fb.com> parents: 1251 diff changeset	461 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	462 firstpulled = revnum
1254 d07ccad28b1a maps.RevMap: avoid O(revs) property lookups on dict Siddharth Agarwal <sid0@fb.com> parents: 1253 diff changeset	463 setitem(self, (revnum, branch), bin(ha))
1434 0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	464 if self.lastpulled != lastpulled:
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	465 self.lastpulled = lastpulled
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	466 self.firstpulled = firstpulled
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	467
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	468 def _write(self):
1435 18a961672a72 maps: switch many file opens to using the with statement Augie Fackler <raf@durin42.com> parents: 1434 diff changeset	469 with open(self._filepath, 'w') as f:
18a961672a72 maps: switch many file opens to using the with statement Augie Fackler <raf@durin42.com> parents: 1434 diff changeset	470 f.write('%s\n' % self.VERSION)
1434 0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	471 self._writelastpulled()
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	472
826 8794302f3614 maps: s/hash/ha/ and s/map/m/ to avoid hiding Python builtins Yonggang Luo <luoyonggang@gmail.com> parents: 822 diff changeset	473 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	474 revnum, branch = key
f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 360 diff changeset	475 b = branch or ''
1435 18a961672a72 maps: switch many file opens to using the with statement Augie Fackler <raf@durin42.com> parents: 1434 diff changeset	476 with open(self._filepath, 'a') as f:
18a961672a72 maps: switch many file opens to using the with statement Augie Fackler <raf@durin42.com> parents: 1434 diff changeset	477 f.write(str(revnum) + ' ' + hex(ha) + ' ' + b + '\n')
1434 0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	478 if revnum > self.lastpulled or not self.lastpulled:
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	479 self.lastpulled = revnum
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	480 if revnum < self.firstpulled or not self.firstpulled:
0a6b3da6d34c RevMap: move lastpulled from SVNMeta down into RevMap Augie Fackler <raf@durin42.com> parents: 1432 diff changeset	481 self.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	482 dict.__setitem__(self, (revnum, branch), ha)
1294 9a722b5246df maps: cache hashes() for the revmap Mateusz Kwapich <mitrandir@fb.com> parents: 1254 diff changeset	483 if self._hashes is not None:
9a722b5246df maps: cache hashes() for the revmap Mateusz Kwapich <mitrandir@fb.com> parents: 1254 diff changeset	484 self._hashes[ha] = (revnum, branch)
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	485
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	486
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	487 class FileMap(object):
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	488
846 7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	489 VERSION = 1
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	490
1217 a10a4fc69364 maps: change filemap to initialize with an svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1216 diff changeset	491 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	492 '''Initialise a new FileMap.
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	493
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	494 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	495
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	496 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	497 typically .hg/svn/filemap.
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	498 '''
1437 43df01d36f22 FileMap: store filename locally Augie Fackler <raf@durin42.com> parents: 1435 diff changeset	499 self._filename = meta.filemap_file
1428 da272633997f maps: store a direct reference to ui Augie Fackler <raf@durin42.com> parents: 1427 diff changeset	500 self._ui = meta.ui
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	501 self.include = {}
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	502 self.exclude = {}
1437 43df01d36f22 FileMap: store filename locally Augie Fackler <raf@durin42.com> parents: 1435 diff changeset	503 if os.path.isfile(self._filename):
846 7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	504 self._load()
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	505 else:
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	506 self._write()
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	507
1214 2c793092862b maps: load commandline filemap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1213 diff changeset	508 # append file mapping specified from the commandline
1428 da272633997f maps: store a direct reference to ui Augie Fackler <raf@durin42.com> parents: 1427 diff changeset	509 clmap = util.configpath(self._ui, 'filemap')
1214 2c793092862b maps: load commandline filemap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1213 diff changeset	510 if clmap:
2c793092862b maps: load commandline filemap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1213 diff changeset	511 self.load(clmap)
2c793092862b maps: load commandline filemap in __init__ Sean Farley <sean.michael.farley@gmail.com> parents: 1213 diff changeset	512
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	513 def _rpairs(self, name):
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	514 e = len(name)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	515 while e != -1:
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	516 yield name[:e], name[e+1:]
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	517 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	518 yield '.', name
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	519
826 8794302f3614 maps: s/hash/ha/ and s/map/m/ to avoid hiding Python builtins Yonggang Luo <luoyonggang@gmail.com> parents: 822 diff changeset	520 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	521 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	522 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	523 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	524 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	525 return -1
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	526
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	527 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	528 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	529 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	530 if len(self.include):
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	531 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	532 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	533 return True
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	534 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	535 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	536 if len(self.exclude):
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	537 exc = self.check('exclude', path)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	538 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	539 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	540 # 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	541 return inc > exc
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	542
822 033b86e0f56d stupid/filemap: disable this since it doesn't currently work Augie Fackler <durin42@gmail.com> parents: 821 diff changeset	543 # 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	544 def __len__(self):
033b86e0f56d stupid/filemap: disable this since it doesn't currently work Augie Fackler <durin42@gmail.com> parents: 821 diff changeset	545 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	546
826 8794302f3614 maps: s/hash/ha/ and s/map/m/ to avoid hiding Python builtins Yonggang Luo <luoyonggang@gmail.com> parents: 822 diff changeset	547 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	548 mapping = getattr(self, m)
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	549 if path in mapping:
593 eb16630bceb1 maps: fix a % formatting bug Augie Fackler <durin42@gmail.com> parents: 579 diff changeset	550 msg = 'duplicate %s entry in %s: "%s"\n'
1428 da272633997f maps: store a direct reference to ui Augie Fackler <raf@durin42.com> parents: 1427 diff changeset	551 self._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	552 return
956 24fbba02cb8f maps: fix filemap loading --verbose message Patrick Mezard <patrick@mezard.eu> parents: 891 diff changeset	553 bits = m.rstrip('e'), path
1428 da272633997f maps: store a direct reference to ui Augie Fackler <raf@durin42.com> parents: 1427 diff changeset	554 self._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	555 # 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	556 mapping[path] = len(self)
1437 43df01d36f22 FileMap: store filename locally Augie Fackler <raf@durin42.com> parents: 1435 diff changeset	557 if fn != self._filename:
43df01d36f22 FileMap: store filename locally Augie Fackler <raf@durin42.com> parents: 1435 diff changeset	558 with open(self._filename, 'a') as f:
1435 18a961672a72 maps: switch many file opens to using the with statement Augie Fackler <raf@durin42.com> parents: 1434 diff changeset	559 f.write(m + ' ' + path + '\n')
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	560
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	561 def load(self, fn):
1428 da272633997f maps: store a direct reference to ui Augie Fackler <raf@durin42.com> parents: 1427 diff changeset	562 self._ui.debug('reading file map from %s\n' % fn)
1435 18a961672a72 maps: switch many file opens to using the with statement Augie Fackler <raf@durin42.com> parents: 1434 diff changeset	563 with open(fn, 'r') as f:
18a961672a72 maps: switch many file opens to using the with statement Augie Fackler <raf@durin42.com> parents: 1434 diff changeset	564 self.load_fd(f, fn)
846 7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	565
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	566 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	567 for line in f:
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	568 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	569 continue
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	570 try:
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	571 cmd, path = line.split(' ', 1)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	572 cmd = cmd.strip()
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	573 path = path.strip()
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	574 if cmd in ('include', 'exclude'):
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	575 self.add(fn, cmd, path)
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	576 continue
1428 da272633997f maps: store a direct reference to ui Augie Fackler <raf@durin42.com> parents: 1427 diff changeset	577 self._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	578 except IndexError:
d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	579 msg = 'ignoring bad line in filemap %s: %s\n'
1428 da272633997f maps: store a direct reference to ui Augie Fackler <raf@durin42.com> parents: 1427 diff changeset	580 self._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	581
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	582 def _load(self):
1437 43df01d36f22 FileMap: store filename locally Augie Fackler <raf@durin42.com> parents: 1435 diff changeset	583 self._ui.debug('reading in-repo file map from %s\n' % self._filename)
43df01d36f22 FileMap: store filename locally Augie Fackler <raf@durin42.com> parents: 1435 diff changeset	584 with open(self._filename) as f:
1435 18a961672a72 maps: switch many file opens to using the with statement Augie Fackler <raf@durin42.com> parents: 1434 diff changeset	585 ver = int(f.readline())
18a961672a72 maps: switch many file opens to using the with statement Augie Fackler <raf@durin42.com> parents: 1434 diff changeset	586 if ver != self.VERSION:
18a961672a72 maps: switch many file opens to using the with statement Augie Fackler <raf@durin42.com> parents: 1434 diff changeset	587 raise hgutil.Abort('filemap too new -- please upgrade')
1437 43df01d36f22 FileMap: store filename locally Augie Fackler <raf@durin42.com> parents: 1435 diff changeset	588 self.load_fd(f, self._filename)
846 7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	589
7ca3d1b08d67 Save filemap into .hg/svn/filemap just like other maps Vitaliy Filippov <vitalif@yourcmc.ru> parents: 829 diff changeset	590 def _write(self):
1437 43df01d36f22 FileMap: store filename locally Augie Fackler <raf@durin42.com> parents: 1435 diff changeset	591 with open(self._filename, 'w') as f:
1435 18a961672a72 maps: switch many file opens to using the with statement Augie Fackler <raf@durin42.com> parents: 1434 diff changeset	592 f.write('%s\n' % self.VERSION)
574 8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	593
1388 130ced9e371d maps: make branch map inherit from base map Sean Farley <sean.michael.farley@gmail.com> parents: 1387 diff changeset	594 class BranchMap(BaseMap):
574 8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	595 '''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	596
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	597 oldname = newname
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	598 other = default
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	599
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	600 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	601 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	602 '''
8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	603
1391 7a866bca15de maps: make tag map inherit from base map Sean Farley <sean.michael.farley@gmail.com> parents: 1390 diff changeset	604 class TagMap(BaseMap):
729 467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	605 '''Facility for controlled renaming of tags. Example:
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	606
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	607 oldname = newname
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	608 other =
467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 728 diff changeset	609
809 ab372e38fb6c maps: clean up whitespace Augie Fackler <durin42@gmail.com> parents: 742 diff changeset	610 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	611 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	612 '''

Mercurial > hgsubversion

annotate hgsubversion/maps.py @ 1437:43df01d36f22