This is an archive of the discontinued Mercurial Phabricator instance.

progress: demonstrate non-linear progress has a bad ETA experience
ClosedPublic

Authored by quark on Sep 26 2017, 3:56 PM.

Download Raw Diff

Details

Reviewers

mbthomas
indygreg
durin42

Group Reviewers

hg-reviewers

Commits

rHGd64c2c050b54: progress: demonstrate non-linear progress has a bad ETA experience

Summary

Previously, the ETA and speed assumes the progress is linear. Often, due to
network or other issues, it could be fast for the most time, and suddenly
slow down:

[====================================================>         ]
 \___________________________________________/\______/
    very fast                                  suddenly much slower

This patch adds a test demonstrating the ETA could be way off in those
cases.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

quark created this revision.Sep 26 2017, 3:56 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptSep 26 2017, 3:56 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

quark added a child revision: D820: progress: make ETA only consider progress made in the last minute.Sep 26 2017, 3:56 PM

mbthomas accepted this revision.Sep 27 2017, 9:12 AM

indygreg accepted this revision.Sep 27 2017, 12:48 PM

This revision is now accepted and ready to land.Sep 27 2017, 12:48 PM

quark added a child revision: D828: progress: remove progress.estimate config.Sep 27 2017, 4:03 PM

quark updated this revision to Diff 2129.

quark removed a child revision: D820: progress: make ETA only consider progress made in the last minute.Sep 27 2017, 4:04 PM

durin42 accepted this revision.Sep 27 2017, 7:40 PM

Closed by commit rHGd64c2c050b54: progress: demonstrate non-linear progress has a bad ETA experience (authored by quark). · Explain WhySep 27 2017, 7:48 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-progress.t (33 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2090		Sep 26 2017, 3:56 PM	★	★
Diff 2	2129		Sep 27 2017, 4:03 PM	★	★
Diff 3	2132	rHGd64c2c050b54794ba117d622df729679b928039f	Sep 26 2017, 3:48 PM	★	★

Status	Author	Revision
Closed	quark	D820 progress: make ETA only consider progress made in the last minute
Closed	quark	D828 progress: remove progress.estimate config
Closed	quark	D819 progress: demonstrate non-linear progress has a bad ETA experience

Diff 2090

tests/test-progress.t


	$ cat > mocktime.py <<EOF			$ cat > mocktime.py <<EOF
	> import os			> import os
	> import time			> import time
	>			>
	> class mocktime(object):			> class mocktime(object):
	> def __init__(self, increment):			> def __init__(self, increment):
	> self.time = 0			> self.time = 0
	> self.increment = increment			> self.increment = [int(s) for s in increment.split()]
				> self.pos = 0
	> def __call__(self):			> def __call__(self):
	> self.time += self.increment			> self.time += self.increment[self.pos % len(self.increment)]
				> self.pos += 1
	> return self.time			> return self.time
	>			>
	> def uisetup(ui):			> def uisetup(ui):
	> time.time = mocktime(int(os.environ.get('MOCKTIME', '11')))			> time.time = mocktime(os.environ.get('MOCKTIME', '11'))
	> EOF			> EOF

	$ cp $HGRCPATH.orig $HGRCPATH			$ cp $HGRCPATH.orig $HGRCPATH
	$ echo "[extensions]" >> $HGRCPATH			$ echo "[extensions]" >> $HGRCPATH
	$ echo "mocktime=`pwd`/mocktime.py" >> $HGRCPATH			$ echo "mocktime=`pwd`/mocktime.py" >> $HGRCPATH
	$ echo "progress=" >> $HGRCPATH			$ echo "progress=" >> $HGRCPATH
	$ echo "loop=`pwd`/loop.py" >> $HGRCPATH			$ echo "loop=`pwd`/loop.py" >> $HGRCPATH
	$ echo "[progress]" >> $HGRCPATH			$ echo "[progress]" >> $HGRCPATH
	$ MOCKTIME=14000000 hg -y loop 4			$ MOCKTIME=14000000 hg -y loop 4
	\r (no-eol) (esc)			\r (no-eol) (esc)
	loop [ ] 0/4\r (no-eol) (esc)			loop [ ] 0/4\r (no-eol) (esc)
	loop [=========> ] 1/4 1y18w\r (no-eol) (esc)			loop [=========> ] 1/4 1y18w\r (no-eol) (esc)
	loop [===================> ] 2/4 46w03d\r (no-eol) (esc)			loop [===================> ] 2/4 46w03d\r (no-eol) (esc)
	loop [=============================> ] 3/4 23w02d\r (no-eol) (esc)			loop [=============================> ] 3/4 23w02d\r (no-eol) (esc)
	\r (no-eol) (esc)			\r (no-eol) (esc)

				Non-linear progress:

				$ MOCKTIME='20 20 20 20 20 20 20 20 20 20 500 500 500 500 500 20 20 20 20 20' hg -y loop 20
				\r (no-eol) (esc)
				loop [=> ] 1/20 6m21s\r (no-eol) (esc)
				loop [===> ] 2/20 6m01s\r (no-eol) (esc)
				loop [=====> ] 3/20 5m41s\r (no-eol) (esc)
				loop [=======> ] 4/20 5m21s\r (no-eol) (esc)
				loop [=========> ] 5/20 5m01s\r (no-eol) (esc)
				loop [===========> ] 6/20 4m41s\r (no-eol) (esc)
				loop [=============> ] 7/20 4m21s\r (no-eol) (esc)
				loop [===============> ] 8/20 4m01s\r (no-eol) (esc)
				loop [================> ] 9/20 13m27s\r (no-eol) (esc)
				loop [==================> ] 10/20 19m21s\r (no-eol) (esc)
				loop [====================> ] 11/20 22m39s\r (no-eol) (esc)
				loop [======================> ] 12/20 24m01s\r (no-eol) (esc)
				loop [========================> ] 13/20 23m53s\r (no-eol) (esc)
				loop [==========================> ] 14/20 19m09s\r (no-eol) (esc)
				loop [============================> ] 15/20 15m01s\r (no-eol) (esc)
				loop [==============================> ] 16/20 11m21s\r (no-eol) (esc)
				loop [=================================> ] 17/20 8m04s\r (no-eol) (esc)
				loop [===================================> ] 18/20 5m07s\r (no-eol) (esc)
				loop [=====================================> ] 19/20 2m27s\r (no-eol) (esc)
				\r (no-eol) (esc)

	Time estimates should not fail when there's no end point:			Time estimates should not fail when there's no end point:
	$ hg -y loop -- -4			$ hg -y loop -- -4
	\r (no-eol) (esc)			\r (no-eol) (esc)
	loop [ <=> ] 2\r (no-eol) (esc)			loop [ <=> ] 2\r (no-eol) (esc)
	loop [ <=> ] 3\r (no-eol) (esc)			loop [ <=> ] 3\r (no-eol) (esc)
	\r (no-eol) (esc)			\r (no-eol) (esc)

	#endif			#endif