[MERGE] Fix pushing from subdirs

[Matthew D. Fuller]

bzr.dev:4453 (push --strict) broke pushing from anywhere but the
branch root.  This unbreaks it (and hopefully doesn't break anything
else  ;)


-- 
Matthew Fuller     (MF4839)   |  fullermd at over-yonder.net
Systems/Network Administrator |  http://www.over-yonder.net/~fullermd/
           On the Internet, nobody can hear you scream.
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: fullermd at over-yonder.net-20090622081440-\
#   7o6pytidy5pu0szu
# target_branch: file:///home/fullermd/src/bzr/bzr.dev/
# testament_sha1: 9eca819af80591e283275bbef74405b1edffbc22
# timestamp: 2009-06-22 03:15:24 -0500
# base_revision_id: pqm at pqm.ubuntu.com-20090621043025-one1vuhpnsgdv5tv
# 
# Begin patch
=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2009-06-19 09:06:56 +0000
+++ bzrlib/builtins.py	2009-06-22 08:14:40 +0000
@@ -1044,7 +1044,8 @@
         if directory is None:
             directory = '.'
         # Get the source branch
-        tree, br_from = bzrdir.BzrDir.open_tree_or_branch(directory)
+        tree, br_from, _unused = \
+            bzrdir.BzrDir.open_containing_tree_or_branch(directory)
         if strict is None:
             strict = br_from.get_config().get_user_option('push_strict')
             if strict is not None:

=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- bzrlib/tests/blackbox/test_push.py	2009-06-17 08:08:36 +0000
+++ bzrlib/tests/blackbox/test_push.py	2009-06-22 08:14:24 +0000
@@ -475,6 +475,15 @@
         # subsequent log is accurate
         self.assertNotContainsRe(out, 'rev1')
 
+    def test_push_from_subdir(self):
+        t = self.make_branch_and_tree('tree')
+        self.build_tree(['tree/dir/', 'tree/dir/file'])
+        t.add('dir', 'dir/file')
+        t.commit('r1')
+        out, err = self.run_bzr('push ../../pushloc', working_dir='tree/dir')
+        self.assertEqual('', out)
+        self.assertEqual('Created new branch.\n', err)
+
 
 class RedirectingMemoryTransport(memory.MemoryTransport):
 

# Begin bundle
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
UJBSS54T