[PATCH 2 of 2] add `allparents' item

Greg Ward greg-hg at gerg.ca
Thu Jul 2 19:54:10 CDT 2009


On Thu, Jul 2, 2009 at 6:19 PM, Martin Geisler<mg at lazybytes.net> wrote:
>>> What about 'bothparents' (since we support exactly two parents)?
>>
>> Maybe, but I think that the distinction between parents and ancestors
>> should be clear enough to everyone.
>
> After re-reading the code I actually like allparents better since it
> might not return two parents.

I'm still very slightly in favour of 'bothparents', since it sort of
clarifies that nparents <= 2.  But yeah, you're right that "<=" and
"both" aren't entirely compatible, English-wise.

Paolo: regardless of this minor controversy, would you mind throwing
in a patch to clarify the difference between 'parents' and
'allparents' (or whatever)?  Like Martin, I had to read the code to
understand it.  That should not be necessary.  For 'parents', how
about:

      - parents: List of strings. The parents of the changeset (empty if
          the sole parent is also the preceding revision; merges always
          include both parents)

...or something like that. Perhaps the second clause about merges is
unnecessary?  Damn, being concise is *hard*.

Greg


More information about the Mercurial-devel mailing list