[PATCH 3 of 4] merge: move default destination computation in a revset
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Tue Sep 22 07:32:35 UTC 2015
On 09/22/2015 12:11 AM, Yuya Nishihara wrote:
> On Mon, 21 Sep 2015 15:16:37 -0700, Pierre-Yves David wrote:
>> # HG changeset patch
>> # User Pierre-Yves David <pierre-yves.david at fb.com>
>> # Date 1442523795 25200
>> # Thu Sep 17 14:03:15 2015 -0700
>> # Node ID d515bf3d8e84ca73062b078e2cbc35f5bba7e360
>> # Parent 9f0f1c86741d9fbc71e49f55ada02c47b0cec3ca
>> merge: move default destination computation in a revset
>>
>> This is another step toward having "default" destination more clear and unified.
>
>> +def _mergedefaultdest(repo, subset, x):
>> + """``_mergedefaultdest()``
>> +
>> + default destination for merge.
>> + # XXX: Currently private because I expect the signature to change.
>> + # XXX: - taking rev as arguments,
>> + # XXX: - bailing out in case of ambiguity vs returning all data.
>> + """
>
> The docstring makes it appear in the revset help. We have to comment out it
> or fix the help function to exclude private functions.
God point, I'll use # comment instead
>
>> + return baseset([repo[node].rev()])
>
> Missing "subset &" ?
> _rebasedefaultdest() has it, but _mergedefaultdest() and _updatedefaultdest()
> don't.
Urg, perfect catch, sending a V2, shortly.
--
Pierre-Yves David
More information about the Mercurial-devel
mailing list