[PATCH 1 of 2] progress: stop double wrapping of ui class

Augie Fackler raf at durin42.com
Tue Jun 9 12:32:42 CDT 2015


On Mon, Jun 8, 2015 at 10:22 PM, Matt Harbison <mharbison72 at gmail.com> wrote:
> On Mon, 08 Jun 2015 10:36:19 -0400, Augie Fackler <raf at durin42.com> wrote:
>
>> On Sun, Jun 07, 2015 at 08:08:06PM -0700, Pierre-Yves David wrote:
>>>
>>> # HG changeset patch
>>> # User Pierre-Yves David <pierre-yves.david at fb.com>
>>> # Date 1433725883 25200
>>> #      Sun Jun 07 18:11:23 2015 -0700
>>> # Node ID 567035f46c6e91ef9420739bb7f21b7e3b9a6d10
>>> # Parent  6fabde6ef4453ee6c2aa964184f6cf2c54483621
>>> progress: stop double wrapping of ui class
>>
>>
>> Woohoo! I've been meaning to hunt this down forever, but never got
>> bothered enough by the test output. Thanks!
>>
>> Queued with enthusiasm.
>
>
> If it's not too late, there an #if hardlink test at the bottom, and the
> #else case isn't updated.

Fixed that as a followup, thanks!

>
>
>>> diff --git a/tests/test-subrepo-recursion.t
>>> b/tests/test-subrepo-recursion.t
>>> --- a/tests/test-subrepo-recursion.t
>>> +++ b/tests/test-subrepo-recursion.t
>>> @@ -271,33 +271,23 @@ Test archiving to a directory tree (the
>>>  only show up in the test output, not in real usage):
>>>
>>>    $ hg archive --subrepos ../archive
>>>    \r (no-eol) (esc)
>>>    archiving [                                           ] 0/3\r (no-eol)
>>> (esc)
>>> -  archiving [                                           ] 0/3\r (no-eol)
>>> (esc)
>>> -  archiving [=============>                             ] 1/3\r (no-eol)
>>> (esc)
>>>    archiving [=============>                             ] 1/3\r (no-eol)
>>> (esc)
>>>    archiving [===========================>               ] 2/3\r (no-eol)
>>> (esc)
>>> -  archiving [===========================>               ] 2/3\r (no-eol)
>>> (esc)
>>> -  archiving [==========================================>] 3/3\r (no-eol)
>>> (esc)
>>>    archiving [==========================================>] 3/3\r (no-eol)
>>> (esc)
>>>                                                                \r
>>> (no-eol) (esc)
>>>    \r (no-eol) (esc)
>>>    archiving (foo) [                                     ] 0/3\r (no-eol)
>>> (esc)
>>> -  archiving (foo) [                                     ] 0/3\r (no-eol)
>>> (esc)
>>> -  archiving (foo) [===========>                         ] 1/3\r (no-eol)
>>> (esc)
>>>    archiving (foo) [===========>                         ] 1/3\r (no-eol)
>>> (esc)
>>>    archiving (foo) [=======================>             ] 2/3\r (no-eol)
>>> (esc)
>>> -  archiving (foo) [=======================>             ] 2/3\r (no-eol)
>>> (esc)
>>> -  archiving (foo) [====================================>] 3/3\r (no-eol)
>>> (esc)
>>>    archiving (foo) [====================================>] 3/3\r (no-eol)
>>> (esc)
>>>                                                                \r
>>> (no-eol) (esc)
>>>    \r (no-eol) (esc)
>>> -  archiving (foo/bar) [                                 ] 0/1\r (no-eol)
>>> (glob) (esc)
>>> -  archiving (foo/bar) [                                 ] 0/1\r (no-eol)
>>> (glob) (esc)
>>> -  archiving (foo/bar) [================================>] 1/1\r (no-eol)
>>> (glob) (esc)
>>> -  archiving (foo/bar) [================================>] 1/1\r (no-eol)
>>> (glob) (esc)
>>> +  archiving (foo/bar) [                                 ] 0/1\r (no-eol)
>>> (esc)
>>> +  archiving (foo/bar) [================================>] 1/1\r (no-eol)
>>> (esc)
>>>                                                                \r
>>> (no-eol) (esc)
>>>    $ find ../archive | sort
>>>    ../archive
>>>    ../archive/.hg_archival.txt
>>>    ../archive/.hgsub
>>> @@ -313,33 +303,23 @@ only show up in the test output, not in
>>>  Test archiving to zip file (unzip output is unstable):
>>>
>>>    $ hg archive --subrepos --prefix '.' ../archive.zip
>>>    \r (no-eol) (esc)
>>>    archiving [                                           ] 0/3\r (no-eol)
>>> (esc)
>>> -  archiving [                                           ] 0/3\r (no-eol)
>>> (esc)
>>> -  archiving [=============>                             ] 1/3\r (no-eol)
>>> (esc)
>>>    archiving [=============>                             ] 1/3\r (no-eol)
>>> (esc)
>>>    archiving [===========================>               ] 2/3\r (no-eol)
>>> (esc)
>>> -  archiving [===========================>               ] 2/3\r (no-eol)
>>> (esc)
>>> -  archiving [==========================================>] 3/3\r (no-eol)
>>> (esc)
>>>    archiving [==========================================>] 3/3\r (no-eol)
>>> (esc)
>>>                                                                \r
>>> (no-eol) (esc)
>>>    \r (no-eol) (esc)
>>>    archiving (foo) [                                     ] 0/3\r (no-eol)
>>> (esc)
>>> -  archiving (foo) [                                     ] 0/3\r (no-eol)
>>> (esc)
>>> -  archiving (foo) [===========>                         ] 1/3\r (no-eol)
>>> (esc)
>>>    archiving (foo) [===========>                         ] 1/3\r (no-eol)
>>> (esc)
>>>    archiving (foo) [=======================>             ] 2/3\r (no-eol)
>>> (esc)
>>> -  archiving (foo) [=======================>             ] 2/3\r (no-eol)
>>> (esc)
>>> -  archiving (foo) [====================================>] 3/3\r (no-eol)
>>> (esc)
>>>    archiving (foo) [====================================>] 3/3\r (no-eol)
>>> (esc)
>>>                                                                \r
>>> (no-eol) (esc)
>>>    \r (no-eol) (esc)
>>> -  archiving (foo/bar) [                                 ] 0/1\r (no-eol)
>>> (glob) (esc)
>>> -  archiving (foo/bar) [                                 ] 0/1\r (no-eol)
>>> (glob) (esc)
>>> -  archiving (foo/bar) [================================>] 1/1\r (no-eol)
>>> (glob) (esc)
>>> -  archiving (foo/bar) [================================>] 1/1\r (no-eol)
>>> (glob) (esc)
>>> +  archiving (foo/bar) [                                 ] 0/1\r (no-eol)
>>> (esc)
>>> +  archiving (foo/bar) [================================>] 1/1\r (no-eol)
>>> (esc)
>>>                                                                \r
>>> (no-eol) (esc)
>>>
>>>  (unzip date formating is unstable, we do not care about it and glob it
>>> out)
>>>
>>>    $ unzip -l ../archive.zip
>>> @@ -381,16 +361,12 @@ cloned:
>>>    $ cd ../empty
>>>  #if hardlink
>>>    $ hg archive --subrepos -r tip --prefix './' ../archive.tar.gz
>>>    \r (no-eol) (esc)
>>>    archiving [                                           ] 0/3\r (no-eol)
>>> (esc)
>>> -  archiving [                                           ] 0/3\r (no-eol)
>>> (esc)
>>> -  archiving [=============>                             ] 1/3\r (no-eol)
>>> (esc)
>>>    archiving [=============>                             ] 1/3\r (no-eol)
>>> (esc)
>>>    archiving [===========================>               ] 2/3\r (no-eol)
>>> (esc)
>>> -  archiving [===========================>               ] 2/3\r (no-eol)
>>> (esc)
>>> -  archiving [==========================================>] 3/3\r (no-eol)
>>> (esc)
>>>    archiving [==========================================>] 3/3\r (no-eol)
>>> (esc)
>>>                                                                \r
>>> (no-eol) (esc)
>>>    \r (no-eol) (esc)
>>>    linking [ <=>                                           ] 1\r (no-eol)
>>> (esc)
>>>    linking [  <=>                                          ] 2\r (no-eol)
>>> (esc)
>>> @@ -401,16 +377,12 @@ cloned:
>>>    linking [       <=>                                     ] 7\r (no-eol)
>>> (esc)
>>>    linking [        <=>                                    ] 8\r (no-eol)
>>> (esc)
>>>                                                                \r
>>> (no-eol) (esc)
>>>    \r (no-eol) (esc)
>>>    archiving (foo) [                                     ] 0/3\r (no-eol)
>>> (esc)
>>> -  archiving (foo) [                                     ] 0/3\r (no-eol)
>>> (esc)
>>> -  archiving (foo) [===========>                         ] 1/3\r (no-eol)
>>> (esc)
>>>    archiving (foo) [===========>                         ] 1/3\r (no-eol)
>>> (esc)
>>>    archiving (foo) [=======================>             ] 2/3\r (no-eol)
>>> (esc)
>>> -  archiving (foo) [=======================>             ] 2/3\r (no-eol)
>>> (esc)
>>> -  archiving (foo) [====================================>] 3/3\r (no-eol)
>>> (esc)
>>>    archiving (foo) [====================================>] 3/3\r (no-eol)
>>> (esc)
>>>                                                                \r
>>> (no-eol) (esc)
>>>    \r (no-eol) (esc)
>>>    linking [ <=>                                           ] 1\r (no-eol)
>>> (esc)
>>>    linking [  <=>                                          ] 2\r (no-eol)
>>> (esc)
>>> @@ -418,14 +390,12 @@ cloned:
>>>    linking [    <=>                                        ] 4\r (no-eol)
>>> (esc)
>>>    linking [     <=>                                       ] 5\r (no-eol)
>>> (esc)
>>>    linking [      <=>                                      ] 6\r (no-eol)
>>> (esc)
>>>                                                                \r
>>> (no-eol) (esc)
>>>    \r (no-eol) (esc)
>>> -  archiving (foo/bar) [                                 ] 0/1\r (no-eol)
>>> (glob) (esc)
>>> -  archiving (foo/bar) [                                 ] 0/1\r (no-eol)
>>> (glob) (esc)
>>> -  archiving (foo/bar) [================================>] 1/1\r (no-eol)
>>> (glob) (esc)
>>> -  archiving (foo/bar) [================================>] 1/1\r (no-eol)
>>> (glob) (esc)
>>> +  archiving (foo/bar) [                                 ] 0/1\r (no-eol)
>>> (esc)
>>> +  archiving (foo/bar) [================================>] 1/1\r (no-eol)
>>> (esc)
>>>                                                                \r
>>> (no-eol) (esc)
>>>    cloning subrepo foo from $TESTTMP/repo/foo
>>>    cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
>>>  #else
>>>  Note there's a slight output glitch on non-hardlink systems: the last
>>> _______________________________________________
>>> Mercurial-devel mailing list
>>> Mercurial-devel at selenic.com
>>> https://selenic.com/mailman/listinfo/mercurial-devel
>>
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel at selenic.com
>> https://selenic.com/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list