[PATCH 8 of 8 v4] convert: return commit objects for revisions in the revmap

Kostia Balytskyi kobalyts at outlook.com
Wed Dec 14 12:00:03 EST 2016


Other than the nit below, this series LGTM.

On 12/14/16 4:53 PM, Kostia Balytskyi wrote:
>
> On 12/14/16 9:46 AM, David Soria Parra wrote:
>> # HG changeset patch
>> # User David Soria Parra <davidsp at fb.com>
>> # Date 1481704712 28800
>> #      Wed Dec 14 00:38:32 2016 -0800
>> # Node ID eb4a6df3de20deb31e681aa7eba408dc352440c3
>> # Parent  26ec2474ab06fdaf1aca034c54309245ded267b0
>> convert: return commit objects for revisions in the revmap
>>
>> Source revision data that exists in the revmap are ignored when pulling
>> data from Perforce as we consider them already imported. In case where
>> the `convertcmd.convert` algorithm requests a commit object for such
>> a revision we are creating it.  This is usually the case for parent of
>> the first imported revision.
>>
>> diff --git a/hgext/convert/p4.py b/hgext/convert/p4.py
>> --- a/hgext/convert/p4.py
>> +++ b/hgext/convert/p4.py
>> @@ -321,6 +321,12 @@
>>            return marshal.load(stdout)
>>    
>>        def getcommit(self, rev):
>> +        if rev not in self.changeset and rev not in self.revmap:
>> +            raise error.Abort(
>> +                _("cannot find %s in the revmap or parsed changesets") % rev)
>> +        if rev not in self.changeset:
> I think this would be more clear if you used 'if rev in self.revmap'.
> But I think whoever queues it can change it in flight.
>> +            d = self._fetch_revision(rev)
>> +            return self._construct_commit(d, parents=None)
>>            return self.changeset[rev]
>>    
>>        def gettags(self):
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel at mercurial-scm.org
>> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel



More information about the Mercurial-devel mailing list