Merge lp:~mbp/bzr/doc into lp:bzr

Proposed by Martin Pool
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: no longer in the source branch.
Merged at revision: 5337
Proposed branch: lp:~mbp/bzr/doc
Merge into: lp:bzr
Diff against target: 51 lines (+31/-0)
2 files modified
bzrlib/help_topics/en/configuration.txt (+9/-0)
doc/en/user-guide/configuring_bazaar.txt (+22/-0)
To merge this branch: bzr merge lp:~mbp/bzr/doc
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Review via email: mp+29244@code.launchpad.net

Commit message

developer docs about testing

Description of the change

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) :
review: Approve
Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/doc into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> #398653 Releasing guide should include instructions on updating trunk NEWS file
> https://bugs.launchpad.net/bugs/398653
> #473099 Incorrect markup in centralized workflow tutorial
> https://bugs.launchpad.net/bugs/473099
> #512385 Broken link to "quick start card" in online user guide
> https://bugs.launchpad.net/bugs/512385
>
>
> Document proxy settings, from https://bugs.edge.launchpad.net/bzr/+bug/186920/comments/56
>

If you're going to be documenting http[s]_proxy shouldn't you also
document no_proxy, all_proxy, and the rest?

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkwzO1QACgkQJdeBCYSNAAMCFgCfRDukTgzdRK5Vj89SL1s5XS3t
cpAAnRIfI4AQQ+673+fY+/TBUt8Sfxq6
=72PG
-----END PGP SIGNATURE-----

Revision history for this message
Martin Pool (mbp) wrote :

On 7 July 2010 00:21, John A Meinel <email address hidden> wrote:
> If you're going to be documenting http[s]_proxy shouldn't you also
> document no_proxy, all_proxy, and the rest?

Good point. I didn't actually know about them. Where are they defined?

--
Martin

Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
> On 7 July 2010 00:21, John A Meinel <email address hidden> wrote:
>> If you're going to be documenting http[s]_proxy shouldn't you also
>> document no_proxy, all_proxy, and the rest?
>
> Good point. I didn't actually know about them. Where are they defined?
>

Vincent would know better than myself. There is some documentation here:
  http://docs.python.org/library/urllib.html

The urlopen() function works transparently with proxies which do not
require authentication. In a Unix or Windows environment, set the
http_proxy, or ftp_proxy environment variables to a URL that identifies
the proxy server before starting the Python interpreter. For example
(the '%' is the command prompt):

% http_proxy="http://www.someproxy.com:3128"
% export http_proxy
% python
...

The no_proxy environment variable can be used to specify hosts which
shouldn’t be reached via proxy; if set, it should be a comma-separated
list of hostname suffixes, optionally with :port appended, for example
cern.ch,ncsa.uiuc.edu,some.host:8080.

In a Windows environment, if no proxy environment variables are set,
proxy settings are obtained from the registry’s Internet Settings section.

I think 'all_proxy' is used for both http, https and ftp. 'no_proxy'
allows you to have a 'match everything' http proxy, except for
internal-only websites, etc.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkwz0VkACgkQJdeBCYSNAAPcpACgpPZ/aZHi2bz5e7iO80Yh3EmW
dqgAoKXmeoLuACBKOhIqHG7rnkqNnaR6
=o/j0
-----END PGP SIGNATURE-----

Revision history for this message
Martin Pool (mbp) wrote :

On 7 July 2010 11:01, John A Meinel <email address hidden> wrote:
> I think 'all_proxy' is used for both http, https and ftp. 'no_proxy'
> allows you to have a 'match everything' http proxy, except for
> internal-only websites, etc.

I didn't want to add ftp_proxy or all_proxy etc because I'm not sure
that they actually do work for all protocols with bzr. Perhaps they
actually do.

--
Martin

Revision history for this message
Martin Pool (mbp) wrote :

sent to pqm by email

Revision history for this message
Vincent Ladeuil (vila) wrote :

>>>>> Martin Pool <email address hidden> writes:

    > On 7 July 2010 11:01, John A Meinel <email address hidden> wrote:
    >> I think 'all_proxy' is used for both http, https and ftp. 'no_proxy'
    >> allows you to have a 'match everything' http proxy, except for
    >> internal-only websites, etc.

Correct.

    > I didn't want to add ftp_proxy or all_proxy etc because I'm not sure
    > that they actually do work for all protocols with bzr. Perhaps they
    > actually do.

I don't think the ftp transport (via ftplib) respect that (quick search
for proxy in ftplib confims that).

So intead of 'Perhaps they actually do' may be its 'Perhaps they
actually should' :-/

         Vincent

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/help_topics/en/configuration.txt'
2--- bzrlib/help_topics/en/configuration.txt 2010-06-21 22:29:38 +0000
3+++ bzrlib/help_topics/en/configuration.txt 2010-07-07 02:46:40 +0000
4@@ -179,6 +179,15 @@
5 The path where Bazaar should look for shell plugin external commands.
6
7
8+http_proxy, https_proxy
9+~~~~~~~~~~~~~~~~~~~~~~~
10+
11+Specifies the network proxy for outgoing connections, for example::
12+
13+ http_proxy=http://proxy.example.com:3128/
14+ https_proxy=http://proxy.example.com:3128/
15+
16+
17 Configuration files
18 -------------------
19
20
21=== modified file 'doc/en/user-guide/configuring_bazaar.txt'
22--- doc/en/user-guide/configuring_bazaar.txt 2010-06-02 05:03:31 +0000
23+++ doc/en/user-guide/configuring_bazaar.txt 2010-07-07 02:46:40 +0000
24@@ -16,6 +16,28 @@
25
26 If ``whoami`` is used without an argument, the current value is displayed.
27
28+Using a network proxy
29+---------------------
30+
31+If your network requires that you use an http proxy for outbound
32+connections, you must set the ``http_proxy`` variable. If the proxy is
33+also required for https connections, you need to set ``https_proxy`` too.
34+If you need these and don't have them set, you may find that connections
35+to Launchpad or other external servers fail or time out.
36+
37+On Unix you typically want to set these in ``/etc/environment`` or
38+``~/.bash_profile`` and on Windows in the user profile.
39+
40+::
41+
42+ http_proxy=http://proxy.example.com:3128/
43+ https_proxy=http://proxy.example.com:3128/
44+
45+The ``no_proxy`` variable can be set to a comma-separated list of hosts
46+which shouldn't be reached by the proxy. (See
47+<http://docs.python.org/library/urllib.html> for more details.)
48+
49+
50 Configuration files
51 -------------------
52