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

Gregory Szorc gregory.szorc at gmail.com
Tue Dec 2 20:54:57 CST 2014


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)'

I believe we do this elsewhere. I thought the non-paren style was for 
legacy code to maintain BC? Maybe I'm just completely wrong.


More information about the Mercurial-devel mailing list