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

Angel Ezquerra angel.ezquerra at gmail.com
Thu May 15 02:53:30 CDT 2014


On Thu, May 15, 2014 at 9:29 AM, Pierre-Yves David
<pierre-yves.david at ens-lyon.org> wrote:
>
>
> On 05/10/2014 04:38 PM, 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 1ea80c486e4ec567e6c02d54ba88e89fcb0df0d4
>> # Parent  6860a9cad193936489dcb0ddf0c9db5867545222
>> subrepo: show detailed revision info for the divergent subrepo revisions
>>
>> Up until now it was very hard to decide what to do when mercurial showed a
>> "subrepo diverged" prompt. We were only showing the revision id, but this
>> is
>> hardly enough information to decide what to do.
>>
>> Now we show the revision details for the local and remote subrepos so that
>> the
>> user can take a better decision.
>
>
> I've queued (and pushed to clowncopter) this 4 patches after fixing the
> description of patches 3.
>
> I would happily takes a patch that adds some doc string.

Thanks! I will send a patch that adds docstings as soon as I have some time.


>> diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
>> --- a/mercurial/subrepo.py
>> +++ b/mercurial/subrepo.py
>> @@ -209,9 +209,15 @@
>>                   option = repo.ui.promptchoice(
>>                       _(' subrepository %s diverged (local revision: %s, '
>>                         'remote revision: %s)\n'
>> +                      'subrepository %s local revision details:\n%s\n\n'
>> +                      'subrepository %s remote revision details:\n%s\n\n'
>
>
> Notes: This is about to "conflict" with Durham changes on labels.
> (not landed yet)

Is there anything I must do about this?

Cheers,

Angel


More information about the Mercurial-devel mailing list