[PATCH STABLE] progress: stop excessive clearing (issue4801)

[Matt Harbison]

On Fri, 06 May 2016 18:53:52 -0400, Matt Mackall <mpm at selenic.com> wrote:

> # HG changeset patch
> # User Matt Mackall <mpm at selenic.com>
> # Date 1462575186 18000
> #      Fri May 06 17:53:06 2016 -0500
> # Branch stable
> # Node ID 222b8170d69e74ed6970a51b73e83042a1b87b92
> # Parent  77de985d7c91c67650d9fba0e4b21dfdbd894eeb
> progress: stop excessive clearing (issue4801)

I still see the issue, when this is applied to 77de985d7c91.

test:

export HGRCPATH=

rm -rf foo
hg init foo
cd foo

cat > .hg/hgrc <<EOF
[merge-tools]
foo.executable = C:\Users\Matt\Projects\hg\tests\dummy-merge.bat
foo.check = prompt
foo.priority = 1

[ui]
username = foo

[extensions]
color =

[progress]
delay = -1
changedelay = -1
EOF

hg showconfig
hg version

echo 1 > xfile.txt
hg add xfile.txt
hg commit -m commit1

echo 2 > xfile.txt
hg commit -m commit2

hg update 0
echo 3 > xfile.txt
hg commit -m commit3

hg merge 1
cd ..

----------

dummy-merge.bat:

@echo off
exit 0

----------

yields:

bundle.mainreporoot=c:\Users\Matt\Projects\hg\foo
extensions.color=
merge-tools.foo.executable=C:\Users\Matt\Projects\hg\tests\dummy-merge.bat
merge-tools.foo.check=prompt
merge-tools.foo.priority=1
progress.delay=-1
progress.changedelay=-1
ui.username=foo
Mercurial Distributed SCM (version 3.5)
(see http://mercurial.selenic.com for more information)

Copyright (C) 2005-2015 Matt Mackall and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging xfile.txt
  _

(The last line, the blinking caret is indented one space, waiting for the  
response.)