##// END OF EJS Templates
ui: check for progress singleton when clearing progress bar (issue5684)...
Mark Thomas -
r34346:0e4bed5c stable
parent child Browse files
Show More
@@ -1481,7 +1481,7 b' class ui(object):'
1481
1481
1482 def _progclear(self):
1482 def _progclear(self):
1483 """clear progress bar output if any. use it before any output"""
1483 """clear progress bar output if any. use it before any output"""
1484 if '_progbar' not in vars(self): # nothing loaded yet
1484 if not haveprogbar(): # nothing loaded yet
1485 return
1485 return
1486 if self._progbar is not None and self._progbar.printed:
1486 if self._progbar is not None and self._progbar.printed:
1487 self._progbar.clear()
1487 self._progbar.clear()
@@ -1785,3 +1785,6 b' def getprogbar(ui):'
1785 # this is how the extension used to work but feel free to rework it.
1785 # this is how the extension used to work but feel free to rework it.
1786 _progresssingleton = progress.progbar(ui)
1786 _progresssingleton = progress.progbar(ui)
1787 return _progresssingleton
1787 return _progresssingleton
1788
1789 def haveprogbar():
1790 return _progresssingleton is not None
@@ -63,6 +63,14 b" Preparing the 'main' repo which depends "
63 \r (no-eol) (esc)
63 \r (no-eol) (esc)
64 \r (no-eol) (esc)
64 \r (no-eol) (esc)
65 updating [===========================================>] 3/3\r (no-eol) (esc)
65 updating [===========================================>] 3/3\r (no-eol) (esc)
66 \r (no-eol) (esc)
67 \r (no-eol) (esc)
68 linking [ <=> ] 1\r (no-eol) (esc)
69 linking [ <=> ] 2\r (no-eol) (esc)
70 linking [ <=> ] 3\r (no-eol) (esc)
71 linking [ <=> ] 4\r (no-eol) (esc)
72 linking [ <=> ] 5\r (no-eol) (esc)
73 linking [ <=> ] 6\r (no-eol) (esc)
66 updating [===========================================>] 1/1\r (no-eol) (esc)
74 updating [===========================================>] 1/1\r (no-eol) (esc)
67 \r (no-eol) (esc)
75 \r (no-eol) (esc)
68 updating to branch default
76 updating to branch default
@@ -154,7 +162,25 b' Clone main'
154 \r (no-eol) (esc)
162 \r (no-eol) (esc)
155 \r (no-eol) (esc)
163 \r (no-eol) (esc)
156 updating [===========================================>] 3/3\r (no-eol) (esc)
164 updating [===========================================>] 3/3\r (no-eol) (esc)
165 \r (no-eol) (esc)
166 \r (no-eol) (esc)
167 linking [ <=> ] 1\r (no-eol) (esc)
168 linking [ <=> ] 2\r (no-eol) (esc)
169 linking [ <=> ] 3\r (no-eol) (esc)
170 linking [ <=> ] 4\r (no-eol) (esc)
171 linking [ <=> ] 5\r (no-eol) (esc)
172 linking [ <=> ] 6\r (no-eol) (esc)
173 linking [ <=> ] 7\r (no-eol) (esc)
174 linking [ <=> ] 8\r (no-eol) (esc)
157 updating [===========================================>] 3/3\r (no-eol) (esc)
175 updating [===========================================>] 3/3\r (no-eol) (esc)
176 \r (no-eol) (esc)
177 \r (no-eol) (esc)
178 linking [ <=> ] 1\r (no-eol) (esc)
179 linking [ <=> ] 2\r (no-eol) (esc)
180 linking [ <=> ] 3\r (no-eol) (esc)
181 linking [ <=> ] 4\r (no-eol) (esc)
182 linking [ <=> ] 5\r (no-eol) (esc)
183 linking [ <=> ] 6\r (no-eol) (esc)
158 updating [===========================================>] 1/1\r (no-eol) (esc)
184 updating [===========================================>] 1/1\r (no-eol) (esc)
159 \r (no-eol) (esc)
185 \r (no-eol) (esc)
160 updating to branch default
186 updating to branch default
General Comments 0
You need to be logged in to leave comments. Login now