[PATCH 05 of 17] rebase: show progress info while rebasing

Mads Kiilerich mads at kiilerich.com
Wed Dec 3 07:11:05 CST 2014


On 12/03/2014 03:54 AM, Gregory Szorc wrote:
> On 11/30/14 11:08 AM, Mads Kiilerich wrote:
>> # HG changeset patch
>> # User Mads Kiilerich <mads at kiilerich.com>
>> # Date 1349990522 -7200
>> #      Thu Oct 11 23:22:02 2012 +0200
>> # Node ID 0cff65a0d024e31284ff6eb804ed4ac65f628a6e
>> # Parent  36dcd3db70ab1dce7715ead123aa4bb4f09b1abc
>> rebase: show progress info while rebasing
>
>> diff --git a/tests/test-bookmarks-rebase.t 
>> b/tests/test-bookmarks-rebase.t
>> --- a/tests/test-bookmarks-rebase.t
>> +++ b/tests/test-bookmarks-rebase.t
>> @@ -37,6 +37,9 @@ bookmark list
>>   rebase
>>
>>     $ hg rebase -s two -d one
>> +  rebasing 2:db815d6d32e6 "2"
>> +   skipping null merge of 2:db815d6d32e6
>> +  rebasing 3:2ae46b1d99a7 "3" (tip two)
>>     saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)
>
> Shouldn't we surround supplemental output in parenthesis. e.g. 
> '(skipping null merge of 2:db815d6d32e6)'

Yes, that is how we do for aborts. I don't think there is any consistent 
rules for multi line output for "oneshot" commands ... which however 
usually is quiet.

Rebase is however a kind of meta command that wraps several merges. I 
think we by default have to give some "what is happening and what 
happened so far" output between these merges. In that way it is 
different from normal "progress", even though I can see how it can make 
sense to GUI tools to intercept and show it somehow ...

I don't care much how it looks, but I found that this way of showing it 
works for me and makes it quite easy to get an overview. The merges will 
however also give some status output that not really fits in nicely ... 
but I think it is "acceptable".

/Mads


More information about the Mercurial-devel mailing list