At file:///net/bigmamac/Volumes/home/vila/src/bzr/cases/3232-spurious-conflict/
------------------------------------------------------------
revno: 3903
revision-id: [email protected]
parent: [email protected]
parent: [email protected]
committer: Vincent Ladeuil <[email protected]>
branch nick: log-deep
timestamp: Thu 2009-01-22 11:13:08 +0100
message:
Merge delta-show-with-path-filter into log-deep
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
------------------------------------------------------------
revno: 3884.1.8
revision-id: [email protected]
parent: [email protected]
parent: [email protected]
committer: Vincent Ladeuil <[email protected]>
branch nick: delta-show-with-path-filter
timestamp: Thu 2009-01-22 11:13:00 +0100
message:
Merge fix-pb into delta-show-with-path-filter
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
------------------------------------------------------------
revno: 3874.1.12
revision-id: [email protected]
parent: [email protected]
parent: [email protected]
committer: Vincent Ladeuil <[email protected]>
branch nick: fix-pb
timestamp: Thu 2009-01-22 11:11:18 +0100
message:
Fix pb bug under emacs
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
------------------------------------------------------------
revno: 3874.81.2
revision-id: [email protected]
parent: [email protected]
committer: Vincent Ladeuil <[email protected]>
branch nick: pb-http
timestamp: Thu 2009-01-22 10:40:50 +0100
message:
* NEWS:
Fix missing closing paren.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3874.81.1
revision-id: [email protected]
parent: [email protected]
committer: Vincent Ladeuil <[email protected]>
branch nick: emacs-ui-fixes
timestamp: Mon 2009-01-19 14:09:47 +0100
message:
Restore a working UI implementation suitable for emacs shells.
* bzrlib/ui/__init__.py:
(CLIUIFactory.prompt, CLIUIFactory.note): Default implementations.
(SilentUIFactory.prompt): Override default implementation.
(make_ui_for_terminal): Let user override automatic detection.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
=== modified file 'NEWS'
--- a/NEWS 2009-01-21 21:34:48 +0000
+++ b/NEWS 2009-01-22 10:13:08 +0000
@@ -64,6 +64,13 @@
INTERNALS:
+ * Default User Interface (UI) is CLIUIFactory when bzr runs in a dumb
+ terminal. It is sometimes desirable do override this default by forcing
+ bzr to use TextUIFactory. This can be achieved by setting the
+ BZR_USE_TEXT_UI environment variable (emacs shells, as opposed to
+ compile buffers, are such an example).
+ (Vincent Ladeuil)
+
* ``TreeDelta.show()`` now accepts a ``filter`` parameter allowing log
formatters to retrict the output.
(Vincent Ladeuil)
=== modified file 'bzrlib/ui/__init__.py'
--- a/bzrlib/ui/__init__.py 2009-01-13 05:07:27 +0000
+++ b/bzrlib/ui/__init__.py 2009-01-19 13:09:47 +0000
@@ -172,6 +172,11 @@
def prompt(self, prompt):
"""Emit prompt on the CLI."""
+ self.stdout.write(prompt)
+
+ def note(self, msg):
+ """Write an already-formatted message."""
+ self.stdout.write(msg + '\n')
def clear_term(self):
pass
@@ -195,6 +200,8 @@
def get_password(self, prompt='', **kwargs):
return None
+ def prompt(self, prompt):
+ pass
def note(self, msg):
pass
@@ -225,7 +232,9 @@
elif os.environ.get('TERM') in (None, 'dumb', ''):
# e.g. emacs compile window
cls = CLIUIFactory
- else:
+ # User may know better, otherwise default to TextUIFactory
+ if ( os.environ.get('BZR_USE_TEXT_UI', None) is not None
+ or cls is None):
from bzrlib.ui.text import TextUIFactory
cls = TextUIFactory
return cls(stdin=stdin, stdout=stdout, stderr=stderr)
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
