[PATCH] client: grab the parent revision information from the server in hgclient.log()

[Matt Mackall]

On Tue, 2012-10-30 at 11:54 +0000, Alastair Houghton wrote:
> On 30 Oct 2012, at 09:57, Idan Kamara <idankk86 at gmail.com> wrote:
> 
> > On Mon, Oct 29, 2012 at 10:48 PM, Alastair Houghton <alastair at alastairs-place.net> wrote:
> > >
> > > # HG changeset patch
> > > # User Alastair Houghton <alastair at coriolis-systems.com>
> > > # Date 1351543544 0
> > > # Node ID 0886df81888d4bf27d5a69f2a41820cf9fbff347
> > > # Parent  86ff8611a8fad14d4c1dba6d75bc26caaa41e951
> > > client: grab the parent revision information from the server in
> > > hgclient.log()
> > 
> > It took me a while to realize that {parents} is trying to be smart
> > and not always print the parents, which might make sense
> > for display purposes, but I'm not sure if it's desirable here.
> 
> Well, hglib could do a test to see if rev was zero or not and then return either an empty list or the previous changeset revision---but fetching the node ID would incur a round-trip to the server and hence be quite expensive when fetching an entire log.
> 
> > Maybe we should be using {p1/2rev} and {p1/2node}?
> 
> It seems to me that the fact that Mercurial currently only supports
> two-way merge isn't something that should be encoded into the design
> of hglib.

I hereby guarantee that Mercurial will never do 'octopus merges'.

-- 
Mathematics is the supreme nostalgia of our time.