##// END OF EJS Templates
convert: add config option for disabling ancestor parent checks...
Durham Goode -
r25742:d859123e default
parent child Browse files
Show More
@@ -156,6 +156,9 b' class filemap_source(converter_source):'
156 self.origparents = {}
156 self.origparents = {}
157 self.children = {}
157 self.children = {}
158 self.seenchildren = {}
158 self.seenchildren = {}
159 # experimental config: convert.ignoreancestorcheck
160 self.ignoreancestorcheck = self.ui.configbool('convert',
161 'ignoreancestorcheck')
159
162
160 def before(self):
163 def before(self):
161 self.base.before()
164 self.base.before()
@@ -306,7 +309,7 b' class filemap_source(converter_source):'
306
309
307 def getchanges(self, rev, full):
310 def getchanges(self, rev, full):
308 parents = self.commits[rev].parents
311 parents = self.commits[rev].parents
309 if len(parents) > 1:
312 if len(parents) > 1 and not self.ignoreancestorcheck:
310 self.rebuild()
313 self.rebuild()
311
314
312 # To decide whether we're interested in rev we:
315 # To decide whether we're interested in rev we:
@@ -332,9 +335,11 b' class filemap_source(converter_source):'
332 mp1 = self.parentmap[p1]
335 mp1 = self.parentmap[p1]
333 if mp1 == SKIPREV or mp1 in knownparents:
336 if mp1 == SKIPREV or mp1 in knownparents:
334 continue
337 continue
335 isancestor = any(p2 for p2 in parents
338
336 if p1 != p2 and mp1 != self.parentmap[p2]
339 isancestor = (not self.ignoreancestorcheck and
337 and mp1 in self.wantedancestors[p2])
340 any(p2 for p2 in parents
341 if p1 != p2 and mp1 != self.parentmap[p2]
342 and mp1 in self.wantedancestors[p2]))
338 if not isancestor and not hasbranchparent and len(parents) > 1:
343 if not isancestor and not hasbranchparent and len(parents) > 1:
339 # This could be expensive, avoid unnecessary calls.
344 # This could be expensive, avoid unnecessary calls.
340 if self._cachedcommit(p1).branch == branch:
345 if self._cachedcommit(p1).branch == branch:
General Comments 0
You need to be logged in to leave comments. Login now