mercurial-crew-with-dirclash: hgext/convert/filemap.py annotate

annotate hgext/convert/filemap.py @ 5483:0c43f87baba3 default tip

Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.

author	Maxim Dounin <mdounin@mdounin.ru>
date	Sat, 27 Oct 2007 16:27:55 +0400
parents	4c555dd167dd
children

rev	line source
5376 d60a067227a5 convert: move filemapper class to a separate file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5375 diff changeset	1 # Copyright 2007 Bryan O'Sullivan <bos@serpentine.com>
5377 756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	2 # Copyright 2007 Alexis S. L. Carvalho <alexis@cecm.usp.br>
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	3 #
5376 d60a067227a5 convert: move filemapper class to a separate file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5375 diff changeset	4 # This software may be used and distributed according to the terms of
d60a067227a5 convert: move filemapper class to a separate file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5375 diff changeset	5 # the GNU General Public License, incorporated herein by reference.
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	6
5376 d60a067227a5 convert: move filemapper class to a separate file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5375 diff changeset	7 import shlex
d60a067227a5 convert: move filemapper class to a separate file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5375 diff changeset	8 from mercurial.i18n import _
d60a067227a5 convert: move filemapper class to a separate file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5375 diff changeset	9 from mercurial import util
5377 756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	10 from common import SKIPREV
694 51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	11
5016 4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	12 def rpairs(name):
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	13 e = len(name)
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	14 while e != -1:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	15 yield name[:e], name[e+1:]
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	16 e = name.rfind('/', 0, e)
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	17
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	18 class filemapper(object):
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	19 '''Map and filter filenames when importing.
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	20 A name can be mapped to itself, a new name, or None (omit from new
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	21 repository).'''
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	22
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	23 def __init__(self, ui, path=None):
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	24 self.ui = ui
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	25 self.include = {}
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	26 self.exclude = {}
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	27 self.rename = {}
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	28 if path:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	29 if self.parse(path):
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	30 raise util.Abort(_('errors in filemap'))
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	31
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	32 def parse(self, path):
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	33 errs = 0
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	34 def check(name, mapping, listname):
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	35 if name in mapping:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	36 self.ui.warn(_('%s:%d: %r already in %s list\n') %
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	37 (lex.infile, lex.lineno, name, listname))
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	38 return 1
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	39 return 0
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	40 lex = shlex.shlex(open(path), path, True)
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	41 lex.wordchars += '!@#$%^&*()-=+[]{}\|;:,./<>?'
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	42 cmd = lex.get_token()
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	43 while cmd:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	44 if cmd == 'include':
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	45 name = lex.get_token()
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	46 errs += check(name, self.exclude, 'exclude')
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	47 self.include[name] = name
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	48 elif cmd == 'exclude':
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	49 name = lex.get_token()
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	50 errs += check(name, self.include, 'include')
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	51 errs += check(name, self.rename, 'rename')
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	52 self.exclude[name] = name
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	53 elif cmd == 'rename':
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	54 src = lex.get_token()
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	55 dest = lex.get_token()
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	56 errs += check(src, self.exclude, 'exclude')
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	57 self.rename[src] = dest
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	58 elif cmd == 'source':
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	59 errs += self.parse(lex.get_token())
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	60 else:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	61 self.ui.warn(_('%s:%d: unknown directive %r\n') %
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	62 (lex.infile, lex.lineno, cmd))
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	63 errs += 1
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	64 cmd = lex.get_token()
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	65 return errs
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	66
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	67 def lookup(self, name, mapping):
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	68 for pre, suf in rpairs(name):
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	69 try:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	70 return mapping[pre], pre, suf
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	71 except KeyError, err:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	72 pass
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	73 return '', name, ''
5117 d4fa6bafc43a Remove trailing spaces, fix indentation Thomas Arendsen Hein <thomas@intevation.de> parents: 5112 diff changeset	74
5016 4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	75 def __call__(self, name):
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	76 if self.include:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	77 inc = self.lookup(name, self.include)[0]
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	78 else:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	79 inc = name
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	80 if self.exclude:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	81 exc = self.lookup(name, self.exclude)[0]
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	82 else:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	83 exc = ''
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	84 if not inc or exc:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	85 return None
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	86 newpre, pre, suf = self.lookup(name, self.rename)
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	87 if newpre:
5106 745cffe59ca8 convert: use '.' as destination name if renaming subdir into root Bryan O'Sullivan <bos@serpentine.com> parents: 5100 diff changeset	88 if newpre == '.':
745cffe59ca8 convert: use '.' as destination name if renaming subdir into root Bryan O'Sullivan <bos@serpentine.com> parents: 5100 diff changeset	89 return suf
5016 4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	90 if suf:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	91 return newpre + '/' + suf
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	92 return newpre
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	93 return name
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	94
5192 33015dac5df5 convert: fix mercurial_sink.putcommit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5172 diff changeset	95 def active(self):
33015dac5df5 convert: fix mercurial_sink.putcommit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5172 diff changeset	96 return bool(self.include or self.exclude or self.rename)
5377 756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	97
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	98 # This class does two additional things compared to a regular source:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	99 #
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	100 # - Filter and rename files. This is mostly wrapped by the filemapper
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	101 # class above. We hide the original filename in the revision that is
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	102 # returned by getchanges to be able to find things later in getfile
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	103 # and getmode.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	104 #
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	105 # - Return only revisions that matter for the files we're interested in.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	106 # This involves rewriting the parents of the original revision to
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	107 # create a graph that is restricted to those revisions.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	108 #
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	109 # This set of revisions includes not only revisions that directly
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	110 # touch files we're interested in, but also merges that merge two
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	111 # or more interesting revisions.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	112
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	113 class filemap_source(object):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	114 def __init__(self, ui, baseconverter, filemap):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	115 self.ui = ui
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	116 self.base = baseconverter
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	117 self.filemapper = filemapper(ui, filemap)
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	118 self.commits = {}
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	119 # if a revision rev has parent p in the original revision graph, then
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	120 # rev will have parent self.parentmap[p] in the restricted graph.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	121 self.parentmap = {}
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	122 # self.wantedancestors[rev] is the set of all ancestors of rev that
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	123 # are in the restricted graph.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	124 self.wantedancestors = {}
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	125 self.convertedorder = None
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	126 self._rebuilt = False
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	127 self.origparents = {}
5401 4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	128 self.children = {}
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	129 self.seenchildren = {}
5377 756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	130
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	131 def setrevmap(self, revmap, order):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	132 # rebuild our state to make things restartable
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	133 #
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	134 # To avoid calling getcommit for every revision that has already
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	135 # been converted, we rebuild only the parentmap, delaying the
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	136 # rebuild of wantedancestors until we need it (i.e. until a
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	137 # merge).
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	138 #
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	139 # We assume the order argument lists the revisions in
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	140 # topological order, so that we can infer which revisions were
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	141 # wanted by previous runs.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	142 self._rebuilt = not revmap
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	143 seen = {SKIPREV: SKIPREV}
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	144 dummyset = util.set()
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	145 converted = []
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	146 for rev in order:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	147 mapped = revmap[rev]
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	148 wanted = mapped not in seen
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	149 if wanted:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	150 seen[mapped] = rev
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	151 self.parentmap[rev] = rev
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	152 else:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	153 self.parentmap[rev] = seen[mapped]
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	154 self.wantedancestors[rev] = dummyset
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	155 arg = seen[mapped]
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	156 if arg == SKIPREV:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	157 arg = None
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	158 converted.append((rev, wanted, arg))
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	159 self.convertedorder = converted
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	160 return self.base.setrevmap(revmap, order)
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	161
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	162 def rebuild(self):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	163 if self._rebuilt:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	164 return True
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	165 self._rebuilt = True
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	166 self.parentmap.clear()
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	167 self.wantedancestors.clear()
5401 4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	168 self.seenchildren.clear()
5377 756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	169 for rev, wanted, arg in self.convertedorder:
5401 4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	170 if rev not in self.origparents:
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	171 self.origparents[rev] = self.getcommit(rev).parents
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	172 if arg is not None:
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	173 self.children[arg] = self.children.get(arg, 0) + 1
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	174
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	175 for rev, wanted, arg in self.convertedorder:
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	176 parents = self.origparents[rev]
5377 756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	177 if wanted:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	178 self.mark_wanted(rev, parents)
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	179 else:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	180 self.mark_not_wanted(rev, arg)
5401 4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	181 self._discard(arg, *parents)
5377 756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	182
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	183 return True
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	184
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	185 def getheads(self):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	186 return self.base.getheads()
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	187
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	188 def getcommit(self, rev):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	189 # We want to save a reference to the commit objects to be able
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	190 # to rewrite their parents later on.
5401 4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	191 c = self.commits[rev] = self.base.getcommit(rev)
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	192 for p in c.parents:
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	193 self.children[p] = self.children.get(p, 0) + 1
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	194 return c
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	195
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	196 def _discard(self, *revs):
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	197 for r in revs:
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	198 if r is None:
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	199 continue
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	200 self.seenchildren[r] = self.seenchildren.get(r, 0) + 1
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	201 if self.seenchildren[r] == self.children[r]:
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	202 del self.wantedancestors[r]
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	203 del self.parentmap[r]
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	204 del self.seenchildren[r]
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	205 if self._rebuilt:
4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	206 del self.children[r]
5377 756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	207
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	208 def wanted(self, rev, i):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	209 # Return True if we're directly interested in rev.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	210 #
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	211 # i is an index selecting one of the parents of rev (if rev
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	212 # has no parents, i is None). getchangedfiles will give us
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	213 # the list of files that are different in rev and in the parent
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	214 # indicated by i. If we're interested in any of these files,
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	215 # we're interested in rev.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	216 try:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	217 files = self.base.getchangedfiles(rev, i)
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	218 except NotImplementedError:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	219 raise util.Abort(_("source repository doesn't support --filemap"))
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	220 for f in files:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	221 if self.filemapper(f):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	222 return True
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	223 return False
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	224
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	225 def mark_not_wanted(self, rev, p):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	226 # Mark rev as not interesting and update data structures.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	227
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	228 if p is None:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	229 # A root revision. Use SKIPREV to indicate that it doesn't
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	230 # map to any revision in the restricted graph. Put SKIPREV
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	231 # in the set of wanted ancestors to simplify code elsewhere
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	232 self.parentmap[rev] = SKIPREV
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	233 self.wantedancestors[rev] = util.set((SKIPREV,))
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	234 return
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	235
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	236 # Reuse the data from our parent.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	237 self.parentmap[rev] = self.parentmap[p]
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	238 self.wantedancestors[rev] = self.wantedancestors[p]
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	239
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	240 def mark_wanted(self, rev, parents):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	241 # Mark rev ss wanted and update data structures.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	242
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	243 # rev will be in the restricted graph, so children of rev in
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	244 # the original graph should still have rev as a parent in the
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	245 # restricted graph.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	246 self.parentmap[rev] = rev
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	247
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	248 # The set of wanted ancestors of rev is the union of the sets
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	249 # of wanted ancestors of its parents. Plus rev itself.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	250 wrev = util.set()
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	251 for p in parents:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	252 wrev.update(self.wantedancestors[p])
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	253 wrev.add(rev)
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	254 self.wantedancestors[rev] = wrev
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	255
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	256 def getchanges(self, rev):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	257 parents = self.commits[rev].parents
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	258 if len(parents) > 1:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	259 self.rebuild()
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	260
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	261 # To decide whether we're interested in rev we:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	262 #
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	263 # - calculate what parents rev will have if it turns out we're
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	264 # interested in it. If it's going to have more than 1 parent,
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	265 # we're interested in it.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	266 #
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	267 # - otherwise, we'll compare it with the single parent we found.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	268 # If any of the files we're interested in is different in the
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	269 # the two revisions, we're interested in rev.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	270
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	271 # A parent p is interesting if its mapped version (self.parentmap[p]):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	272 # - is not SKIPREV
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	273 # - is still not in the list of parents (we don't want duplicates)
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	274 # - is not an ancestor of the mapped versions of the other parents
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	275 mparents = []
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	276 wp = None
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	277 for i, p1 in enumerate(parents):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	278 mp1 = self.parentmap[p1]
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	279 if mp1 == SKIPREV or mp1 in mparents:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	280 continue
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	281 for p2 in parents:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	282 if p1 == p2 or mp1 == self.parentmap[p2]:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	283 continue
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	284 if mp1 in self.wantedancestors[p2]:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	285 break
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	286 else:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	287 mparents.append(mp1)
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	288 wp = i
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	289
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	290 if wp is None and parents:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	291 wp = 0
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	292
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	293 self.origparents[rev] = parents
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	294
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	295 if len(mparents) < 2 and not self.wanted(rev, wp):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	296 # We don't want this revision.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	297 # Update our state and tell the convert process to map this
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	298 # revision to the same revision its parent as mapped to.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	299 p = None
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	300 if parents:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	301 p = parents[wp]
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	302 self.mark_not_wanted(rev, p)
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	303 self.convertedorder.append((rev, False, p))
5401 4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	304 self._discard(*parents)
5377 756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	305 return self.parentmap[rev]
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	306
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	307 # We want this revision.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	308 # Rewrite the parents of the commit object
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	309 self.commits[rev].parents = mparents
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	310 self.mark_wanted(rev, parents)
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	311 self.convertedorder.append((rev, True, None))
5401 4c555dd167dd convert --filemap: reduce memory usage Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5377 diff changeset	312 self._discard(*parents)
5377 756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	313
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	314 # Get the real changes and do the filtering/mapping.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	315 # To be able to get the files later on in getfile and getmode,
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	316 # we hide the original filename in the rev part of the return
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	317 # value.
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	318 changes, copies = self.base.getchanges(rev)
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	319 newnames = {}
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	320 files = []
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	321 for f, r in changes:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	322 newf = self.filemapper(f)
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	323 if newf:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	324 files.append((newf, (f, r)))
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	325 newnames[f] = newf
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	326
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	327 ncopies = {}
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	328 for c in copies:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	329 newc = self.filemapper(c)
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	330 if newc:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	331 newsource = self.filemapper(copies[c])
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	332 if newsource:
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	333 ncopies[newc] = newsource
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	334
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	335 return files, ncopies
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	336
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	337 def getfile(self, name, rev):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	338 realname, realrev = rev
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	339 return self.base.getfile(realname, realrev)
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	340
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	341 def getmode(self, name, rev):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	342 realname, realrev = rev
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	343 return self.base.getmode(realname, realrev)
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	344
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	345 def gettags(self):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	346 return self.base.gettags()
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	347
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	348 def before(self):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	349 pass
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	350
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	351 def after(self):
756a43a30e34 convert: readd --filemap Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5376 diff changeset	352 pass

Mercurial > hg > mercurial-crew-with-dirclash

annotate hgext/convert/filemap.py @ 5483:0c43f87baba3 default tip