author | Sune Foldager <cryo@cyanite.org> |
Mon, 13 Sep 2010 16:12:25 +0200 | |
branch | stable |
changeset 12277 | a7d3147bd4b3 |
parent 11555 | d8d0fc3988ca |
child 12654 | 646eb9337c87 |
permissions | -rw-r--r-- |
10434 | 1 |
# progress.py show progress bars for some actions |
2 |
# |
|
3 |
# Copyright (C) 2010 Augie Fackler <durin42@gmail.com> |
|
4 |
# |
|
5 |
# This program is free software; you can redistribute it and/or modify it |
|
6 |
# under the terms of the GNU General Public License as published by the |
|
7 |
# Free Software Foundation; either version 2 of the License, or (at your |
|
8 |
# option) any later version. |
|
9 |
# |
|
10 |
# This program is distributed in the hope that it will be useful, but |
|
11 |
# WITHOUT ANY WARRANTY; without even the implied warranty of |
|
12 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
|
13 |
# Public License for more details. |
|
14 |
# |
|
15 |
# You should have received a copy of the GNU General Public License along |
|
16 |
# with this program; if not, write to the Free Software Foundation, Inc., |
|
17 |
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
||
19 |
"""show progress bars for some actions |
|
20 |
||
10450 | 21 |
This extension uses the progress information logged by hg commands |
22 |
to draw progress bars that are as informative as possible. Some progress |
|
10434 | 23 |
bars only offer indeterminate information, while others have a definite |
24 |
end point. |
|
25 |
||
26 |
The following settings are available:: |
|
27 |
||
28 |
[progress] |
|
29 |
delay = 3 # number of seconds (float) before showing the progress bar |
|
30 |
refresh = 0.1 # time in seconds between refreshes of the progress bar |
|
31 |
format = topic bar number # format of the progress bar |
|
32 |
width = <none> # if set, the maximum width of the progress information |
|
33 |
# (that is, min(width, term width) will be used) |
|
34 |
clear-complete = True # clear the progress bar after it's done |
|
10656
f6ee02933af9
progress: document progress.disable config option
Augie Fackler <durin42@gmail.com>
parents:
10594
diff
changeset
|
35 |
disable = False # if true, don't show a progress bar |
10788
ca6ba6cac6cd
progress: use stderr instead of stdout; check stderr.isatty()
Augie Fackler <durin42@gmail.com>
parents:
10656
diff
changeset
|
36 |
assume-tty = False # if true, ALWAYS show a progress bar, unless |
ca6ba6cac6cd
progress: use stderr instead of stdout; check stderr.isatty()
Augie Fackler <durin42@gmail.com>
parents:
10656
diff
changeset
|
37 |
# disable is given |
10434 | 38 |
|
10471
132eb7128ad5
progress: use inline literals in help string
Martin Geisler <mg@lazybytes.net>
parents:
10464
diff
changeset
|
39 |
Valid entries for the format field are topic, bar, number, unit, and |
132eb7128ad5
progress: use inline literals in help string
Martin Geisler <mg@lazybytes.net>
parents:
10464
diff
changeset
|
40 |
item. item defaults to the last 20 characters of the item, but this |
132eb7128ad5
progress: use inline literals in help string
Martin Geisler <mg@lazybytes.net>
parents:
10464
diff
changeset
|
41 |
can be changed by adding either ``-<num>`` which would take the last |
132eb7128ad5
progress: use inline literals in help string
Martin Geisler <mg@lazybytes.net>
parents:
10464
diff
changeset
|
42 |
num characters, or ``+<num>`` for the first num characters. |
10434 | 43 |
""" |
44 |
||
45 |
import sys |
|
46 |
import time |
|
47 |
||
48 |
from mercurial import util |
|
49 |
||
50 |
def spacejoin(*args): |
|
10452
59f8fff4f887
progress: simplify spacejoin()
Brodie Rao <me+hg@dackz.net>
parents:
10450
diff
changeset
|
51 |
return ' '.join(s for s in args if s) |
10434 | 52 |
|
11458
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
53 |
def shouldprint(ui): |
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
54 |
return sys.stderr.isatty() or ui.configbool('progress', 'assume-tty') |
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
55 |
|
10434 | 56 |
class progbar(object): |
57 |
def __init__(self, ui): |
|
58 |
self.ui = ui |
|
59 |
self.resetstate() |
|
60 |
||
61 |
def resetstate(self): |
|
62 |
self.topics = [] |
|
63 |
self.printed = False |
|
64 |
self.lastprint = time.time() + float(self.ui.config( |
|
65 |
'progress', 'delay', default=3)) |
|
66 |
self.indetcount = 0 |
|
67 |
self.refresh = float(self.ui.config( |
|
68 |
'progress', 'refresh', default=0.1)) |
|
69 |
self.order = self.ui.configlist( |
|
70 |
'progress', 'format', |
|
71 |
default=['topic', 'bar', 'number']) |
|
72 |
||
73 |
def show(self, topic, pos, item, unit, total): |
|
11458
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
74 |
if not shouldprint(self.ui): |
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
75 |
return |
10434 | 76 |
termwidth = self.width() |
77 |
self.printed = True |
|
78 |
head = '' |
|
79 |
needprogress = False |
|
80 |
tail = '' |
|
81 |
for indicator in self.order: |
|
82 |
add = '' |
|
83 |
if indicator == 'topic': |
|
84 |
add = topic |
|
85 |
elif indicator == 'number': |
|
86 |
if total: |
|
87 |
add = ('% ' + str(len(str(total))) + |
|
88 |
's/%s') % (pos, total) |
|
89 |
else: |
|
90 |
add = str(pos) |
|
91 |
elif indicator.startswith('item') and item: |
|
92 |
slice = 'end' |
|
93 |
if '-' in indicator: |
|
94 |
wid = int(indicator.split('-')[1]) |
|
95 |
elif '+' in indicator: |
|
96 |
slice = 'beginning' |
|
97 |
wid = int(indicator.split('+')[1]) |
|
98 |
else: |
|
99 |
wid = 20 |
|
100 |
if slice == 'end': |
|
101 |
add = item[-wid:] |
|
102 |
else: |
|
103 |
add = item[:wid] |
|
104 |
add += (wid - len(add)) * ' ' |
|
105 |
elif indicator == 'bar': |
|
106 |
add = '' |
|
107 |
needprogress = True |
|
108 |
elif indicator == 'unit' and unit: |
|
109 |
add = unit |
|
110 |
if not needprogress: |
|
111 |
head = spacejoin(head, add) |
|
112 |
else: |
|
113 |
tail = spacejoin(add, tail) |
|
114 |
if needprogress: |
|
115 |
used = 0 |
|
116 |
if head: |
|
117 |
used += len(head) + 1 |
|
118 |
if tail: |
|
119 |
used += len(tail) + 1 |
|
120 |
progwidth = termwidth - used - 3 |
|
10891
83af68e38be3
progress: fall back to indeterminate progress if position is >= total
Augie Fackler <durin42@gmail.com>
parents:
10815
diff
changeset
|
121 |
if total and pos <= total: |
10434 | 122 |
amt = pos * progwidth // total |
10453
7edc649f9f7e
progress: make determinate bar more like wget progress bar
Brodie Rao <me+hg@dackz.net>
parents:
10452
diff
changeset
|
123 |
bar = '=' * (amt - 1) |
7edc649f9f7e
progress: make determinate bar more like wget progress bar
Brodie Rao <me+hg@dackz.net>
parents:
10452
diff
changeset
|
124 |
if amt > 0: |
7edc649f9f7e
progress: make determinate bar more like wget progress bar
Brodie Rao <me+hg@dackz.net>
parents:
10452
diff
changeset
|
125 |
bar += '>' |
7edc649f9f7e
progress: make determinate bar more like wget progress bar
Brodie Rao <me+hg@dackz.net>
parents:
10452
diff
changeset
|
126 |
bar += ' ' * (progwidth - amt) |
10434 | 127 |
else: |
128 |
progwidth -= 3 |
|
129 |
self.indetcount += 1 |
|
130 |
# mod the count by twice the width so we can make the |
|
131 |
# cursor bounce between the right and left sides |
|
132 |
amt = self.indetcount % (2 * progwidth) |
|
133 |
amt -= progwidth |
|
134 |
bar = (' ' * int(progwidth - abs(amt)) + '<=>' + |
|
135 |
' ' * int(abs(amt))) |
|
136 |
prog = ''.join(('[', bar , ']')) |
|
137 |
out = spacejoin(head, prog, tail) |
|
138 |
else: |
|
139 |
out = spacejoin(head, tail) |
|
10788
ca6ba6cac6cd
progress: use stderr instead of stdout; check stderr.isatty()
Augie Fackler <durin42@gmail.com>
parents:
10656
diff
changeset
|
140 |
sys.stderr.write('\r' + out[:termwidth]) |
ca6ba6cac6cd
progress: use stderr instead of stdout; check stderr.isatty()
Augie Fackler <durin42@gmail.com>
parents:
10656
diff
changeset
|
141 |
sys.stderr.flush() |
10434 | 142 |
|
143 |
def clear(self): |
|
11458
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
144 |
if not shouldprint(self.ui): |
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
145 |
return |
10788
ca6ba6cac6cd
progress: use stderr instead of stdout; check stderr.isatty()
Augie Fackler <durin42@gmail.com>
parents:
10656
diff
changeset
|
146 |
sys.stderr.write('\r%s\r' % (' ' * self.width())) |
10434 | 147 |
|
10439
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
148 |
def complete(self): |
11458
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
149 |
if not shouldprint(self.ui): |
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
150 |
return |
10439
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
151 |
if self.ui.configbool('progress', 'clear-complete', default=True): |
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
152 |
self.clear() |
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
153 |
else: |
10788
ca6ba6cac6cd
progress: use stderr instead of stdout; check stderr.isatty()
Augie Fackler <durin42@gmail.com>
parents:
10656
diff
changeset
|
154 |
sys.stderr.write('\n') |
ca6ba6cac6cd
progress: use stderr instead of stdout; check stderr.isatty()
Augie Fackler <durin42@gmail.com>
parents:
10656
diff
changeset
|
155 |
sys.stderr.flush() |
10439
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
156 |
|
10434 | 157 |
def width(self): |
158 |
tw = util.termwidth() |
|
159 |
return min(int(self.ui.config('progress', 'width', default=tw)), tw) |
|
160 |
||
11555
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
161 |
def progress(self, topic, pos, item='', unit='', total=None): |
10439
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
162 |
if pos is None: |
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
163 |
if self.topics and self.topics[-1] == topic and self.printed: |
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
164 |
self.complete() |
10441
dc0d1ca2d378
progress: only reset state if finishing progress for the current topic
Augie Fackler <durin42@gmail.com>
parents:
10439
diff
changeset
|
165 |
self.resetstate() |
10439
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
166 |
else: |
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
167 |
if topic not in self.topics: |
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
168 |
self.topics.append(topic) |
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
169 |
now = time.time() |
10464
149ad0a3ec91
progress: make progress.refresh=0 always display the progress line
Patrick Mezard <pmezard@gmail.com>
parents:
10463
diff
changeset
|
170 |
if (now - self.lastprint >= self.refresh |
149ad0a3ec91
progress: make progress.refresh=0 always display the progress line
Patrick Mezard <pmezard@gmail.com>
parents:
10463
diff
changeset
|
171 |
and topic == self.topics[-1]): |
10439
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
172 |
self.lastprint = now |
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
173 |
self.show(topic, pos, item, unit, total) |
10434 | 174 |
|
175 |
def uisetup(ui): |
|
11555
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
176 |
class progressui(ui.__class__): |
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
177 |
_progbar = None |
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
178 |
|
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
179 |
def progress(self, *args, **opts): |
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
180 |
self._progbar.progress(*args, **opts) |
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
181 |
return super(progressui, self).progress(*args, **opts) |
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
182 |
|
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
183 |
def write(self, *args, **opts): |
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
184 |
if self._progbar.printed: |
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
185 |
self._progbar.clear() |
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
186 |
return super(progressui, self).write(*args, **opts) |
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
187 |
|
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
188 |
def write_err(self, *args, **opts): |
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
189 |
if self._progbar.printed: |
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
190 |
self._progbar.clear() |
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
191 |
return super(progressui, self).write_err(*args, **opts) |
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
192 |
|
10540
dd9d057465c1
progress: provide an explicit disable method for developers
Steve Borho <steve@borho.org>
parents:
10523
diff
changeset
|
193 |
# Apps that derive a class from ui.ui() can use |
dd9d057465c1
progress: provide an explicit disable method for developers
Steve Borho <steve@borho.org>
parents:
10523
diff
changeset
|
194 |
# setconfig('progress', 'disable', 'True') to disable this extension |
dd9d057465c1
progress: provide an explicit disable method for developers
Steve Borho <steve@borho.org>
parents:
10523
diff
changeset
|
195 |
if ui.configbool('progress', 'disable'): |
dd9d057465c1
progress: provide an explicit disable method for developers
Steve Borho <steve@borho.org>
parents:
10523
diff
changeset
|
196 |
return |
11458
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
197 |
if shouldprint(ui) and not ui.debugflag and not ui.quiet: |
11555
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
198 |
ui.__class__ = progressui |
10434 | 199 |
# we instantiate one globally shared progress bar to avoid |
200 |
# competing progress bars when multiple UI objects get created |
|
11555
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
201 |
if not progressui._progbar: |
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
202 |
progressui._progbar = progbar(ui) |
10434 | 203 |
|
204 |
def reposetup(ui, repo): |
|
205 |
uisetup(repo.ui) |