Rev 6469: (jelmer) Merge the 2.5 branch. (Jelmer Vernooij) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/
Patch Queue Manager
pqm at pqm.ubuntu.com
Sat Feb 18 17:24:52 UTC 2012
At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 6469 [merge]
revision-id: pqm at pqm.ubuntu.com-20120218172452-x7mk642v7mwxtyo1
parent: pqm at pqm.ubuntu.com-20120214182943-vso6j0mqdnxfkp7s
parent: jelmer at samba.org-20120218165504-c9oe5c5ue805y8wp
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2012-02-18 17:24:52 +0000
message:
(jelmer) Merge the 2.5 branch. (Jelmer Vernooij)
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
doc/developers/revision-properties.txt revisionproperties.t-20070807133526-w57m8zv5o7t5kugm-1
doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2012-02-14 17:22:37 +0000
+++ b/bzrlib/builtins.py 2012-02-18 16:55:04 +0000
@@ -3874,8 +3874,9 @@
class cmd_nick(Command):
__doc__ = """Print or set the branch nickname.
- If unset, the tree root directory name is used as the nickname.
- To print the current nickname, execute with no argument.
+ If unset, the colocated branch name is used for colocated branches, and
+ the branch directory name is used for other branches. To print the
+ current nickname, execute with no argument.
Bound branches use the nickname of its master branch unless it is set
locally.
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py 2012-02-14 17:22:37 +0000
+++ b/bzrlib/config.py 2012-02-18 16:55:04 +0000
@@ -1471,6 +1471,8 @@
value = self._get_explicit_nickname()
if value is not None:
return value
+ if self.branch.name:
+ return self.branch.name
return urlutils.unescape(self.branch.base.split('/')[-2])
def has_explicit_nickname(self):
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2012-02-02 23:46:45 +0000
+++ b/bzrlib/tests/__init__.py 2012-02-18 16:55:04 +0000
@@ -2658,10 +2658,11 @@
self.test_home_dir = self.test_dir + "/MemoryTransportMissingHomeDir"
self.permit_dir(self.test_dir)
- def make_branch(self, relpath, format=None):
+ def make_branch(self, relpath, format=None, name=None):
"""Create a branch on the transport at relpath."""
repo = self.make_repository(relpath, format=format)
- return repo.bzrdir.create_branch(append_revisions_only=False)
+ return repo.bzrdir.create_branch(append_revisions_only=False,
+ name=name)
def get_default_format(self):
return 'default'
=== modified file 'bzrlib/tests/blackbox/test_switch.py'
--- a/bzrlib/tests/blackbox/test_switch.py 2012-02-14 17:22:37 +0000
+++ b/bzrlib/tests/blackbox/test_switch.py 2012-02-18 16:55:04 +0000
@@ -191,8 +191,8 @@
revid2 = tree.commit('rev2')
self.run_bzr(['switch', '-b', 'anotherbranch'])
self.assertEquals(
- ['', 'anotherbranch'],
- tree.branch.bzrdir.get_branches().keys())
+ set(['', 'anotherbranch']),
+ set(tree.branch.bzrdir.get_branches().keys()))
def test_switch_into_unrelated_colocated(self):
# Create a new colocated branch from an existing non-colocated branch.
=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py 2012-02-14 17:22:37 +0000
+++ b/bzrlib/tests/test_config.py 2012-02-18 16:55:04 +0000
@@ -1197,6 +1197,10 @@
b = self.make_branch('!repo')
self.assertEqual('!repo', b.get_config().get_nickname())
+ def test_autonick_uses_branch_name(self):
+ b = self.make_branch('foo', name='bar')
+ self.assertEqual('bar', b.get_config().get_nickname())
+
def test_warn_if_masked(self):
warnings = []
def warning(*args):
=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py 2012-02-14 17:22:37 +0000
+++ b/bzrlib/tests/test_remote.py 2012-02-18 16:55:04 +0000
@@ -565,7 +565,7 @@
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
_client=client)
result = a_bzrdir.get_branches()
- self.assertEquals(["", "foo"], result.keys())
+ self.assertEquals(set(["", "foo"]), set(result.keys()))
self.assertEqual(
[('call_expecting_body', 'BzrDir.get_branches', ('quack/',)),
('call', 'BzrDir.find_repositoryV3', ('quack/', )),
=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- a/bzrlib/transport/http/_urllib2_wrappers.py 2012-01-31 17:00:22 +0000
+++ b/bzrlib/transport/http/_urllib2_wrappers.py 2012-02-15 10:24:06 +0000
@@ -86,7 +86,6 @@
# XXX: Needs checking, can't trust the interweb ;) -- vila 2012-01-25
u'/etc/openssl/certs/ca-certificates.crt', # Solaris
]
-
def default_ca_certs():
if sys.platform == 'win32':
return os.path.join(os.path.dirname(sys.executable), u"ca_bundle.crt")
@@ -122,6 +121,13 @@
except KeyError:
raise ValueError("invalid value %s" % unicode_str)
+def default_ca_reqs():
+ if sys.platform in ('win32', 'darwin'):
+ # FIXME: Once we get a native access to root certificates there, this
+ # won't needed anymore. See http://pad.lv/920455 -- vila 2012-02-15
+ return u'none'
+ else:
+ return u'required'
opt_ssl_ca_certs = config.Option('ssl.ca_certs',
from_unicode=ca_certs_from_store,
@@ -137,7 +143,7 @@
""")
opt_ssl_cert_reqs = config.Option('ssl.cert_reqs',
- default=u"required",
+ default=default_ca_reqs,
from_unicode=cert_reqs_from_store,
invalid='error',
help="""\
=== modified file 'doc/developers/revision-properties.txt'
--- a/doc/developers/revision-properties.txt 2011-05-25 13:07:26 +0000
+++ b/doc/developers/revision-properties.txt 2012-02-16 16:42:43 +0000
@@ -35,9 +35,9 @@
* ``author`` - Single author of the change. This property is deprecated in
favour of ``authors``. It should no longer be set by any code, but will
still be read. It is ignored if ``authors`` is set in the same revision.
- * ``branch-nick`` - Nickname of the branch. It's either the directory name
- or manually set by ``bzr nick``. The value is set automatically in
- ``MutableTree.commit``.
+ * ``branch-nick`` - Nickname of the branch. This can be specified by the user,
+ but it defaults to the colocated branch name or the branch's directory name.
+ The value is set automatically in ``MutableTree.commit``.
* ``bugs`` - A list of bug URLs and their statuses. The list is separated
by the new-line character (\\n) and each entry is in format
'<URL> <status>'. Currently, bzrlib uses only status 'fixed'. See
=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt 2012-02-03 10:28:47 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt 2012-02-18 16:55:04 +0000
@@ -27,12 +27,19 @@
.. Improvements to existing commands, especially improved performance
or memory usage, or better results.
+* The names of colocated branches are used as branch nicks if no nick is
+ specified. (Aaron Bentley)
+
Bug Fixes
*********
.. Fixes for situations where bzr would previously crash or give incorrect
or undesirable results.
+* Disable ssl certificate verification on osx and windows until a native
+ access to the the root certificates is provided there.
+ (Vincent Ladeuil, #929179)
+
Documentation
*************
@@ -57,6 +64,9 @@
suite. This can include new facilities for writing tests, fixes to
spurious test failures and changes to the way things should be tested.
+* Stop depending on the particular CPython ordering of dictionary keys
+ when testing the result of BzrDir.get_branches.
+ (Wouter van Heyst)
bzr 2.5b6
#########
More information about the bazaar-commits
mailing list