Rev 2791: Merge bzr.dev in http://people.ubuntu.com/~robertc/baz2.0/commit
Robert Collins
robertc at robertcollins.net
Thu Sep 13 04:22:47 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/commit
------------------------------------------------------------
revno: 2791
revision-id: robertc at robertcollins.net-20070913032229-vdojubs6akxlk4ao
parent: robertc at robertcollins.net-20070912050636-c6fu3lybn1tbftk5
parent: pqm at pqm.ubuntu.com-20070912222627-zvqit350mf6gvrbh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Thu 2007-09-13 13:22:29 +1000
message:
Merge bzr.dev
added:
bzrlib/tests/commands/test_update.py test_update.py-20070910091045-8uyp8v73j926l1g2-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2776.2.18.1.23
revision-id: pqm at pqm.ubuntu.com-20070912222627-zvqit350mf6gvrbh
parent: pqm at pqm.ubuntu.com-20070912075616-4lsus30tfc3sgwy0
parent: robertc at robertcollins.net-20070912212742-xlzu3nasjo31d5zs
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-09-12 23:26:27 +0100
message:
(robertc) Make expensive content checks during knit adds optional and disable them for commit. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
revno: 2776.2.18.1.11.6.8
revision-id: robertc at robertcollins.net-20070912212742-xlzu3nasjo31d5zs
parent: robertc at robertcollins.net-20070912042151-o2k78pnf1hdwd2xt
parent: pqm at pqm.ubuntu.com-20070912075616-4lsus30tfc3sgwy0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knits
timestamp: Thu 2007-09-13 07:27:42 +1000
message:
Merge 0.92 opening.
added:
bzrlib/tests/commands/test_update.py test_update.py-20070910091045-8uyp8v73j926l1g2-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2776.2.18.1.11.6.7
revision-id: robertc at robertcollins.net-20070912042151-o2k78pnf1hdwd2xt
parent: robertc at robertcollins.net-20070911041823-pn9kn8l5zmmptnsr
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knits
timestamp: Wed 2007-09-12 14:21:51 +1000
message:
Review feedback.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
revno: 2776.2.18.1.11.6.6
revision-id: robertc at robertcollins.net-20070911041823-pn9kn8l5zmmptnsr
parent: robertc at robertcollins.net-20070911040511-g0wxzi6iyr3u379q
parent: pqm at pqm.ubuntu.com-20070911020027-bmt9h0jgy3zdlge3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knits
timestamp: Tue 2007-09-11 14:18:23 +1000
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2776.2.18.1.11.6.5
revision-id: robertc at robertcollins.net-20070911040511-g0wxzi6iyr3u379q
parent: robertc at robertcollins.net-20070910035304-iwf9nmqoxeshjaki
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knits
timestamp: Tue 2007-09-11 14:05:11 +1000
message:
Unbreak weaves.
modified:
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
revno: 2776.2.18.1.11.6.4
revision-id: robertc at robertcollins.net-20070910035304-iwf9nmqoxeshjaki
parent: robertc at robertcollins.net-20070910033719-nqsmg72617f0tvyo
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knits
timestamp: Mon 2007-09-10 13:53:04 +1000
message:
Don't check for existing versions when adding texts with random revision ids.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
revno: 2776.2.18.1.11.6.3
revision-id: robertc at robertcollins.net-20070910033719-nqsmg72617f0tvyo
parent: robertc at robertcollins.net-20070910025423-qeqnv361y8yukjzc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knits
timestamp: Mon 2007-09-10 13:37:19 +1000
message:
* The ``VersionedFile`` interface no longer protects against misuse when
lines that are not lines, or are not strings are supplied. This saves
nearly 30% of the minimum cost to store a version of a file.
(Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 2776.2.18.1.11.6.2
revision-id: robertc at robertcollins.net-20070910025423-qeqnv361y8yukjzc
parent: robertc at robertcollins.net-20070910012710-bubnul8jp0mr5lhk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knits
timestamp: Mon 2007-09-10 12:54:23 +1000
message:
General cleanup of KnitVersionedFile._add.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 2776.2.18.1.11.6.1
revision-id: robertc at robertcollins.net-20070910012710-bubnul8jp0mr5lhk
parent: pqm at pqm.ubuntu.com-20070907145828-hjh5941jv7y8d9z8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knits
timestamp: Mon 2007-09-10 11:27:10 +1000
message:
Set random_revid on CommitBuilder when a commit generated its own revision id.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
------------------------------------------------------------
revno: 2776.2.18.1.22
revision-id: pqm at pqm.ubuntu.com-20070912075616-4lsus30tfc3sgwy0
parent: pqm at pqm.ubuntu.com-20070912042748-qhmeoj3c8zk7zt01
parent: mbp at sourcefrog.net-20070912012921-x905ro1jgeiddlsm
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-09-12 08:56:16 +0100
message:
(mbp) prepare for 0.92 cycle
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 2776.2.18.1.20.2.1
revision-id: mbp at sourcefrog.net-20070912012921-x905ro1jgeiddlsm
parent: pqm at pqm.ubuntu.com-20070911055622-a3060rj7l0iy38l2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Wed 2007-09-12 11:29:21 +1000
message:
Prepare for 0.92 cycle
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 2776.2.18.1.21
revision-id: pqm at pqm.ubuntu.com-20070912042748-qhmeoj3c8zk7zt01
parent: pqm at pqm.ubuntu.com-20070911055622-a3060rj7l0iy38l2
parent: robertc at robertcollins.net-20070912031604-lzy05h9u6dyfrfgb
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-09-12 05:27:48 +0100
message:
(robertc) Fix fetching of revisions referring to nested trees. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
------------------------------------------------------------
revno: 2776.2.18.1.20.1.2
revision-id: robertc at robertcollins.net-20070912031604-lzy05h9u6dyfrfgb
parent: robertc at robertcollins.net-20070912000548-b93ev6hxnfh202ks
committer: Robert Collins <robertc at robertcollins.net>
branch nick: nested-tree
timestamp: Wed 2007-09-12 13:16:04 +1000
message:
Fixup other interrepository tests failing due to the change to test subtrees.
modified:
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
------------------------------------------------------------
revno: 2776.2.18.1.20.1.1
revision-id: robertc at robertcollins.net-20070912000548-b93ev6hxnfh202ks
parent: pqm at pqm.ubuntu.com-20070911055622-a3060rj7l0iy38l2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: nested-tree
timestamp: Wed 2007-09-12 10:05:48 +1000
message:
* Pushing, pulling and branching branches with subtree references was not
copying the subtree weave, preventing the file graph from being accessed
and causing errors in commits in clones. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
------------------------------------------------------------
revno: 2776.2.18.1.20
revision-id: pqm at pqm.ubuntu.com-20070911055622-a3060rj7l0iy38l2
parent: pqm at pqm.ubuntu.com-20070911025457-xd28g5hqu9jco1sm
parent: mbp at sourcefrog.net-20070911031705-ho2pp6ulm4zln3du
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-09-11 06:56:22 +0100
message:
(mbp) fix bugs in tags with checkouts
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
------------------------------------------------------------
revno: 2776.2.18.1.11.5.5
revision-id: mbp at sourcefrog.net-20070911031705-ho2pp6ulm4zln3du
parent: mbp at sourcefrog.net-20070911030714-nzoumditu81hhwtw
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Tue 2007-09-11 13:17:05 +1000
message:
Add another test that tags work ok in checkouts
modified:
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
------------------------------------------------------------
revno: 2776.2.18.1.11.5.4
revision-id: mbp at sourcefrog.net-20070911030714-nzoumditu81hhwtw
parent: mbp at sourcefrog.net-20070911030330-8000a0t8feq8g130
parent: pqm at pqm.ubuntu.com-20070911025457-xd28g5hqu9jco1sm
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Tue 2007-09-11 13:07:14 +1000
message:
merge trunk
added:
bzrlib/tests/commands/test_update.py test_update.py-20070910091045-8uyp8v73j926l1g2-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2776.2.18.1.11.5.3
revision-id: mbp at sourcefrog.net-20070911030330-8000a0t8feq8g130
parent: mbp at sourcefrog.net-20070911020916-t0i1xe6jrpmjl4vf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Tue 2007-09-11 13:03:30 +1000
message:
In checkouts, tags are copied into the master branch when created, changed or deleted, and are copied into the checkout when it is updated. (Martin Pool, #93856, #93860)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
------------------------------------------------------------
revno: 2776.2.18.1.11.5.2
revision-id: mbp at sourcefrog.net-20070911020916-t0i1xe6jrpmjl4vf
parent: mbp at sourcefrog.net-20070910095133-yvlr99xkorynbdue
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Tue 2007-09-11 12:09:16 +1000
message:
Setting and deleting tags should also update the master branch, if any.
modified:
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
------------------------------------------------------------
revno: 2776.2.18.1.11.5.1
revision-id: mbp at sourcefrog.net-20070910095133-yvlr99xkorynbdue
parent: pqm at pqm.ubuntu.com-20070907145828-hjh5941jv7y8d9z8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Mon 2007-09-10 19:51:33 +1000
message:
Start adding tests for bug 93860
modified:
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
------------------------------------------------------------
revno: 2776.2.18.1.19
revision-id: pqm at pqm.ubuntu.com-20070911025457-xd28g5hqu9jco1sm
parent: pqm at pqm.ubuntu.com-20070911020027-bmt9h0jgy3zdlge3
parent: mbp at sourcefrog.net-20070911012409-c2ln3x5v53weqf9c
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-09-11 03:54:57 +0100
message:
(vila) avoid repeated connections from bzr update
added:
bzrlib/tests/commands/test_update.py test_update.py-20070910091045-8uyp8v73j926l1g2-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2776.2.18.1.16.2.2
revision-id: mbp at sourcefrog.net-20070911012409-c2ln3x5v53weqf9c
parent: mbp at sourcefrog.net-20070911002726-xqvjood96a36ue2m
parent: pqm at pqm.ubuntu.com-20070911010353-6lu7ek40rbjhj86o
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Tue 2007-09-11 11:24:09 +1000
message:
merge news
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
------------------------------------------------------------
revno: 2776.2.18.1.16.2.1
revision-id: mbp at sourcefrog.net-20070911002726-xqvjood96a36ue2m
parent: pqm at pqm.ubuntu.com-20070910121243-ccy1gej0kqy4feen
parent: v.ladeuil+lp at free.fr-20070910121247-sxf4l4pq1e27380p
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Tue 2007-09-11 10:27:26 +1000
message:
merge vincent and cleanup
added:
bzrlib/tests/commands/test_update.py test_update.py-20070910091045-8uyp8v73j926l1g2-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2776.2.18.1.12.2.2
revision-id: v.ladeuil+lp at free.fr-20070910121247-sxf4l4pq1e27380p
parent: v.ladeuil+lp at free.fr-20070910091350-mnrhuokhmj2vxim0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 128076
timestamp: Mon 2007-09-10 14:12:47 +0200
message:
Fix #128076 and #131396 by reusing bound branch transport.
* bzrlib/bzrdir.py:
(BzrDir.open): Add possible_transports as the last parameter.
* bzrlib/builtins.py:
(cmd_update.run): Use possible_transports parameter to obtain the
master branch transport and reuse it.
* bzrlib/branch.py:
(Branch.open, Branch.get_master_branch,
BzrBranch5.get_master_branch, BzrBranch5.update): Add
possible_transports as the last parameter.
* bzrlib/workingtree.py:
(WorkingTree.update): Add possible_transports as the last parameter.
* bzrlib/tests/commands/test_update.py:
(TestUpdate.test_update): Ignore connections from bind.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/commands/test_update.py test_update.py-20070910091045-8uyp8v73j926l1g2-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2776.2.18.1.12.2.1
revision-id: v.ladeuil+lp at free.fr-20070910091350-mnrhuokhmj2vxim0
parent: pqm at pqm.ubuntu.com-20070910054843-evbkt0bivtk6tpqu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 128076
timestamp: Mon 2007-09-10 11:13:50 +0200
message:
Reproduce #131396 and #128076 in the test suite.
added:
bzrlib/tests/commands/test_update.py test_update.py-20070910091045-8uyp8v73j926l1g2-1
modified:
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
------------------------------------------------------------
revno: 2776.2.18.1.18
revision-id: pqm at pqm.ubuntu.com-20070911020027-bmt9h0jgy3zdlge3
parent: pqm at pqm.ubuntu.com-20070911010353-6lu7ek40rbjhj86o
parent: robertc at robertcollins.net-20070911002917-53h2vb7ex4xh00u7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-09-11 03:00:27 +0100
message:
(robertc) Use a better api during commit to reduce overhead when adding texts. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 2776.2.18.1.9.2.2
revision-id: robertc at robertcollins.net-20070911002917-53h2vb7ex4xh00u7
parent: robertc at robertcollins.net-20070909220156-wmm9up3q0mzisrb2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-builder
timestamp: Tue 2007-09-11 10:29:17 +1000
message:
Add comment for igc.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 2776.2.18.1.9.2.1
revision-id: robertc at robertcollins.net-20070909220156-wmm9up3q0mzisrb2
parent: pqm at pqm.ubuntu.com-20070906050530-q58gvki4dedc4i6e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-builder
timestamp: Mon 2007-09-10 08:01:56 +1000
message:
* CommitBuilder now advertises itself as requiring the root entry to be
supplied. This only affects foreign repository implementations which reuse
CommitBuilder directly and have changed record_entry_contents to require
that the root not be supplied. This should be precisely zero plugins
affected. (Robert Collins)
* CommitBuilder now defaults to using add_lines_with_ghosts, reducing
overhead on non-weave repositories which don't require all parents to be
present. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 2776.2.18.1.17
revision-id: pqm at pqm.ubuntu.com-20070911010353-6lu7ek40rbjhj86o
parent: pqm at pqm.ubuntu.com-20070910121243-ccy1gej0kqy4feen
parent: mbp at sourcefrog.net-20070911001556-7lji6zrw4xw9vv1f
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-09-11 02:03:53 +0100
message:
(lukas) Overwrite conflicting tags by push|pull --overwrite
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
------------------------------------------------------------
revno: 2776.2.18.1.16.1.1
revision-id: mbp at sourcefrog.net-20070911001556-7lji6zrw4xw9vv1f
parent: pqm at pqm.ubuntu.com-20070910121243-ccy1gej0kqy4feen
parent: lalinsky at gmail.com-20070907113713-9xb7l82n81g2amdn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tag-overwrite
timestamp: Tue 2007-09-11 10:15:56 +1000
message:
merge push|pull --overwrite and tweak
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
------------------------------------------------------------
revno: 2776.2.18.1.10.3.1
revision-id: lalinsky at gmail.com-20070907113713-9xb7l82n81g2amdn
parent: pqm at pqm.ubuntu.com-20070906063814-iiwx3hccoukt499k
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: overwrite-tags
timestamp: Fri 2007-09-07 13:37:13 +0200
message:
Overwrite conflicting tags by push|pull --overwrite.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
------------------------------------------------------------
revno: 2776.2.18.1.16
revision-id: pqm at pqm.ubuntu.com-20070910121243-ccy1gej0kqy4feen
parent: pqm at pqm.ubuntu.com-20070910105743-72rhm2629qiijbsj
parent: mbp at sourcefrog.net-20070910095545-1wuzua8ly1tdee9o
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-09-10 13:12:43 +0100
message:
Old fix from Alexander: set_tag_dict should lock the branch
modified:
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
------------------------------------------------------------
revno: 2776.2.18.1.11.4.1
revision-id: mbp at sourcefrog.net-20070910095545-1wuzua8ly1tdee9o
parent: pqm at pqm.ubuntu.com-20070907145828-hjh5941jv7y8d9z8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tag-lock
timestamp: Mon 2007-09-10 19:55:45 +1000
message:
Old fix from Alexander: set_tag_dict should lock the branch
modified:
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
------------------------------------------------------------
revno: 2776.2.18.1.15
revision-id: pqm at pqm.ubuntu.com-20070910105743-72rhm2629qiijbsj
parent: pqm at pqm.ubuntu.com-20070910100551-cw3iuntfi1kwj8jg
parent: mbp at sourcefrog.net-20070910092754-v85j56whbxh75acb
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-09-10 11:57:43 +0100
message:
Transport.ensure_base should ignore PermissionDenied when trying to create the directory (Axel Kollmorgen)
modified:
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 2776.2.18.1.11.3.1
revision-id: mbp at sourcefrog.net-20070910092754-v85j56whbxh75acb
parent: pqm at pqm.ubuntu.com-20070907145828-hjh5941jv7y8d9z8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Mon 2007-09-10 19:27:54 +1000
message:
Transport.ensure_base should ignore PermissionDenied when trying to create the directory (Axel Kollmorgen)
modified:
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 2776.2.18.1.14
revision-id: pqm at pqm.ubuntu.com-20070910100551-cw3iuntfi1kwj8jg
parent: pqm at pqm.ubuntu.com-20070910085701-36pk2aye9gf2vc0t
parent: mbp at sourcefrog.net-20070906012710-fu7nkpp26k72a70n
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-09-10 11:05:51 +0100
message:
(mbp) coding standard and doc updates
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2776.2.18.1.1.1.3
revision-id: mbp at sourcefrog.net-20070906012710-fu7nkpp26k72a70n
parent: mbp at sourcefrog.net-20070905064242-642im0o3ookdlmqw
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-09-06 11:27:10 +1000
message:
clarify spacing for function parameters
modified:
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2776.2.18.1.1.1.2
revision-id: mbp at sourcefrog.net-20070905064242-642im0o3ookdlmqw
parent: mbp at sourcefrog.net-20070905051221-ubcur9dfodsozr28
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Wed 2007-09-05 16:42:42 +1000
message:
emacs indent additions from vila
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2776.2.18.1.1.1.1
revision-id: mbp at sourcefrog.net-20070905051221-ubcur9dfodsozr28
parent: pqm at pqm.ubuntu.com-20070905001648-0iigag4tq1u8mywn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Wed 2007-09-05 15:12:21 +1000
message:
Document code layout stuff
modified:
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2776.2.18.1.13
revision-id: pqm at pqm.ubuntu.com-20070910085701-36pk2aye9gf2vc0t
parent: pqm at pqm.ubuntu.com-20070910054843-evbkt0bivtk6tpqu
parent: ian.clatworthy at internode.on.net-20070910080059-yzwto88w0irifgk6
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-09-10 09:57:01 +0100
message:
branches and standalone-trees documentation (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 2776.2.18.1.12.1.1
revision-id: ian.clatworthy at internode.on.net-20070910080059-yzwto88w0irifgk6
parent: pqm at pqm.ubuntu.com-20070910054843-evbkt0bivtk6tpqu
parent: ian.clatworthy at internode.on.net-20070907034241-vt2rgf4lqqwjbttm
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Mon 2007-09-10 18:00:59 +1000
message:
branches and standalone-trees documentation (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 2776.2.18.1.10.2.1
revision-id: ian.clatworthy at internode.on.net-20070907034241-vt2rgf4lqqwjbttm
parent: pqm at pqm.ubuntu.com-20070906063814-iiwx3hccoukt499k
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.concepts
timestamp: Fri 2007-09-07 13:42:41 +1000
message:
add branches and standalone-trees as help topics
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 2776.2.18.1.12
revision-id: pqm at pqm.ubuntu.com-20070910054843-evbkt0bivtk6tpqu
parent: pqm at pqm.ubuntu.com-20070907145828-hjh5941jv7y8d9z8
parent: ian.clatworthy at internode.on.net-20070910050624-9iwn4y6n8b3fyjwn
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-09-10 06:48:43 +0100
message:
selftest --benchmark verbose again by default (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2776.2.18.1.11.1.1
revision-id: ian.clatworthy at internode.on.net-20070910050624-9iwn4y6n8b3fyjwn
parent: pqm at pqm.ubuntu.com-20070907145828-hjh5941jv7y8d9z8
parent: ian.clatworthy at internode.on.net-20070910021814-fpu0zjjmebnc10tn
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Mon 2007-09-10 15:06:24 +1000
message:
selftest --benchmark verbose again by default (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2776.2.18.1.11.2.1
revision-id: ian.clatworthy at internode.on.net-20070910021814-fpu0zjjmebnc10tn
parent: pqm at pqm.ubuntu.com-20070907145828-hjh5941jv7y8d9z8
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.verbose-benchmarks
timestamp: Mon 2007-09-10 12:18:14 +1000
message:
Fix selftest --benchmark so verbose by default again
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
Diff too large for email (1362 lines, the limit is 1000).
More information about the bazaar-commits
mailing list