No subject

So far, to get a suitable progress bzr under my emacs shells I
was doing:

  (setenv "BZR_PROGRESS_BAR" "tty")

in my '.emacs'.

This is not working anymore with the new progress
bars. Investigating I cam up the following patch and also
realized my previous settings was overzealous.

The are two cases were bzr in run from emacs:
- shells.
- compile buffers (or more generally processes as the ones spawn
  by start-process and the like).


While the former deserve a proper progress bar, the later
doesn't.

There is no obvious way, in emacs, do avoid the spurious '^M' in
the process buffers if the tty progress bar is used (while shell
modes have output filters, processes doesn't provide a single
hook to add, say, comint-strip-ctrl-m).

There is also no obvious way for bzr to distinguish between
shells and processes.

I ended up with the attached patch that provides a way to force
the text UI when needed and use the following in my ~/.bashrc:

  # If we are inside an emacs shell, tell bzr it can use a text UI
  # an a tty progress bar
  emacs_shell=`echo $INSIDE_EMACS | grep comint`
  if [ "$emacs_shell" != "" ] ; then
      export BZR_USE_TEXT_UI=1
      export BZR_PROGRESS_BAR=tty
  fi

The default for bzr is to use no progress bars under emacs, which
is guaranteed to work even if not very user-friendly.

   Vincent



--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline; filename=emacs-ui-fixes-3946.patch
Content-Description: BZR merge

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: v.ladeuil+lp at free.fr-20090119130947-1ldks301mpsymf8r
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev
# testament_sha1: 1f4be1a283b1063610766b6c2ae522c474c57dce
# timestamp: 2009-01-19 14:15:38 +0100
# base_revision_id: pqm at pqm.ubuntu.com-20090119102507-0ue83url4iguuol1
# 
# Begin patch
=== modified file 'NEWS'
--- NEWS	2009-01-15 22:51:27 +0000
+++ NEWS	2009-01-19 13:09:47 +0000
@@ -52,6 +52,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'
--- bzrlib/ui/__init__.py	2009-01-13 05:07:27 +0000
+++ 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)

# Begin bundle
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

--=-=-=--