[MERGE] add stop_rule to Branch.iter_merge_sorted_revisions()

[Ian Clatworthy]

John Arbash Meinel wrote:
> Ian Clatworthy wrote:
> 
> ...
> 
>>> In this specific case I was thinking:
>>>
>>> parents = get_parent_map([revision])[revision]
>>>
>>> Where the length of parents can certainly be > 1.
>> Thinking out loud, I wonder if stopping at any parent ought to be explicitly
>> supported, i.e. instead of having "with-merges" we had "include-until-parent"?
>> That way we'd be matching against revision-ids instead of relying on any
>> nuances of the depth calculation algorithm. I'm pretty sure
>> include-until-parent makes with-merges redundant doesn't it?
> 
>> Ian C.
> 
> 
> I would think so, and yes, I would probably prefer that as well. Though
> I haven't really worked out the specifics to be positive on this.

Hmm, playing with this idea, it seems that stopping at any parent is
equivalent to 'include'. I've therefore kept the API as it was but
reimplemented 'with-merges' to check for the left-hand parent, rather
than relying on the depth.

Updated patch attached. Is this acceptable now?

Ian C.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: stop-rule-ismr-3.patch
Type: text/x-diff
Size: 14775 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090129/13160d3a/attachment-0001.bin