bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
3948.2.2
by Martin Pool
Corrections to finishing progress bars |
1 |
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
|
1185.1.29
by Robert Collins
merge merge tweaks from aaron, which includes latest .dev |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
|
1185.1.29
by Robert Collins
merge merge tweaks from aaron, which includes latest .dev |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
|
1185.1.29
by Robert Collins
merge merge tweaks from aaron, which includes latest .dev |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
17 |
"""UI abstraction.
|
|
18 |
||
19 |
This tells the library how to display things to the user. Through this
|
|
20 |
layer different applications can choose the style of UI.
|
|
21 |
||
22 |
At the moment this layer is almost trivial: the application can just
|
|
23 |
choose the style of progress bar.
|
|
24 |
||
25 |
Set the ui_factory member to define the behaviour. The default
|
|
26 |
displays no output.
|
|
27 |
"""
|
|
28 |
||
|
3882.8.11
by Martin Pool
Choose the UIFactory class depending on the terminal capabilities |
29 |
import os |
|
1687.1.4
by Robert Collins
Add bzrlib.ui.ui_factory.get_boolean(). |
30 |
import sys |
|
3882.8.12
by Martin Pool
Give a warning, not an error, if a progress bar is not finished in order |
31 |
import warnings |
|
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
32 |
|
|
1996.3.32
by John Arbash Meinel
from bzrlib.ui lazy import progress, and make progress import lazily |
33 |
from bzrlib.lazy_import import lazy_import |
34 |
lazy_import(globals(), """ |
|
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
35 |
import getpass
|
36 |
||
|
1996.3.32
by John Arbash Meinel
from bzrlib.ui lazy import progress, and make progress import lazily |
37 |
from bzrlib import (
|
|
3260.2.1
by Alexander Belchenko
Don't ask a password if there is no real terminal. (#69851) |
38 |
errors,
|
|
2461.1.2
by Vincent Ladeuil
Take jam's remark into account. |
39 |
osutils,
|
|
1996.3.32
by John Arbash Meinel
from bzrlib.ui lazy import progress, and make progress import lazily |
40 |
progress,
|
|
2323.6.2
by Martin Pool
Move responsibility for suggesting upgrades to ui object |
41 |
trace,
|
|
1996.3.32
by John Arbash Meinel
from bzrlib.ui lazy import progress, and make progress import lazily |
42 |
)
|
43 |
""") |
|
44 |
||
|
1185.1.29
by Robert Collins
merge merge tweaks from aaron, which includes latest .dev |
45 |
|
|
1185.49.21
by John Arbash Meinel
Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms. |
46 |
class UIFactory(object): |
47 |
"""UI abstraction. |
|
48 |
||
49 |
This tells the library how to display things to the user. Through this
|
|
50 |
layer different applications can choose the style of UI.
|
|
51 |
"""
|
|
|
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
52 |
|
|
1594.1.3
by Robert Collins
Fixup pb usage to use nested_progress_bar. |
53 |
def __init__(self): |
|
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
54 |
self._task_stack = [] |
|
1594.1.3
by Robert Collins
Fixup pb usage to use nested_progress_bar. |
55 |
|
|
1185.49.22
by John Arbash Meinel
Added get_password to the UIFactory, using it inside of sftp.py |
56 |
def get_password(self, prompt='', **kwargs): |
57 |
"""Prompt the user for a password. |
|
58 |
||
59 |
:param prompt: The prompt to present the user
|
|
60 |
:param kwargs: Arguments which will be expanded into the prompt.
|
|
61 |
This lets front ends display different things if
|
|
62 |
they so choose.
|
|
|
2294.4.1
by Vincent Ladeuil
Add a UIFactory.get_login method, fix tests. |
63 |
|
64 |
:return: The password string, return None if the user canceled the
|
|
65 |
request. Note that we do not touch the encoding, users may
|
|
66 |
have whatever they see fit and the password should be
|
|
67 |
transported as is.
|
|
|
1185.49.22
by John Arbash Meinel
Added get_password to the UIFactory, using it inside of sftp.py |
68 |
"""
|
|
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
69 |
raise NotImplementedError(self.get_password) |
|
2294.4.1
by Vincent Ladeuil
Add a UIFactory.get_login method, fix tests. |
70 |
|
|
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
71 |
def nested_progress_bar(self): |
72 |
"""Return a nested progress bar. |
|
73 |
||
|
2095.4.5
by mbp at sourcefrog
Use regular progress-bar classes, not a special mechanism |
74 |
When the bar has been finished with, it should be released by calling
|
|
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
75 |
bar.finished().
|
76 |
"""
|
|
|
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
77 |
if self._task_stack: |
|
3882.8.3
by Martin Pool
Move display of transport throughput into TextProgressView |
78 |
t = progress.ProgressTask(self._task_stack[-1], self) |
|
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
79 |
else: |
|
3882.8.3
by Martin Pool
Move display of transport throughput into TextProgressView |
80 |
t = progress.ProgressTask(None, self) |
|
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
81 |
self._task_stack.append(t) |
82 |
return t |
|
83 |
||
|
3948.2.3
by Martin Pool
Make the interface from ProgressTask to ui more private |
84 |
def _progress_finished(self, task): |
85 |
"""Called by the ProgressTask when it finishes""" |
|
86 |
if not self._task_stack: |
|
87 |
warnings.warn("%r finished but nothing is active" |
|
88 |
% (task,)) |
|
89 |
elif task != self._task_stack[-1]: |
|
|
3948.2.2
by Martin Pool
Corrections to finishing progress bars |
90 |
warnings.warn("%r is not the active task %r" |
91 |
% (task, self._task_stack[-1])) |
|
|
3882.8.12
by Martin Pool
Give a warning, not an error, if a progress bar is not finished in order |
92 |
else: |
93 |
del self._task_stack[-1] |
|
|
3948.2.3
by Martin Pool
Make the interface from ProgressTask to ui more private |
94 |
if not self._task_stack: |
|
3948.2.5
by Martin Pool
rename to _progress_all_finished |
95 |
self._progress_all_finished() |
|
3948.2.3
by Martin Pool
Make the interface from ProgressTask to ui more private |
96 |
|
|
3948.2.5
by Martin Pool
rename to _progress_all_finished |
97 |
def _progress_all_finished(self): |
|
3948.2.3
by Martin Pool
Make the interface from ProgressTask to ui more private |
98 |
"""Called when the top-level progress task finished""" |
99 |
pass
|
|
100 |
||
101 |
def _progress_updated(self, task): |
|
102 |
"""Called by the ProgressTask when it changes. |
|
103 |
|
|
|
3948.2.7
by Martin Pool
pep8 |
104 |
Should be specialized to draw the progress.
|
105 |
"""
|
|
|
3948.2.3
by Martin Pool
Make the interface from ProgressTask to ui more private |
106 |
pass
|
|
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
107 |
|
|
1558.8.1
by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning' |
108 |
def clear_term(self): |
109 |
"""Prepare the terminal for output. |
|
110 |
||
111 |
This will, for example, clear text progress bars, and leave the
|
|
|
3948.2.7
by Martin Pool
pep8 |
112 |
cursor at the leftmost position.
|
113 |
"""
|
|
|
3948.2.2
by Martin Pool
Corrections to finishing progress bars |
114 |
pass
|
|
1558.8.1
by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning' |
115 |
|
|
1687.1.4
by Robert Collins
Add bzrlib.ui.ui_factory.get_boolean(). |
116 |
def get_boolean(self, prompt): |
117 |
"""Get a boolean question answered from the user. |
|
118 |
||
119 |
:param prompt: a message to prompt the user with. Should be a single
|
|
120 |
line without terminating \n.
|
|
121 |
:return: True or False for y/yes or n/no.
|
|
122 |
"""
|
|
123 |
raise NotImplementedError(self.get_boolean) |
|
124 |
||
|
2323.6.2
by Martin Pool
Move responsibility for suggesting upgrades to ui object |
125 |
def recommend_upgrade(self, |
126 |
current_format_name, |
|
127 |
basedir): |
|
|
2323.6.4
by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which |
128 |
# this should perhaps be in the TextUIFactory and the default can do
|
129 |
# nothing
|
|
|
2323.6.2
by Martin Pool
Move responsibility for suggesting upgrades to ui object |
130 |
trace.warning("%s is deprecated " |
131 |
"and a better format is available.\n" |
|
132 |
"It is recommended that you upgrade by "
|
|
133 |
"running the command\n" |
|
134 |
" bzr upgrade %s", |
|
135 |
current_format_name, |
|
136 |
basedir) |
|
|
2323.6.4
by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which |
137 |
|
|
3882.7.5
by Martin Pool
Further mockup of transport-based activity indicator. |
138 |
def report_transport_activity(self, transport, byte_count, direction): |
139 |
"""Called by transports as they do IO. |
|
140 |
|
|
141 |
This may update a progress bar, spinner, or similar display.
|
|
142 |
By default it does nothing.
|
|
143 |
"""
|
|
144 |
pass
|
|
145 |
||
146 |
||
|
2461.1.1
by Vincent Ladeuil
Fix 110204 by letting TestUIFactory encode password prompt. |
147 |
|
|
1687.1.4
by Robert Collins
Add bzrlib.ui.ui_factory.get_boolean(). |
148 |
class CLIUIFactory(UIFactory): |
|
3882.8.11
by Martin Pool
Choose the UIFactory class depending on the terminal capabilities |
149 |
"""Common behaviour for command line UI factories. |
150 |
|
|
151 |
This is suitable for dumb terminals that can't repaint existing text."""
|
|
|
1687.1.4
by Robert Collins
Add bzrlib.ui.ui_factory.get_boolean(). |
152 |
|
|
3882.8.11
by Martin Pool
Choose the UIFactory class depending on the terminal capabilities |
153 |
def __init__(self, stdin=None, stdout=None, stderr=None): |
154 |
UIFactory.__init__(self) |
|
155 |
self.stdin = stdin or sys.stdin |
|
156 |
self.stdout = stdout or sys.stdout |
|
157 |
self.stderr = stderr or sys.stderr |
|
|
1687.1.4
by Robert Collins
Add bzrlib.ui.ui_factory.get_boolean(). |
158 |
|
159 |
def get_boolean(self, prompt): |
|
160 |
self.clear_term() |
|
161 |
# FIXME: make a regexp and handle case variations as well.
|
|
162 |
while True: |
|
|
2294.4.1
by Vincent Ladeuil
Add a UIFactory.get_login method, fix tests. |
163 |
self.prompt(prompt + "? [y/n]: ") |
|
1687.1.4
by Robert Collins
Add bzrlib.ui.ui_factory.get_boolean(). |
164 |
line = self.stdin.readline() |
165 |
if line in ('y\n', 'yes\n'): |
|
166 |
return True |
|
167 |
if line in ('n\n', 'no\n'): |
|
168 |
return False |
|
169 |
||
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
170 |
def get_non_echoed_password(self, prompt): |
|
3260.2.1
by Alexander Belchenko
Don't ask a password if there is no real terminal. (#69851) |
171 |
if not sys.stdin.isatty(): |
172 |
raise errors.NotATerminal() |
|
|
2461.1.2
by Vincent Ladeuil
Take jam's remark into account. |
173 |
encoding = osutils.get_terminal_encoding() |
174 |
return getpass.getpass(prompt.encode(encoding, 'replace')) |
|
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
175 |
|
176 |
def get_password(self, prompt='', **kwargs): |
|
177 |
"""Prompt the user for a password. |
|
178 |
||
179 |
:param prompt: The prompt to present the user
|
|
180 |
:param kwargs: Arguments which will be expanded into the prompt.
|
|
181 |
This lets front ends display different things if
|
|
182 |
they so choose.
|
|
183 |
:return: The password string, return None if the user
|
|
184 |
canceled the request.
|
|
185 |
"""
|
|
186 |
prompt += ': ' |
|
|
2461.1.1
by Vincent Ladeuil
Fix 110204 by letting TestUIFactory encode password prompt. |
187 |
prompt = (prompt % kwargs) |
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
188 |
# There's currently no way to say 'i decline to enter a password'
|
189 |
# as opposed to 'my password is empty' -- does it matter?
|
|
190 |
return self.get_non_echoed_password(prompt) |
|
191 |
||
|
1687.1.4
by Robert Collins
Add bzrlib.ui.ui_factory.get_boolean(). |
192 |
def prompt(self, prompt): |
193 |
"""Emit prompt on the CLI.""" |
|
|
3945.1.1
by Vincent Ladeuil
Restore a working UI implementation suitable for emacs shells. |
194 |
self.stdout.write(prompt) |
195 |
||
196 |
def note(self, msg): |
|
197 |
"""Write an already-formatted message.""" |
|
198 |
self.stdout.write(msg + '\n') |
|
|
1687.1.4
by Robert Collins
Add bzrlib.ui.ui_factory.get_boolean(). |
199 |
|
200 |
||
201 |
class SilentUIFactory(CLIUIFactory): |
|
|
1185.49.21
by John Arbash Meinel
Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms. |
202 |
"""A UI Factory which never prints anything. |
203 |
||
204 |
This is the default UI, if another one is never registered.
|
|
205 |
"""
|
|
|
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
206 |
|
|
3882.8.11
by Martin Pool
Choose the UIFactory class depending on the terminal capabilities |
207 |
def __init__(self): |
208 |
CLIUIFactory.__init__(self) |
|
209 |
||
|
1185.49.22
by John Arbash Meinel
Added get_password to the UIFactory, using it inside of sftp.py |
210 |
def get_password(self, prompt='', **kwargs): |
211 |
return None |
|
212 |
||
|
3945.1.1
by Vincent Ladeuil
Restore a working UI implementation suitable for emacs shells. |
213 |
def prompt(self, prompt): |
214 |
pass
|
|
|
1558.8.1
by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning' |
215 |
|
|
3882.8.4
by Martin Pool
All UI factories should support note() |
216 |
def note(self, msg): |
217 |
pass
|
|
218 |
||
|
3882.8.2
by Martin Pool
ProgressTask holds a reference to the ui that displays it |
219 |
|
|
1558.8.1
by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning' |
220 |
def clear_decorator(func, *args, **kwargs): |
221 |
"""Decorator that clears the term""" |
|
222 |
ui_factory.clear_term() |
|
223 |
func(*args, **kwargs) |
|
224 |
||
|
1185.49.22
by John Arbash Meinel
Added get_password to the UIFactory, using it inside of sftp.py |
225 |
|
|
1185.1.29
by Robert Collins
merge merge tweaks from aaron, which includes latest .dev |
226 |
ui_factory = SilentUIFactory() |
|
1534.5.9
by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch. |
227 |
"""IMPORTANT: never import this symbol directly. ONLY ever access it as
|
228 |
ui.ui_factory."""
|
|
|
3882.8.11
by Martin Pool
Choose the UIFactory class depending on the terminal capabilities |
229 |
|
230 |
||
231 |
def make_ui_for_terminal(stdin, stdout, stderr): |
|
232 |
"""Construct and return a suitable UIFactory for a text mode program. |
|
233 |
||
234 |
If stdout is a smart terminal, this gets a smart UIFactory with
|
|
235 |
progress indicators, etc. If it's a dumb terminal, just plain text output.
|
|
236 |
"""
|
|
|
3945.1.3
by Vincent Ladeuil
Restore line eaten by a gremlin. |
237 |
cls = None |
|
3882.8.11
by Martin Pool
Choose the UIFactory class depending on the terminal capabilities |
238 |
isatty = getattr(stdin, 'isatty', None) |
239 |
if isatty is None: |
|
240 |
cls = CLIUIFactory |
|
241 |
elif not isatty(): |
|
242 |
cls = CLIUIFactory |
|
243 |
elif os.environ.get('TERM') in (None, 'dumb', ''): |
|
244 |
# e.g. emacs compile window
|
|
245 |
cls = CLIUIFactory |
|
|
3945.1.1
by Vincent Ladeuil
Restore a working UI implementation suitable for emacs shells. |
246 |
# User may know better, otherwise default to TextUIFactory
|
247 |
if ( os.environ.get('BZR_USE_TEXT_UI', None) is not None |
|
248 |
or cls is None): |
|
|
3882.8.11
by Martin Pool
Choose the UIFactory class depending on the terminal capabilities |
249 |
from bzrlib.ui.text import TextUIFactory |
250 |
cls = TextUIFactory |
|
251 |
return cls(stdin=stdin, stdout=stdout, stderr=stderr) |