comparison hgext/convert/convcmd.py @ 28900:b65966f50058

convert: keep converted hg parents that are outside convert.hg.revs (BC)

Before, when converting revisions without also including their already
converted parents in convert.hg.revs, the parents would no longer be parents.

That seems unfortunate and we dare to assume that nobody ever wants that.

Instead, preserve parents that are outside the current convert range but
already have been converted.

The parents returned in getcommit() are unconditionally converted, so we
introduce a separate optparents with optional parents.

28899:8c94594adbef

            self.ui.status(_('spliced in %s as parents of %s\n') %
                           (_(' and ').join(parents), rev))
            parents = [self.map.get(p, p) for p in parents]
        except KeyError:
            parents = [b[0] for b in pbranches]
        if len(pbranches) != 2:
            cleanp2 = set()
        if len(parents) < 3:
            source = progresssource(self.ui, self.source, len(files))
        else:

28900:b65966f50058

            self.ui.status(_('spliced in %s as parents of %s\n') %
                           (_(' and ').join(parents), rev))
            parents = [self.map.get(p, p) for p in parents]
        except KeyError:
            parents = [b[0] for b in pbranches]
            parents.extend(self.map[x]
                           for x in commit.optparents
                           if x in self.map)
        if len(pbranches) != 2:
            cleanp2 = set()
        if len(parents) < 3:
            source = progresssource(self.ui, self.source, len(files))
        else: