Merge lp:~jbowtie/bzr/fix-555439 into lp:bzr

[John C Barstow]

(jbowtie) document additional bzr environment variables

[Martin Pool (mbp)]

it might be nice to give a mini-example but this is an improvement.

eventually it might be nice to not repeat ourselves and just have some kind of global definition of variables we care about. it may not be worth it if it's just once in the code and once in the docs.

review: Approve

[Aaron Bentley (abentley)]

I think we should use consistent quotation marks within the help text. Have we started using curly quotes? If so, we should at least use them consistently in this string.

review: Needs Fixing

[Martin Pool (mbp)]

On 30 April 2010 10:19, Aaron Bentley <email address hidden> wrote:
> Review: Needs Fixing
> I think we should use consistent quotation marks within the help text.

agree.

> Have we started using curly quotes?  If so, we should at least use them consistently in this string.

I didn't spot that. I don't think using curly quotes in help text is
worth the unicode hassles.

--
Martin <http://launchpad.net/~mbp/>

[John C Barstow (jbowtie)]

> I think we should use consistent quotation marks within the help text. Have
> we started using curly quotes? If so, we should at least use them
> consistently in this string.

Sorry, I didn't spot that either; I cut and paste that particular string.

[lp:~jbowtie/bzr/fix-555439]

5187. By John C Barstow on 2010-04-30

Fix use of quotes in BZR_PROGRESS_BAR description

[John C Barstow (jbowtie)]

I've just pushed a fix for the quotes, turning them into single straight quotes like the surrounding material.

[Aaron Bentley (abentley)]

review: Approve

[Vincent Ladeuil (vila)]

Looks like all we need now is the contributor agreement: http://www.canonical.com/contributors

Can you give it a look ?

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2010-04-28 10:33:44 +0000
+++ bzrlib/builtins.py	2010-04-30 01:42:31 +0000
@@ -4681,6 +4681,7 @@
 
 class cmd_bind(Command):
     __doc__ = """Convert the current branch into a checkout of the supplied branch.
+    If no branch is supplied, rebind to the last bound location.
 
     Once converted into a checkout, commits must succeed on the master branch
     before they will be applied to the local branch.

=== modified file 'bzrlib/help_topics/__init__.py'
--- bzrlib/help_topics/__init__.py	2010-03-02 10:21:39 +0000
+++ bzrlib/help_topics/__init__.py	2010-04-30 01:42:31 +0000
@@ -591,22 +591,27 @@
 _env_variables = \
 """Environment Variables
 
-================ =================================================================
-BZRPATH          Path where bzr is to look for shell plugin external commands.
-BZR_EMAIL        E-Mail address of the user. Overrides EMAIL.
-EMAIL            E-Mail address of the user.
-BZR_EDITOR       Editor for editing commit messages. Overrides EDITOR.
-EDITOR           Editor for editing commit messages.
-BZR_PLUGIN_PATH  Paths where bzr should look for plugins.
-BZR_HOME         Directory holding .bazaar config dir. Overrides HOME.
-BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA and HOME.
-BZR_REMOTE_PATH  Full name of remote 'bzr' command (for bzr+ssh:// URLs).
-BZR_SSH          Path to SSH client, or one of paramiko, openssh, sshcorp, plink.
-BZR_LOG          Location of .bzr.log (use '/dev/null' to suppress log).
-BZR_LOG (Win32)  Location of .bzr.log (use 'NUL' to suppress log).
-BZR_COLUMNS      Override implicit terminal width.
-BZR_CONCURRENCY  Number of processes that can be run concurrently (selftest).
-================ =================================================================
+=================== =======================================================================
+BZRPATH             Path where bzr is to look for shell plugin external commands.
+BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.
+EMAIL               E-Mail address of the user.
+BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.
+EDITOR              Editor for editing commit messages.
+BZR_PLUGIN_PATH     Paths where bzr should look for plugins.
+BZR_DISABLE_PLUGINS Plugins that bzr should not load.
+BZR_PLUGINS_AT      Plugins to load from a directory not in BZR_PLUGIN_PATH.
+BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.
+BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA and HOME.
+BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// URLs).
+BZR_SSH             Path to SSH client, or one of paramiko, openssh, sshcorp, plink.
+BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).
+BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).
+BZR_COLUMNS         Override implicit terminal width.
+BZR_CONCURRENCY     Number of processes that can be run concurrently (selftest).
+BZR_PROGRESS_BAR    Override the progress display. Values are 'none', 'dots', or 'tty'.
+BZR_PDB             Control whether to launch a debugger on error.
+BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a breakin debugger.
+=================== =======================================================================
 """