Patchwork progress: update comment to reflect implementation

login
register
mail settings
Submitter timeless@mozdev.org
Date March 17, 2016, 9:10 p.m.
Message ID <0b9bc313e9348b2036fd.1458249021@waste.org>
Download mbox | patch
Permalink /patch/13924/
State Superseded
Commit c30d5ca4945b272808c5dab6e0772ceb84d6c600
Headers show

Comments

timeless@mozdev.org - March 17, 2016, 9:10 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1458239672 0
#      Thu Mar 17 18:34:32 2016 +0000
# Node ID 0b9bc313e9348b2036fdfb833408ed3b91e5913b
# Parent  dfd5a6830ea7cd56909b6667c78ae122cc3a5aa1
progress: update comment to reflect implementation

Progress has been on by default in core for a while,
the comment was written before this happened.

Also remove useless progress extension lines from tests.
Pierre-Yves David - March 19, 2016, 6:23 a.m.
On 03/17/2016 02:10 PM, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1458239672 0
> #      Thu Mar 17 18:34:32 2016 +0000
> # Node ID 0b9bc313e9348b2036fdfb833408ed3b91e5913b
> # Parent  dfd5a6830ea7cd56909b6667c78ae122cc3a5aa1
> progress: update comment to reflect implementation
>
> Progress has been on by default in core for a while,
> the comment was written before this happened.
>
> Also remove useless progress extension lines from tests.
>
> diff --git a/mercurial/ui.py b/mercurial/ui.py
> --- a/mercurial/ui.py
> +++ b/mercurial/ui.py
> @@ -1004,9 +1004,8 @@
>       def progress(self, topic, pos, item="", unit="", total=None):
>           '''show a progress message
>
> -        With stock hg, this is simply a debug message that is hidden
> -        by default, but with extensions or GUI tools it may be
> -        visible. 'topic' is the current operation, 'item' is a
> +        By default a textual progress bar will be displayed if an operation
> +        takes too long. 'topic' is the current operation, 'item' is a
>           non-numeric marker of the current position (i.e. the currently
>           in-process file), 'pos' is the current numeric position (i.e.
>           revision, bytes, etc.), unit is a corresponding unit label,
> diff --git a/tests/test-archive.t b/tests/test-archive.t
> --- a/tests/test-archive.t
> +++ b/tests/test-archive.t
> @@ -269,8 +269,6 @@
>
>     $ cp $HGRCPATH $HGRCPATH.no-progress
>     $ cat >> $HGRCPATH <<EOF
> -  > [extensions]
> -  > progress =

These test changes seems to have sneaked into the changeset. They are 
very sensible, but can we get them in a different changeset ?

>     > [progress]
>     > assume-tty = 1
>     > format = topic bar number
> diff --git a/tests/test-convert-svn-move.t b/tests/test-convert-svn-move.t
> --- a/tests/test-convert-svn-move.t
> +++ b/tests/test-convert-svn-move.t
> @@ -152,8 +152,6 @@
>   Test convert progress bar
>
>     $ cat >> $HGRCPATH <<EOF
> -  > [extensions]
> -  > progress =
>     > [progress]
>     > assume-tty = 1
>     > delay = 0
> 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
> @@ -255,8 +255,6 @@
>
>     $ cp $HGRCPATH $HGRCPATH.no-progress
>     $ cat >> $HGRCPATH <<EOF
> -  > [extensions]
> -  > progress =
>     > [progress]
>     > disable=False
>     > assume-tty = 1
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>

Patch

diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -1004,9 +1004,8 @@ 
     def progress(self, topic, pos, item="", unit="", total=None):
         '''show a progress message
 
-        With stock hg, this is simply a debug message that is hidden
-        by default, but with extensions or GUI tools it may be
-        visible. 'topic' is the current operation, 'item' is a
+        By default a textual progress bar will be displayed if an operation
+        takes too long. 'topic' is the current operation, 'item' is a
         non-numeric marker of the current position (i.e. the currently
         in-process file), 'pos' is the current numeric position (i.e.
         revision, bytes, etc.), unit is a corresponding unit label,
diff --git a/tests/test-archive.t b/tests/test-archive.t
--- a/tests/test-archive.t
+++ b/tests/test-archive.t
@@ -269,8 +269,6 @@ 
 
   $ cp $HGRCPATH $HGRCPATH.no-progress
   $ cat >> $HGRCPATH <<EOF
-  > [extensions]
-  > progress =
   > [progress]
   > assume-tty = 1
   > format = topic bar number
diff --git a/tests/test-convert-svn-move.t b/tests/test-convert-svn-move.t
--- a/tests/test-convert-svn-move.t
+++ b/tests/test-convert-svn-move.t
@@ -152,8 +152,6 @@ 
 Test convert progress bar
 
   $ cat >> $HGRCPATH <<EOF
-  > [extensions]
-  > progress =
   > [progress]
   > assume-tty = 1
   > delay = 0
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
@@ -255,8 +255,6 @@ 
 
   $ cp $HGRCPATH $HGRCPATH.no-progress
   $ cat >> $HGRCPATH <<EOF
-  > [extensions]
-  > progress =
   > [progress]
   > disable=False
   > assume-tty = 1