Bazaar

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

  1. fix-555439
  2. Merge into bzr.dev
Proposed by John C Barstow
Status: Merged
Approved by: Martin Pool
Approved revision: no longer in the source branch.
Merged at revision: 5208
Proposed branch: lp:~jbowtie/bzr/fix-555439
Merge into: lp:bzr
Diff against target: 57 lines (+22/-16)
2 files modified
bzrlib/builtins.py (+1/-0)
bzrlib/help_topics/__init__.py (+21/-16)
To merge this branch: bzr merge lp:~jbowtie/bzr/fix-555439
Reviewer Review Type Date Requested Status
Aaron Bentley (community) Approve
Martin Pool Approve
Review via email: mp+24289@code.launchpad.net

Commit message

(jbowtie) document additional bzr environment variables

To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

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
Revision history for this message
Aaron Bentley (abentley) wrote :

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
Revision history for this message
Martin Pool (mbp) wrote :

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/>

Revision history for this message
John C Barstow (jbowtie) wrote :

> 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.

Revision history for this message
John C Barstow (jbowtie) wrote :

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

Revision history for this message
Aaron Bentley (abentley) :
review: Approve
Revision history for this message
Vincent Ladeuil (vila) wrote :

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

Can you give it a look ?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/builtins.py'
2--- bzrlib/builtins.py 2010-04-28 10:33:44 +0000
3+++ bzrlib/builtins.py 2010-04-30 01:42:31 +0000
4@@ -4681,6 +4681,7 @@
5
6 class cmd_bind(Command):
7 __doc__ = """Convert the current branch into a checkout of the supplied branch.
8+ If no branch is supplied, rebind to the last bound location.
9
10 Once converted into a checkout, commits must succeed on the master branch
11 before they will be applied to the local branch.
12
13=== modified file 'bzrlib/help_topics/__init__.py'
14--- bzrlib/help_topics/__init__.py 2010-03-02 10:21:39 +0000
15+++ bzrlib/help_topics/__init__.py 2010-04-30 01:42:31 +0000
16@@ -591,22 +591,27 @@
17 _env_variables = \
18 """Environment Variables
19
20-================ =================================================================
21-BZRPATH Path where bzr is to look for shell plugin external commands.
22-BZR_EMAIL E-Mail address of the user. Overrides EMAIL.
23-EMAIL E-Mail address of the user.
24-BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.
25-EDITOR Editor for editing commit messages.
26-BZR_PLUGIN_PATH Paths where bzr should look for plugins.
27-BZR_HOME Directory holding .bazaar config dir. Overrides HOME.
28-BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA and HOME.
29-BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// URLs).
30-BZR_SSH Path to SSH client, or one of paramiko, openssh, sshcorp, plink.
31-BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).
32-BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).
33-BZR_COLUMNS Override implicit terminal width.
34-BZR_CONCURRENCY Number of processes that can be run concurrently (selftest).
35-================ =================================================================
36+=================== =======================================================================
37+BZRPATH Path where bzr is to look for shell plugin external commands.
38+BZR_EMAIL E-Mail address of the user. Overrides EMAIL.
39+EMAIL E-Mail address of the user.
40+BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.
41+EDITOR Editor for editing commit messages.
42+BZR_PLUGIN_PATH Paths where bzr should look for plugins.
43+BZR_DISABLE_PLUGINS Plugins that bzr should not load.
44+BZR_PLUGINS_AT Plugins to load from a directory not in BZR_PLUGIN_PATH.
45+BZR_HOME Directory holding .bazaar config dir. Overrides HOME.
46+BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA and HOME.
47+BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// URLs).
48+BZR_SSH Path to SSH client, or one of paramiko, openssh, sshcorp, plink.
49+BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).
50+BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).
51+BZR_COLUMNS Override implicit terminal width.
52+BZR_CONCURRENCY Number of processes that can be run concurrently (selftest).
53+BZR_PROGRESS_BAR Override the progress display. Values are 'none', 'dots', or 'tty'.
54+BZR_PDB Control whether to launch a debugger on error.
55+BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a breakin debugger.
56+=================== =======================================================================
57 """
58
59