Rev 3571: allow push over hpss to set default stacking policy (Michael Hudson) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3571
revision-id:pqm at pqm.ubuntu.com-20080722103935-leq46n7723oi910e
parent: pqm at pqm.ubuntu.com-20080722095403-sdixt0nfim5q3eps
parent: ian.clatworthy at canonical.com-20080722095215-jqwihdatu1q7k08r
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-07-22 11:39:35 +0100
message:
  allow push over hpss to set default stacking policy (Michael Hudson)
modified:
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
    ------------------------------------------------------------
    revno: 3569.1.1
    revision-id:ian.clatworthy at canonical.com-20080722095215-jqwihdatu1q7k08r
    parent: pqm at pqm.ubuntu.com-20080722022519-tu60do9k4tkjmtl4
    parent: michael.hudson at canonical.com-20080722001233-7poo8pnk6uwlp90p
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: ianc-integration
    timestamp: Tue 2008-07-22 19:52:15 +1000
    message:
      allow push over hpss to set default stacking policy (Michael Hudson)
    modified:
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
    ------------------------------------------------------------
    revno: 3567.1.4
    revision-id:michael.hudson at canonical.com-20080722001233-7poo8pnk6uwlp90p
    parent: michael.hudson at canonical.com-20080722000817-yx714k2csohzbx6z
    committer: Michael Hudson <michael.hudson at canonical.com>
    branch nick: add-RemoteBzrDir.get_config-bug-250422
    timestamp: Tue 2008-07-22 12:12:33 +1200
    message:
      assert other way around in test again
    modified:
      bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
    ------------------------------------------------------------
    revno: 3567.1.3
    revision-id:michael.hudson at canonical.com-20080722000817-yx714k2csohzbx6z
    parent: michael.hudson at canonical.com-20080722000709-grbo6ivpkstoj96z
    committer: Michael Hudson <michael.hudson at canonical.com>
    branch nick: add-RemoteBzrDir.get_config-bug-250422
    timestamp: Tue 2008-07-22 12:08:17 +1200
    message:
      fix problem
    modified:
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
    ------------------------------------------------------------
    revno: 3567.1.2
    revision-id:michael.hudson at canonical.com-20080722000709-grbo6ivpkstoj96z
    parent: michael.hudson at canonical.com-20080722000117-f567pa1we4uvxafh
    committer: Michael Hudson <michael.hudson at canonical.com>
    branch nick: add-RemoteBzrDir.get_config-bug-250422
    timestamp: Tue 2008-07-22 12:07:09 +1200
    message:
      fix test some more
    modified:
      bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
    ------------------------------------------------------------
    revno: 3567.1.1
    revision-id:michael.hudson at canonical.com-20080722000117-f567pa1we4uvxafh
    parent: pqm at pqm.ubuntu.com-20080721151553-11iasd1407hkznk1
    committer: Michael Hudson <michael.hudson at canonical.com>
    branch nick: add-RemoteBzrDir.get_config-bug-250422
    timestamp: Tue 2008-07-22 12:01:17 +1200
    message:
      make test more optimistic
    modified:
      bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py	2008-07-17 00:43:32 +0000
+++ b/bzrlib/remote.py	2008-07-22 00:08:17 +0000
@@ -228,6 +228,10 @@
         return self._real_bzrdir.clone(url, revision_id=revision_id,
             force_new_repo=force_new_repo, preserve_stacking=preserve_stacking)
 
+    def get_config(self):
+        self._ensure_real()
+        return self._real_bzrdir.get_config()
+
 
 class RemoteRepositoryFormat(repository.RepositoryFormat):
     """Format for repositories accessed over a _SmartClient.

=== modified file 'bzrlib/tests/bzrdir_implementations/test_bzrdir.py'
--- a/bzrlib/tests/bzrdir_implementations/test_bzrdir.py	2008-07-14 16:16:48 +0000
+++ b/bzrlib/tests/bzrdir_implementations/test_bzrdir.py	2008-07-22 00:12:33 +0000
@@ -1639,12 +1639,14 @@
         my_dir = self.make_bzrdir('.')
         config = my_dir.get_config()
         if config is None:
-            self.assertFalse(isinstance(my_dir, bzrdir.BzrDirMeta1))
+            self.assertFalse(
+                isinstance(my_dir, (bzrdir.BzrDirMeta1, RemoteBzrDir)),
+                "%r should support configs" % my_dir)
             raise TestNotApplicable(
                 'This BzrDir format does not support configs.')
         config.set_default_stack_on('http://example.com')
         self.assertEqual('http://example.com', config.get_default_stack_on())
-        my_dir2 = bzrdir.BzrDir.open('.')
+        my_dir2 = bzrdir.BzrDir.open(self.get_url('.'))
         config2 = my_dir2.get_config()
         self.assertEqual('http://example.com', config2.get_default_stack_on())