Rev 4911: Merge the latest bzr-2.1 (4883) in http://bazaar.launchpad.net/~jameinel/bzr/2.1-client-reconnect-819604
John Arbash Meinel
john at arbash-meinel.com
Tue Sep 11 07:39:31 UTC 2012
At http://bazaar.launchpad.net/~jameinel/bzr/2.1-client-reconnect-819604
------------------------------------------------------------
revno: 4911 [merge]
revision-id: john at arbash-meinel.com-20120911073914-pfhzozat7lk3iqb6
parent: john at arbash-meinel.com-20111010124914-12bq3apx7207nlbc
parent: pqm at pqm.ubuntu.com-20120327194850-u6m9t5vv8rd1stak
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1-client-reconnect-819604
timestamp: Tue 2012-09-11 11:39:14 +0400
message:
Merge the latest bzr-2.1 (4883)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2011-08-19 12:49:28 +0000
+++ b/NEWS 2012-02-02 14:08:45 +0000
@@ -47,6 +47,10 @@
Improvements
************
+ * When opening formats with feature flags, optional features are
+ ignored and an improved error is printed for non-optional features.
+ (Jelmer Vernooij)
+
Documentation
*************
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py 2010-02-17 17:11:16 +0000
+++ b/bzrlib/branch.py 2012-02-02 14:08:45 +0000
@@ -1438,7 +1438,8 @@
"""Return the format for the branch object in a_bzrdir."""
try:
transport = a_bzrdir.get_branch_transport(None)
- format_string = transport.get_bytes("format")
+ format_string = bzrdir.extract_format_string(
+ transport.get_bytes("format"))
return klass._formats[format_string]
except errors.NoSuchFile:
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2010-11-26 18:10:01 +0000
+++ b/bzrlib/bzrdir.py 2012-03-18 19:03:10 +0000
@@ -87,6 +87,32 @@
)
+def extract_format_string(text):
+ """Read a format string from a file.
+
+ The first line is returned. The other lines can contain
+ optional features. An exception is raised when a
+ required feature is present.
+ """
+ lines = text.splitlines(True)
+ try:
+ firstline = lines.pop(0)
+ except IndexError:
+ raise errors.UnknownFormatError(format=text, kind='')
+ for lineno, line in enumerate(lines):
+ try:
+ (necessity, feature) = line.split(" ", 1)
+ except ValueError:
+ raise errors.ParseFormatError(lineno=lineno+2,
+ line=line, text=text)
+ else:
+ if necessity == "optional":
+ mutter("Ignoring optional feature %s", feature)
+ else:
+ raise errors.MissingFeature(feature)
+ return firstline
+
+
class BzrDir(object):
"""A .bzr control diretory.
@@ -1829,6 +1855,8 @@
except errors.NoSuchFile:
raise errors.NotBranchError(path=transport.base)
+ format_string = extract_format_string(format_string)
+
try:
return klass._formats[format_string]
except KeyError:
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py 2010-09-10 05:13:57 +0000
+++ b/bzrlib/errors.py 2012-02-02 14:08:45 +0000
@@ -3136,3 +3136,23 @@
def __init__(self, path):
self.path = path
+
+
+class MissingFeature(BzrError):
+
+ _fmt = ("Missing feature %(feature)s not provided by this "
+ "version of Bazaar or any plugin.")
+
+ def __init__(self, feature):
+ self.feature = feature
+
+
+class ParseFormatError(BzrError):
+
+ _fmt = "Parse error on line %(lineno)d of format name: %(line)s"
+
+ def __init__(self, lineno, line, text):
+ BzrError.__init__(self)
+ self.lineno = lineno
+ self.line = line
+ self.text = text
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py 2010-11-30 20:42:42 +0000
+++ b/bzrlib/repository.py 2012-02-02 14:08:45 +0000
@@ -3107,6 +3107,7 @@
try:
transport = a_bzrdir.get_repository_transport(None)
format_string = transport.get_bytes("format")
+ format_string = bzrdir.extract_format_string(format_string)
return format_registry.get(format_string)
except errors.NoSuchFile:
raise errors.NoRepositoryPresent(a_bzrdir)
=== modified file 'bzrlib/tests/test_bzrdir.py'
--- a/bzrlib/tests/test_bzrdir.py 2010-02-17 17:11:16 +0000
+++ b/bzrlib/tests/test_bzrdir.py 2012-02-02 14:13:45 +0000
@@ -1333,3 +1333,25 @@
url = transport.base
err = self.assertRaises(errors.BzrError, bzrdir.BzrDir.open, url)
self.assertEqual('fail', err._preformatted_string)
+
+
+class ExtractFormatStringTests(TestCase):
+
+ def test_normal(self):
+ self.assertEquals("Bazaar-NG branch, format 0.0.4\n",
+ bzrdir.extract_format_string("Bazaar-NG branch, format 0.0.4\n"))
+
+ def test_with_optional_feature(self):
+ self.assertEquals("Bazaar-NG branch, format 0.0.4\n",
+ bzrdir.extract_format_string("Bazaar-NG branch, format 0.0.4\n"
+ "optional feature foo\n"))
+
+ def test_with_required_feature(self):
+ self.assertRaises(errors.MissingFeature,
+ bzrdir.extract_format_string, "Bazaar-NG branch, format 0.0.4\n"
+ "required feature foo\n")
+
+ def test_with_invalid_line(self):
+ self.assertRaises(errors.ParseFormatError,
+ bzrdir.extract_format_string, "Bazaar-NG branch, format 0.0.4\n"
+ "requiredfoo\n")
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py 2010-01-21 17:54:58 +0000
+++ b/bzrlib/workingtree.py 2012-02-02 14:08:45 +0000
@@ -2799,6 +2799,7 @@
try:
transport = a_bzrdir.get_workingtree_transport(None)
format_string = transport.get_bytes("format")
+ format_string = bzrdir.extract_format_string(format_string)
return klass._formats[format_string]
except errors.NoSuchFile:
raise errors.NoWorkingTree(base=transport.base)
More information about the bazaar-commits
mailing list