Rev 4467: (fullermd) Fix push from subdir in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Jun 22 11:26:24 BST 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4467
revision-id: pqm at pqm.ubuntu.com-20090622102620-6mdwon5k3pg1brgl
parent: pqm at pqm.ubuntu.com-20090621043025-one1vuhpnsgdv5tv
parent: v.ladeuil+lp at free.fr-20090622091633-2cg1wbwslqi22knv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-06-22 11:26:20 +0100
message:
(fullermd) Fix push from subdir
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
------------------------------------------------------------
revno: 4464.2.1
revision-id: v.ladeuil+lp at free.fr-20090622091633-2cg1wbwslqi22knv
parent: pqm at pqm.ubuntu.com-20090619110117-rhph89w2k9gavp24
parent: v.ladeuil+lp at free.fr-20090622090151-8a0u7qcon6oujiio
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: integration
timestamp: Mon 2009-06-22 11:16:33 +0200
message:
Fix push from subdir
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_known_graph_py.py _known_graph_py.py-20090610185421-vw8vfda2cgnckgb1-1
bzrlib/_known_graph_pyx.pyx _known_graph_pyx.pyx-20090610194911-yjk73td9hpjilas0-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/test__known_graph.py test__known_graph.py-20090610185421-vw8vfda2cgnckgb1-2
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
tools/time_graph.py time_graph.py-20090608210127-6g0epojxnqjo0f0s-1
------------------------------------------------------------
revno: 4453.1.4
revision-id: v.ladeuil+lp at free.fr-20090622090151-8a0u7qcon6oujiio
parent: fullermd at over-yonder.net-20090622081440-7o6pytidy5pu0szu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: subdir-push
timestamp: Mon 2009-06-22 11:01:51 +0200
message:
Cleanup.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 4453.1.3
revision-id: fullermd at over-yonder.net-20090622081440-7o6pytidy5pu0szu
parent: fullermd at over-yonder.net-20090622081424-dhdw6d04m6v7s89t
parent: pqm at pqm.ubuntu.com-20090621043025-one1vuhpnsgdv5tv
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: subdir-push
timestamp: Mon 2009-06-22 03:14:40 -0500
message:
Merge bzr.dev.
renamed:
generate_docs.py => tools/generate_docs.py bzrinfogen.py-20051211224525-78e7c14f2c955e55
tools/doc_generate => bzrlib/doc_generate bzrinfogen-20051211214907-45ff5f0af3a80b32
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_known_graph_py.py _known_graph_py.py-20090610185421-vw8vfda2cgnckgb1-1
bzrlib/_known_graph_pyx.pyx _known_graph_pyx.pyx-20090610194911-yjk73td9hpjilas0-1
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/chk_map.py chk_map.py-20081001014447-ue6kkuhofvdecvxa-1
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/doc_generate/__init__.py __init__.py-20051211214907-df9e0e6b493553f1
bzrlib/doc_generate/autodoc_bash_completion.py big_bash_completion.py-20051211223059-00ecfbfcc8056b78
bzrlib/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
bzrlib/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test__known_graph.py test__known_graph.py-20090610185421-vw8vfda2cgnckgb1-2
bzrlib/tests/test_chk_map.py test_chk_map.py-20081001014447-ue6kkuhofvdecvxa-2
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/tests/test_generate_docs.py test_generate_docs.p-20070102123151-cqctnsrlqwmiljd7-1
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/time_graph.py time_graph.py-20090608210127-6g0epojxnqjo0f0s-1
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
tools/generate_docs.py bzrinfogen.py-20051211224525-78e7c14f2c955e55
------------------------------------------------------------
revno: 4453.1.2
revision-id: fullermd at over-yonder.net-20090622081424-dhdw6d04m6v7s89t
parent: fullermd at over-yonder.net-20090622080442-rf4dvqh2clywjdnw
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: subdir-push
timestamp: Mon 2009-06-22 03:14:24 -0500
message:
Add a test for pushing from subdir.
modified:
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
------------------------------------------------------------
revno: 4453.1.1
revision-id: fullermd at over-yonder.net-20090622080442-rf4dvqh2clywjdnw
parent: pqm at pqm.ubuntu.com-20090617090735-796uiadbn7zulvlu
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: subdir-push
timestamp: Mon 2009-06-22 03:04:42 -0500
message:
Use an open_containing rather than open to get the tree/branch we're
pushing from, so that it works if you're in a subdir of the branch.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2009-06-19 09:06:56 +0000
+++ b/bzrlib/builtins.py 2009-06-22 09:01:51 +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'
--- a/bzrlib/tests/blackbox/test_push.py 2009-06-17 08:08:36 +0000
+++ b/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):
More information about the bazaar-commits
mailing list