Rev 2218: Small cosmetic tweaks to ease merging. in sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

[Andrew Bennetts]

At sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

------------------------------------------------------------
revno: 2218
revision-id: andrew.bennetts at canonical.com-20070413143008-gd15pnoln3mrmjd7
parent: andrew.bennetts at canonical.com-20070413065307-qg7gt1yx57cauni5
parent: andrew.bennetts at canonical.com-20070413142326-5o7two9lqz5fqvl6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Sat 2007-04-14 00:30:08 +1000
message:
  Small cosmetic tweaks to ease merging.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
  bzrlib/transport/chroot.py     chroot.py-20061011104729-0us9mgm97z378vnt-1
  bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
    ------------------------------------------------------------
    revno: 2217.1.2
    merged: andrew.bennetts at canonical.com-20070413142326-5o7two9lqz5fqvl6
    parent: andrew.bennetts at canonical.com-20070413073917-ra47o66q0uwgvsm7
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: hpss
    timestamp: Sat 2007-04-14 00:23:26 +1000
    message:
      Clean up some imports.
    ------------------------------------------------------------
    revno: 2217.1.1
    merged: andrew.bennetts at canonical.com-20070413073917-ra47o66q0uwgvsm7
    parent: andrew.bennetts at canonical.com-20070413065307-qg7gt1yx57cauni5
    parent: andrew.bennetts at canonical.com-20070413071857-s1rpgdaqrrlvcdsw
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: hpss
    timestamp: Fri 2007-04-13 17:39:17 +1000
    message:
      Merge hpss-miscellany.
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.2
    merged: andrew.bennetts at canonical.com-20070413071857-s1rpgdaqrrlvcdsw
    parent: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: hpss-miscellany
    timestamp: Fri 2007-04-13 17:18:57 +1000
    message:
      Some miscellaneous new APIs, tests and other changes from the hpss branch.
=== modified file 'NEWS'
--- a/NEWS	2007-04-13 06:23:59 +0000
+++ b/NEWS	2007-04-13 07:39:17 +0000
@@ -48,9 +48,12 @@
       via remote procedure calls.  (Andrew Bennetts)
  
     * The ``lock_write`` method of ``LockableFiles``, ``Repository`` and
-     ``Branch`` now accept a ``token`` keyword argument, so that separate
-     instances of those objects can share a lock if it has the right token.
-     (Andrew Bennetts, Robert Collins)
+      ``Branch`` now accept a ``token`` keyword argument, so that separate
+      instances of those objects can share a lock if it has the right token.
+      (Andrew Bennetts, Robert Collins)
+
+    * New method 'get_branch_reference' on 'BzrDir' allows the detection of
+      branch references - which the smart server component needs.
 
     * The Repository API ``make_working_trees`` is now permitted to return
       False when ``set_make_working_trees`` is not implemented - previously

=== modified file 'bzrlib/tests/branch_implementations/test_branch.py'
--- a/bzrlib/tests/branch_implementations/test_branch.py	2007-04-05 09:35:26 +0000
+++ b/bzrlib/tests/branch_implementations/test_branch.py	2007-04-13 07:39:17 +0000
@@ -636,7 +636,8 @@
             self.branch_format.get_format_string()
         except NotImplementedError:
             return
-        self.assertEqual(self.branch_format, opened_control.find_branch_format())
+        self.assertEqual(self.branch_format,
+                         opened_control.find_branch_format())
 
 
 class TestBound(TestCaseWithBranch):

=== modified file 'bzrlib/tests/branch_implementations/test_parent.py'
--- a/bzrlib/tests/branch_implementations/test_parent.py	2007-03-29 07:24:14 +0000
+++ b/bzrlib/tests/branch_implementations/test_parent.py	2007-04-13 07:39:17 +0000
@@ -23,8 +23,8 @@
 from bzrlib.branch import Branch
 import bzrlib.errors
 from bzrlib.osutils import abspath, realpath, getcwd
-from bzrlib.urlutils import local_path_from_url, local_path_to_url, escape
 from bzrlib.tests import TestCaseWithTransport
+from bzrlib import urlutils
 
 
 """Tests for Branch parent URL"""
@@ -50,7 +50,8 @@
 
         b.set_parent('../other_branch')
 
-        expected_parent = urlutils.join(self.get_url('subdir'), '../other_branch')
+        expected_parent = urlutils.join(self.get_url('subdir'),
+                                        '../other_branch')
         self.assertEqual(expected_parent, b.get_parent())
         path = urlutils.join(self.get_url('subdir'), '../yanb')
         b.set_parent(path)
@@ -59,7 +60,7 @@
 
 
         self.assertRaises(bzrlib.errors.InvalidURL, b.set_parent, u'\xb5')
-        b.set_parent(escape(u'\xb5'))
+        b.set_parent(urlutils.escape(u'\xb5'))
         self.assertEqual('%C2%B5', b._get_parent_location())
 
         self.assertEqual(b.base + '%C2%B5', b.get_parent())

=== modified file 'bzrlib/transport/chroot.py'
--- a/bzrlib/transport/chroot.py	2007-04-05 09:35:26 +0000
+++ b/bzrlib/transport/chroot.py	2007-04-13 14:23:26 +0000
@@ -22,7 +22,6 @@
 from bzrlib import errors, urlutils
 from bzrlib.transport import (
     get_transport,
-    local,
     register_transport,
     Server,
     Transport,

=== modified file 'bzrlib/transport/http/__init__.py'
--- a/bzrlib/transport/http/__init__.py	2007-04-10 15:54:15 +0000
+++ b/bzrlib/transport/http/__init__.py	2007-04-13 14:23:26 +0000
@@ -32,7 +32,6 @@
 from bzrlib.transport import (
     Transport,
     )
-from bzrlib.smart import medium
 
 
 # TODO: This is not used anymore by HttpTransport_urllib