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