Mercurial > public > mercurial-scm > hg-stable
annotate hgext/progress.py @ 13131:c9ae7e096994
progress: Add estimated time remaining for long tasks
Output looks roughly like this:
updating [======================> ] 1547/4842 0m13s
output will either show h:m or m:s
| author | timeless <timeless@gmail.com> |
|---|---|
| date | Tue, 26 Oct 2010 14:41:58 +0300 |
| parents | f139f34ba330 |
| children | 24e3349cba8e |
| rev | line source |
|---|---|
| 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 | |
|
13131
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
48 from mercurial.i18n import _ |
| 10434 | 49 from mercurial import util |
| 50 | |
| 51 def spacejoin(*args): | |
|
10452
59f8fff4f887
progress: simplify spacejoin()
Brodie Rao <me+hg@dackz.net>
parents:
10450
diff
changeset
|
52 return ' '.join(s for s in args if s) |
| 10434 | 53 |
|
11458
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
54 def shouldprint(ui): |
|
12654
646eb9337c87
progress: make sure stderr has isatty before calling (issue2191)
Augie Fackler <durin42@gmail.com>
parents:
11555
diff
changeset
|
55 return (getattr(sys.stderr, 'isatty', None) and |
|
646eb9337c87
progress: make sure stderr has isatty before calling (issue2191)
Augie Fackler <durin42@gmail.com>
parents:
11555
diff
changeset
|
56 (sys.stderr.isatty() or ui.configbool('progress', 'assume-tty'))) |
|
11458
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
57 |
| 10434 | 58 class progbar(object): |
| 59 def __init__(self, ui): | |
| 60 self.ui = ui | |
| 61 self.resetstate() | |
| 62 | |
| 63 def resetstate(self): | |
| 64 self.topics = [] | |
|
13130
f139f34ba330
progress: react more reasonably to nested progress topics
Augie Fackler <durin42@gmail.com>
parents:
12689
diff
changeset
|
65 self.topicstates = {} |
|
13131
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
66 self.starttimes = {} |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
67 self.startvals = {} |
| 10434 | 68 self.printed = False |
| 69 self.lastprint = time.time() + float(self.ui.config( | |
| 70 'progress', 'delay', default=3)) | |
| 71 self.indetcount = 0 | |
| 72 self.refresh = float(self.ui.config( | |
| 73 'progress', 'refresh', default=0.1)) | |
| 74 self.order = self.ui.configlist( | |
| 75 'progress', 'format', | |
| 76 default=['topic', 'bar', 'number']) | |
| 77 | |
|
13131
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
78 def show(self, now, topic, pos, item, unit, total): |
|
11458
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
79 if not shouldprint(self.ui): |
|
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
80 return |
| 10434 | 81 termwidth = self.width() |
| 82 self.printed = True | |
| 83 head = '' | |
| 84 needprogress = False | |
| 85 tail = '' | |
| 86 for indicator in self.order: | |
| 87 add = '' | |
| 88 if indicator == 'topic': | |
| 89 add = topic | |
| 90 elif indicator == 'number': | |
| 91 if total: | |
| 92 add = ('% ' + str(len(str(total))) + | |
| 93 's/%s') % (pos, total) | |
| 94 else: | |
| 95 add = str(pos) | |
| 96 elif indicator.startswith('item') and item: | |
| 97 slice = 'end' | |
| 98 if '-' in indicator: | |
| 99 wid = int(indicator.split('-')[1]) | |
| 100 elif '+' in indicator: | |
| 101 slice = 'beginning' | |
| 102 wid = int(indicator.split('+')[1]) | |
| 103 else: | |
| 104 wid = 20 | |
| 105 if slice == 'end': | |
| 106 add = item[-wid:] | |
| 107 else: | |
| 108 add = item[:wid] | |
| 109 add += (wid - len(add)) * ' ' | |
| 110 elif indicator == 'bar': | |
| 111 add = '' | |
| 112 needprogress = True | |
| 113 elif indicator == 'unit' and unit: | |
| 114 add = unit | |
| 115 if not needprogress: | |
| 116 head = spacejoin(head, add) | |
| 117 else: | |
| 118 tail = spacejoin(add, tail) | |
| 119 if needprogress: | |
| 120 used = 0 | |
| 121 if head: | |
| 122 used += len(head) + 1 | |
| 123 if tail: | |
| 124 used += len(tail) + 1 | |
| 125 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
|
126 if total and pos <= total: |
|
13131
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
127 initial = self.startvals[topic] |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
128 target = total - initial |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
129 delta = pos - initial |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
130 if delta > 0: |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
131 elapsed = now - self.starttimes[topic] |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
132 if elapsed > float( |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
133 self.ui.config('progress', 'estimate', default=2)): |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
134 seconds = (elapsed * (target - delta)) // delta + 1 |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
135 minutes = seconds // 60 |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
136 if minutes < 10: |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
137 seconds -= minutes * 60 |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
138 remaining = _("%dm%02ds") % (minutes, seconds) |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
139 else: |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
140 # we're going to ignore seconds in this case |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
141 minutes += 1 |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
142 hours = minutes // 60 |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
143 minutes -= hours * 60 |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
144 remaining = _("%dh%02dm") % (hours, minutes) |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
145 progwidth -= len(remaining) + 1 |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
146 tail = spacejoin(tail, remaining) |
| 10434 | 147 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
|
148 bar = '=' * (amt - 1) |
|
7edc649f9f7e
progress: make determinate bar more like wget progress bar
Brodie Rao <me+hg@dackz.net>
parents:
10452
diff
changeset
|
149 if amt > 0: |
|
7edc649f9f7e
progress: make determinate bar more like wget progress bar
Brodie Rao <me+hg@dackz.net>
parents:
10452
diff
changeset
|
150 bar += '>' |
|
7edc649f9f7e
progress: make determinate bar more like wget progress bar
Brodie Rao <me+hg@dackz.net>
parents:
10452
diff
changeset
|
151 bar += ' ' * (progwidth - amt) |
| 10434 | 152 else: |
| 153 progwidth -= 3 | |
| 154 self.indetcount += 1 | |
| 155 # mod the count by twice the width so we can make the | |
| 156 # cursor bounce between the right and left sides | |
| 157 amt = self.indetcount % (2 * progwidth) | |
| 158 amt -= progwidth | |
| 159 bar = (' ' * int(progwidth - abs(amt)) + '<=>' + | |
| 160 ' ' * int(abs(amt))) | |
| 161 prog = ''.join(('[', bar , ']')) | |
| 162 out = spacejoin(head, prog, tail) | |
| 163 else: | |
| 164 out = spacejoin(head, tail) | |
|
10788
ca6ba6cac6cd
progress: use stderr instead of stdout; check stderr.isatty()
Augie Fackler <durin42@gmail.com>
parents:
10656
diff
changeset
|
165 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
|
166 sys.stderr.flush() |
| 10434 | 167 |
| 168 def clear(self): | |
|
11458
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
169 if not shouldprint(self.ui): |
|
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
170 return |
|
10788
ca6ba6cac6cd
progress: use stderr instead of stdout; check stderr.isatty()
Augie Fackler <durin42@gmail.com>
parents:
10656
diff
changeset
|
171 sys.stderr.write('\r%s\r' % (' ' * self.width())) |
| 10434 | 172 |
|
10439
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
173 def complete(self): |
|
11458
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
174 if not shouldprint(self.ui): |
|
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
175 return |
|
10439
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
176 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
|
177 self.clear() |
|
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
178 else: |
|
10788
ca6ba6cac6cd
progress: use stderr instead of stdout; check stderr.isatty()
Augie Fackler <durin42@gmail.com>
parents:
10656
diff
changeset
|
179 sys.stderr.write('\n') |
|
ca6ba6cac6cd
progress: use stderr instead of stdout; check stderr.isatty()
Augie Fackler <durin42@gmail.com>
parents:
10656
diff
changeset
|
180 sys.stderr.flush() |
|
10439
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
181 |
| 10434 | 182 def width(self): |
|
12689
c52c629ce19e
termwidth: move to ui.ui from util
Augie Fackler <durin42@gmail.com>
parents:
12654
diff
changeset
|
183 tw = self.ui.termwidth() |
| 10434 | 184 return min(int(self.ui.config('progress', 'width', default=tw)), tw) |
| 185 | |
|
11555
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
186 def progress(self, topic, pos, item='', unit='', total=None): |
|
13131
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
187 now = time.time() |
|
10439
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
188 if pos is None: |
|
13131
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
189 self.starttimes.pop(topic, None) |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
190 self.startvals.pop(topic, None) |
|
13130
f139f34ba330
progress: react more reasonably to nested progress topics
Augie Fackler <durin42@gmail.com>
parents:
12689
diff
changeset
|
191 self.topicstates.pop(topic, None) |
|
f139f34ba330
progress: react more reasonably to nested progress topics
Augie Fackler <durin42@gmail.com>
parents:
12689
diff
changeset
|
192 # reset the progress bar if this is the outermost topic |
|
f139f34ba330
progress: react more reasonably to nested progress topics
Augie Fackler <durin42@gmail.com>
parents:
12689
diff
changeset
|
193 if self.topics and self.topics[0] == topic and self.printed: |
|
10439
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
194 self.complete() |
|
10441
dc0d1ca2d378
progress: only reset state if finishing progress for the current topic
Augie Fackler <durin42@gmail.com>
parents:
10439
diff
changeset
|
195 self.resetstate() |
|
13130
f139f34ba330
progress: react more reasonably to nested progress topics
Augie Fackler <durin42@gmail.com>
parents:
12689
diff
changeset
|
196 # truncate the list of topics assuming all topics within |
|
f139f34ba330
progress: react more reasonably to nested progress topics
Augie Fackler <durin42@gmail.com>
parents:
12689
diff
changeset
|
197 # this one are also closed |
|
f139f34ba330
progress: react more reasonably to nested progress topics
Augie Fackler <durin42@gmail.com>
parents:
12689
diff
changeset
|
198 if topic in self.topics: |
|
f139f34ba330
progress: react more reasonably to nested progress topics
Augie Fackler <durin42@gmail.com>
parents:
12689
diff
changeset
|
199 self.topics = self.topics[:self.topics.index(topic)] |
|
10439
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
200 else: |
|
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
201 if topic not in self.topics: |
|
13131
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
202 self.starttimes[topic] = now |
|
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
203 self.startvals[topic] = pos |
|
10439
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
204 self.topics.append(topic) |
|
13130
f139f34ba330
progress: react more reasonably to nested progress topics
Augie Fackler <durin42@gmail.com>
parents:
12689
diff
changeset
|
205 self.topicstates[topic] = pos, item, unit, total |
|
f139f34ba330
progress: react more reasonably to nested progress topics
Augie Fackler <durin42@gmail.com>
parents:
12689
diff
changeset
|
206 if now - self.lastprint >= self.refresh and self.topics: |
|
10439
509f4ed56509
progress: correctly handle empty progress topic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10434
diff
changeset
|
207 self.lastprint = now |
|
13130
f139f34ba330
progress: react more reasonably to nested progress topics
Augie Fackler <durin42@gmail.com>
parents:
12689
diff
changeset
|
208 current = self.topics[-1] |
|
13131
c9ae7e096994
progress: Add estimated time remaining for long tasks
timeless <timeless@gmail.com>
parents:
13130
diff
changeset
|
209 self.show(now, topic, *self.topicstates[topic]) |
| 10434 | 210 |
| 211 def uisetup(ui): | |
|
11555
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
212 class progressui(ui.__class__): |
|
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
213 _progbar = None |
|
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
214 |
|
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
215 def progress(self, *args, **opts): |
|
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
216 self._progbar.progress(*args, **opts) |
|
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
217 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
|
218 |
|
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
219 def write(self, *args, **opts): |
|
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
220 if self._progbar.printed: |
|
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
221 self._progbar.clear() |
|
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
222 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
|
223 |
|
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
224 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
|
225 if self._progbar.printed: |
|
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
226 self._progbar.clear() |
|
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
227 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
|
228 |
|
10540
dd9d057465c1
progress: provide an explicit disable method for developers
Steve Borho <steve@borho.org>
parents:
10523
diff
changeset
|
229 # 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
|
230 # 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
|
231 if ui.configbool('progress', 'disable'): |
|
dd9d057465c1
progress: provide an explicit disable method for developers
Steve Borho <steve@borho.org>
parents:
10523
diff
changeset
|
232 return |
|
11458
ec21d91c79b3
progress: check stderr.isatty() before each print
Augie Fackler <durin42@gmail.com>
parents:
10891
diff
changeset
|
233 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
|
234 ui.__class__ = progressui |
| 10434 | 235 # we instantiate one globally shared progress bar to avoid |
| 236 # 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
|
237 if not progressui._progbar: |
|
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11458
diff
changeset
|
238 progressui._progbar = progbar(ui) |
| 10434 | 239 |
| 240 def reposetup(ui, repo): | |
| 241 uisetup(repo.ui) |