[PATCH 4 of 4] subrepo: show detailed revision info for the divergent subrepo revisions

[Matt Mackall]

On Thu, 2014-05-08 at 00:54 +0200, Angel Ezquerra wrote:
> # HG changeset patch
> # User Angel Ezquerra <angel.ezquerra at gmail.com>
> # Date 1399415105 -7200
> #      Wed May 07 00:25:05 2014 +0200
> # Node ID dd02d8d8c7d244755e98c4b656b6eefedd668b98
> # Parent  874013facd42bd2a8bbd07634cad02448709c5ac
> subrepo: show detailed revision info for the divergent subrepo revisions

>     subrepository sub diverged (local revision: b2fdb12cd82b, remote revision: aa037b301eba)
> +  subrepository sub local revision details:
> +  changeset:   0:b2fdb12cd82b
> +  user:        test
> +  date:        Thu Jan 01 00:00:00 1970 +0000
> +  summary:     0sub
> +  
> +  subrepository sub remote revision details:
> +  changeset:   1:aa037b301eba
> +  tags:        tip
> +  user:        test
> +  date:        Thu Jan 01 00:00:00 1970 +0000
> +  summary:     foo
> +  
>    (M)erge, keep (l)ocal or keep (r)emote? m

I'm afraid I'm not keen on this.

First, it's WAY more verbose than any other prompt, but perhaps not
verbose enough to actually accomplish its purpose. I will often probably
still need to go investigate the subrepo DAG if I'm in doubt.

Second, I could do that before this patch anyway: just open another
terminal, cd into the subrepo, and ask about the revisions.

But more importantly, my plan for merge prompts is "no more". There are
a bunch of merge decisions that are really hard to deal with via prompts
(like case collisions) and rather than try to deal with them via
prompts, I want to instead say "hey, we hit this merge problem, see
resolve". As part of this, I want to allow deferring all the existing
prompts to resolve as well so that they can be retried or manually
resolved. So this is moving in the wrong direction: try to do more with
prompts.

-- 
Mathematics is the supreme nostalgia of our time.