Rev 3837: Merge bzr.dev, resolve conflict in tests. in http://bzr.arbash-meinel.com/branches/bzr/1.10-dev/remote_revision_history
John Arbash Meinel
john at arbash-meinel.com
Tue Nov 25 17:31:29 GMT 2008
At http://bzr.arbash-meinel.com/branches/bzr/1.10-dev/remote_revision_history
------------------------------------------------------------
revno: 3837
revision-id: john at arbash-meinel.com-20081125173102-n04on0gpnqogdfm8
parent: andrew.bennetts at canonical.com-20081114055531-5wtu6kx89ilt02yj
parent: pqm at pqm.ubuntu.com-20081125152232-c22rycit2dfzm11f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: remote_revision_history
timestamp: Tue 2008-11-25 11:31:02 -0600
message:
Merge bzr.dev, resolve conflict in tests.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
bzrlib/python-compat.h pythoncompat.h-20080924041409-9kvi0fgtuuqp743j-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3834.1.15
revision-id: pqm at pqm.ubuntu.com-20081125152232-c22rycit2dfzm11f
parent: pqm at pqm.ubuntu.com-20081125021810-2dhu9lqkn6nh5bhn
parent: mnordhoff at mattnordhoff.com-20081123141208-ao19kbt7n31c13oq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-11-25 15:22:32 +0000
message:
(Matt) Let _format_version_tuple accept alphas/betas/RCs with 0
sub-releases.
modified:
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3834.10.1
revision-id: mnordhoff at mattnordhoff.com-20081123141208-ao19kbt7n31c13oq
parent: pqm at pqm.ubuntu.com-20081121221932-44m8c85k5ri8h5hg
committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
branch nick: format-alpha-0
timestamp: Sun 2008-11-23 14:12:08 +0000
message:
Let _format_version_tuple accept alphas/betas/rcs with a subrelease of 0.
This is sometimes seen in Python's sys.version_info, presumably in svn builds or something.
modified:
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3834.1.14
revision-id: pqm at pqm.ubuntu.com-20081125021810-2dhu9lqkn6nh5bhn
parent: pqm at pqm.ubuntu.com-20081121221932-44m8c85k5ri8h5hg
parent: amanic at gmail.com-20081115221226-5o8fg93oivxj6mwb
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-11-25 02:18:10 +0000
message:
(Marius,
Martin) Avoid breaking API when retrieving master branch nickname.
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
------------------------------------------------------------
revno: 3815.3.3
revision-id: amanic at gmail.com-20081115221226-5o8fg93oivxj6mwb
parent: pqm at pqm.ubuntu.com-20081107064851-mva76qrw6giexd0c
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.1.9
timestamp: Sun 2008-11-16 00:12:26 +0200
message:
apply Martin's fix for #293440
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
------------------------------------------------------------
revno: 3834.1.13
revision-id: pqm at pqm.ubuntu.com-20081121221932-44m8c85k5ri8h5hg
parent: pqm at pqm.ubuntu.com-20081121202743-dhg79sf8sf0wryfe
parent: john at arbash-meinel.com-20081121214103-gry7l3tuq9apgerx
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-11-21 22:19:32 +0000
message:
(mbp) Fix bug #288751 by teaching fetch to expand to fulltexts if it
would cause a delta to span repo boundaries.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 3830.3.25
revision-id: john at arbash-meinel.com-20081121214103-gry7l3tuq9apgerx
parent: john at arbash-meinel.com-20081121212106-erewpn8s9353f411
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 288751-pack-deltas
timestamp: Fri 2008-11-21 15:41:03 -0600
message:
We changed the error that is raised when fetching from a broken repo.
The test only really cares that an assertion that will cancel the fetch is being
raised, to ensure that we don't actually allow fetching when broken.
modified:
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 3830.3.24
revision-id: john at arbash-meinel.com-20081121212106-erewpn8s9353f411
parent: john at arbash-meinel.com-20081121211151-yqloy3xyzu7qgsm4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 288751-pack-deltas
timestamp: Fri 2008-11-21 15:21:06 -0600
message:
We don't require all parents to be present, just the compression parent.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3830.3.23
revision-id: john at arbash-meinel.com-20081121211151-yqloy3xyzu7qgsm4
parent: john at arbash-meinel.com-20081121204849-widj20hs0s24c9g5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 288751-pack-deltas
timestamp: Fri 2008-11-21 15:11:51 -0600
message:
Use Branch.sprout rather than Branch.clone.
It allows the test to pass on Windows, and we are starting a new branch, which
is '.sprout' anyway.
modified:
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
------------------------------------------------------------
revno: 3830.3.22
revision-id: john at arbash-meinel.com-20081121204849-widj20hs0s24c9g5
parent: john at arbash-meinel.com-20081121202415-30ok91cqouwa7f7e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 288751-pack-deltas
timestamp: Fri 2008-11-21 14:48:49 -0600
message:
Restore the ability to use deltas in the generic fetch code.
modified:
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
------------------------------------------------------------
revno: 3830.3.21
revision-id: john at arbash-meinel.com-20081121202415-30ok91cqouwa7f7e
parent: john at arbash-meinel.com-20081121202052-vs6gqscjphfmxmo8
parent: pqm at pqm.ubuntu.com-20081121044450-xgyehkv3u1da37wg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 288751-pack-deltas
timestamp: Fri 2008-11-21 14:24:15 -0600
message:
Merge in bzr.dev 3845 and handle the trivial conflicts.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3830.3.20
revision-id: john at arbash-meinel.com-20081121202052-vs6gqscjphfmxmo8
parent: john at arbash-meinel.com-20081121201903-d9gj476w20s59580
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 288751-pack-deltas
timestamp: Fri 2008-11-21 14:20:52 -0600
message:
Minor PEP8 and copyright updates.
modified:
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 3830.3.19
revision-id: john at arbash-meinel.com-20081121201903-d9gj476w20s59580
parent: mbp at sourcefrog.net-20081121043538-b6bfhh84ckku26ge
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 288751-pack-deltas
timestamp: Fri 2008-11-21 14:19:03 -0600
message:
Small update to GraphIndexBuilder._external_references
Add a comment describing the assumptions, and add a check for when
there cannot be external compression references.
modified:
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
------------------------------------------------------------
revno: 3830.3.18
revision-id: mbp at sourcefrog.net-20081121043538-b6bfhh84ckku26ge
parent: mbp at sourcefrog.net-20081120122941-vsgl27z58crm4qe1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 288751-pack-deltas
timestamp: Fri 2008-11-21 15:35:38 +1100
message:
Faster expression evaluation order
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3830.3.17
revision-id: mbp at sourcefrog.net-20081120122941-vsgl27z58crm4qe1
parent: mbp at sourcefrog.net-20081120055632-dhju4121e5i1p3t3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 288751-pack-deltas
timestamp: Thu 2008-11-20 23:29:41 +1100
message:
Don't assume versions being unmentioned by iter_lines_added_or_changed implies the versions aren't present
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3830.3.16
revision-id: mbp at sourcefrog.net-20081120055632-dhju4121e5i1p3t3
parent: mbp at sourcefrog.net-20081120034745-wayfz2zxr7ypqjdc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 288751-pack-deltas
timestamp: Thu 2008-11-20 16:56:32 +1100
message:
Add passing tests for iter_lines_added_or_present in stacked repos
modified:
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
------------------------------------------------------------
revno: 3830.3.15
revision-id: mbp at sourcefrog.net-20081120034745-wayfz2zxr7ypqjdc
parent: mbp at sourcefrog.net-20081119074922-f7xxrzpkce9ytyal
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 288751-pack-deltas
timestamp: Thu 2008-11-20 14:47:45 +1100
message:
Check against all parents when deciding whether to store a fulltext in a stacked repository
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3830.3.14
revision-id: mbp at sourcefrog.net-20081119074922-f7xxrzpkce9ytyal
parent: mbp at sourcefrog.net-20081119074746-2uiwh2i46qmyqk3d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 288751-pack-deltas
timestamp: Wed 2008-11-19 18:49:22 +1100
message:
Return to setting _fetch_uses_deltas from initializers
modified:
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3830.3.13
revision-id: mbp at sourcefrog.net-20081119074746-2uiwh2i46qmyqk3d
parent: mbp at sourcefrog.net-20081119074451-4kn0r1khwnhh7hxs
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 288751-pack-deltas
timestamp: Wed 2008-11-19 18:47:46 +1100
message:
review cleanups to insert_record_stream
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3830.3.12
revision-id: mbp at sourcefrog.net-20081119074451-4kn0r1khwnhh7hxs
parent: mbp at sourcefrog.net-20081114080450-7myrrjm45lqk8p2x
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 288751-pack-deltas
timestamp: Wed 2008-11-19 18:44:51 +1100
message:
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
modified:
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 3830.3.11
revision-id: mbp at sourcefrog.net-20081114080450-7myrrjm45lqk8p2x
parent: mbp at sourcefrog.net-20081114075216-0rk6sowvvsgvlkag
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 288751-pack-deltas
timestamp: Fri 2008-11-14 18:04:50 +1000
message:
Update news for 288751
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3830.3.10
revision-id: mbp at sourcefrog.net-20081114075216-0rk6sowvvsgvlkag
parent: mbp at sourcefrog.net-20081114074457-91gxtjmqa0b1x1h3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 288751-pack-deltas
timestamp: Fri 2008-11-14 17:52:16 +1000
message:
Update more stacking effort tests
modified:
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
------------------------------------------------------------
revno: 3830.3.9
revision-id: mbp at sourcefrog.net-20081114074457-91gxtjmqa0b1x1h3
parent: mbp at sourcefrog.net-20081114061912-0px2cudfp3rugmxh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 288751-pack-deltas
timestamp: Fri 2008-11-14 17:44:57 +1000
message:
Simplify kvf insert_record_stream; add has_key shorthand methods; update stacking effort tests
modified:
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
------------------------------------------------------------
revno: 3830.3.8
revision-id: mbp at sourcefrog.net-20081114061912-0px2cudfp3rugmxh
parent: mbp at sourcefrog.net-20081114053027-qf3ns0kgszqfyjus
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 288751-pack-deltas
timestamp: Fri 2008-11-14 16:19:12 +1000
message:
KnitVersionedFiles.insert_record_stream rebuilds repository-spanning deltas when needed
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3830.3.7
revision-id: mbp at sourcefrog.net-20081114053027-qf3ns0kgszqfyjus
parent: mbp at sourcefrog.net-20081114050933-kgm4kr84eba7800m
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 288751-pack-deltas
timestamp: Fri 2008-11-14 15:30:27 +1000
message:
KnitVersionedFiles.insert_record_stream checks that compression parents are in the same kvf, not in a fallback
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3830.3.6
revision-id: mbp at sourcefrog.net-20081114050933-kgm4kr84eba7800m
parent: mbp at sourcefrog.net-20081113062150-ppqewoxejts3gvzt
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 288751-pack-deltas
timestamp: Fri 2008-11-14 15:09:33 +1000
message:
Document _fetch_uses_delta and make it a class attribute
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3830.3.5
revision-id: mbp at sourcefrog.net-20081113062150-ppqewoxejts3gvzt
parent: mbp at sourcefrog.net-20081113061416-pf1kfgznvnwtiuyj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 288751-pack-deltas
timestamp: Thu 2008-11-13 16:21:50 +1000
message:
GraphIndexBuilder shouldn't know references are for compression so rename
modified:
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 3830.3.4
revision-id: mbp at sourcefrog.net-20081113061416-pf1kfgznvnwtiuyj
parent: mbp at sourcefrog.net-20081113054826-kp55q8ob8ipt0jsn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 288751-pack-deltas
timestamp: Thu 2008-11-13 16:14:16 +1000
message:
Move _external_compression_references onto the GraphIndexBuilder, and check them for inventories too
modified:
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 3830.3.3
revision-id: mbp at sourcefrog.net-20081113054826-kp55q8ob8ipt0jsn
parent: mbp at sourcefrog.net-20081112092834-ve92du17xgnvaztg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 288751-pack-deltas
timestamp: Thu 2008-11-13 15:48:26 +1000
message:
commit should log original exception when aborting write group
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
------------------------------------------------------------
revno: 3830.3.2
revision-id: mbp at sourcefrog.net-20081112092834-ve92du17xgnvaztg
parent: mbp at sourcefrog.net-20081112091307-yvchhvmcgr58aca7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 288751-pack-deltas
timestamp: Wed 2008-11-12 19:28:34 +1000
message:
Check that newly created packs don't have missing delta bases.
This should cause an error in cases that would lead to bug #288751.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 3830.3.1
revision-id: mbp at sourcefrog.net-20081112091307-yvchhvmcgr58aca7
parent: pqm at pqm.ubuntu.com-20081111045205-junyogmq9uajfg6z
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 288751-pack-deltas
timestamp: Wed 2008-11-12 19:13:07 +1000
message:
NewPack should be constructed from the PackCollection, rather than attributes of it
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 3834.1.12
revision-id: pqm at pqm.ubuntu.com-20081121202743-dhg79sf8sf0wryfe
parent: pqm at pqm.ubuntu.com-20081121044450-xgyehkv3u1da37wg
parent: john at arbash-meinel.com-20081121195345-6vfpy3821ge662vk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-11-21 20:27:43 +0000
message:
(bialix) Use Winsock2.h to match the Ws2 library.
modified:
bzrlib/python-compat.h pythoncompat.h-20080924041409-9kvi0fgtuuqp743j-1
------------------------------------------------------------
revno: 3834.9.1
revision-id: john at arbash-meinel.com-20081121195345-6vfpy3821ge662vk
parent: pqm at pqm.ubuntu.com-20081120045730-d6ik8z5dfnzcnab6
author: Alexander Belchenko <bialix at ukr.net>
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2008-11-21 13:53:45 -0600
message:
include Winsock2.h to match the Ws2 library.
modified:
bzrlib/python-compat.h pythoncompat.h-20080924041409-9kvi0fgtuuqp743j-1
------------------------------------------------------------
revno: 3834.1.11
revision-id: pqm at pqm.ubuntu.com-20081121044450-xgyehkv3u1da37wg
parent: pqm at pqm.ubuntu.com-20081121033557-q9noqdq5v3ulpg9a
parent: mbp at sourcefrog.net-20081121040625-zvsu9pu1pen8pqfr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-11-21 04:44:50 +0000
message:
(mbp) SunOS fixes to readdir_pyx
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
------------------------------------------------------------
revno: 3834.5.5
revision-id: mbp at sourcefrog.net-20081121040625-zvsu9pu1pen8pqfr
parent: mbp at sourcefrog.net-20081120044501-otknkuki8kqbihpj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 297381-readdir
timestamp: Fri 2008-11-21 15:06:25 +1100
message:
Review cleanups on readdir
modified:
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
------------------------------------------------------------
revno: 3834.5.4
revision-id: mbp at sourcefrog.net-20081120044501-otknkuki8kqbihpj
parent: mbp at sourcefrog.net-20081120041717-0ay1x181hd3q97r2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 297381-readdir
timestamp: Thu 2008-11-20 15:45:01 +1100
message:
Use open/fchdir rather than getcwd/chdir to save and restore directory location
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
------------------------------------------------------------
revno: 3834.1.10
revision-id: pqm at pqm.ubuntu.com-20081121033557-q9noqdq5v3ulpg9a
parent: pqm at pqm.ubuntu.com-20081121012757-5oqu1dnj8kugnqqd
parent: mbp at sourcefrog.net-20081121025232-dvsfoc4cuookgckz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-11-21 03:35:57 +0000
message:
(mbp) Deprecate LockableFiles._escape
modified:
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3834.8.2
revision-id: mbp at sourcefrog.net-20081121025232-dvsfoc4cuookgckz
parent: mbp at sourcefrog.net-20081117032153-5al4ibc256whf5ut
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: controlfiles
timestamp: Fri 2008-11-21 13:52:32 +1100
message:
Deprecated LockableFiles._escape
modified:
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
------------------------------------------------------------
revno: 3834.8.1
revision-id: mbp at sourcefrog.net-20081117032153-5al4ibc256whf5ut
parent: pqm at pqm.ubuntu.com-20081112073322-dpai0jsluo3cvpf2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: controlfiles
timestamp: Mon 2008-11-17 14:21:53 +1100
message:
Remove dead exports
modified:
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3834.1.9
revision-id: pqm at pqm.ubuntu.com-20081121012757-5oqu1dnj8kugnqqd
parent: pqm at pqm.ubuntu.com-20081120045730-d6ik8z5dfnzcnab6
parent: andrew.bennetts at canonical.com-20081121005302-at9b9w1hn3rgvgmq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-11-21 01:27:57 +0000
message:
Fix “PermissionedDenied: "None"” from RemoteTransport.mkdir and similar.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 3834.7.4
revision-id: andrew.bennetts at canonical.com-20081121005302-at9b9w1hn3rgvgmq
parent: andrew.bennetts at canonical.com-20081121003306-vy11ysf5mrq2tqj5
parent: pqm at pqm.ubuntu.com-20081120045730-d6ik8z5dfnzcnab6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remotetransport-permissiondenied
timestamp: Fri 2008-11-21 11:53:02 +1100
message:
Merge bzr.dev, fix conflict in NEWS.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
------------------------------------------------------------
revno: 3834.7.3
revision-id: andrew.bennetts at canonical.com-20081121003306-vy11ysf5mrq2tqj5
parent: andrew.bennetts at canonical.com-20081121002354-2zp6vdwnfqid065y
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remotetransport-permissiondenied
timestamp: Fri 2008-11-21 11:33:06 +1100
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3834.7.2
revision-id: andrew.bennetts at canonical.com-20081121002354-2zp6vdwnfqid065y
parent: andrew.bennetts at canonical.com-20081120061707-amh7sobzz5ag9spb
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remotetransport-permissiondenied
timestamp: Fri 2008-11-21 11:23:54 +1100
message:
Improvements suggested by review.
modified:
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 3834.7.1
revision-id: andrew.bennetts at canonical.com-20081120061707-amh7sobzz5ag9spb
parent: pqm at pqm.ubuntu.com-20081118222130-vczdog5my1bc6ta4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remotetransport-permissiondenied
timestamp: Thu 2008-11-20 17:17:07 +1100
message:
Fix RemoteTransport's translation of errors involving paths; it wasn't passing orig_path to _translate_error.
modified:
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 3834.1.8
revision-id: pqm at pqm.ubuntu.com-20081120045730-d6ik8z5dfnzcnab6
parent: pqm at pqm.ubuntu.com-20081119075529-9c4jtbifm0igp3vf
parent: mbp at sourcefrog.net-20081120041717-0ay1x181hd3q97r2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-11-20 04:57:30 +0000
message:
(mbp) don't call chdir(''), which fails on SunOS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
------------------------------------------------------------
revno: 3834.5.3
revision-id: mbp at sourcefrog.net-20081120041717-0ay1x181hd3q97r2
parent: mbp at sourcefrog.net-20081120041608-9yfmatq3ad0w9oy0
parent: john at arbash-meinel.com-20081119165407-5sxxlimtvun9fpn8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Thu 2008-11-20 15:17:17 +1100
message:
Merge John's fix for chdir('')
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
------------------------------------------------------------
revno: 3834.6.1
revision-id: john at arbash-meinel.com-20081119165407-5sxxlimtvun9fpn8
parent: pqm at pqm.ubuntu.com-20081117034335-el4e1m7v3tnjmnhu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: chdir_empty
timestamp: Wed 2008-11-19 10:54:07 -0600
message:
Fix bug #297831 by skipping the chdir call if we have an empty path.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
------------------------------------------------------------
revno: 3834.5.2
revision-id: mbp at sourcefrog.net-20081120041608-9yfmatq3ad0w9oy0
parent: mbp at sourcefrog.net-20081120023619-kuhhai103uliqavo
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Thu 2008-11-20 15:16:08 +1100
message:
Don't call chdir('')
modified:
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
------------------------------------------------------------
revno: 3834.5.1
revision-id: mbp at sourcefrog.net-20081120023619-kuhhai103uliqavo
parent: pqm at pqm.ubuntu.com-20081119075529-9c4jtbifm0igp3vf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Thu 2008-11-20 13:36:19 +1100
message:
Fix try/finally block after chdir in readdir_pyx
modified:
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
------------------------------------------------------------
revno: 3834.1.7
revision-id: pqm at pqm.ubuntu.com-20081119075529-9c4jtbifm0igp3vf
parent: pqm at pqm.ubuntu.com-20081118222130-vczdog5my1bc6ta4
parent: aaron at aaronbentley.com-20081115194137-wghezl9da7aluk3p
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-11-19 07:55:29 +0000
message:
(abentley) Give bzrlib clients more control over plugin loading
modified:
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
------------------------------------------------------------
revno: 3834.4.7
revision-id: aaron at aaronbentley.com-20081115194137-wghezl9da7aluk3p
parent: aaron at aaronbentley.com-20081115184313-targ6r7bkut2aslq
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: control-plugin-path
timestamp: Sat 2008-11-15 14:41:37 -0500
message:
Add tests for plugins
modified:
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
------------------------------------------------------------
revno: 3834.4.6
revision-id: aaron at aaronbentley.com-20081115184313-targ6r7bkut2aslq
parent: aaron at aaronbentley.com-20081113202626-yvxt9hjoflmtgsw3
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: control-plugin-path
timestamp: Sat 2008-11-15 13:43:13 -0500
message:
Restore vila's colordiff change
modified:
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
------------------------------------------------------------
revno: 3834.4.5
revision-id: aaron at aaronbentley.com-20081113202626-yvxt9hjoflmtgsw3
parent: aaron at aaronbentley.com-20081113201950-w3a98jl6d13z7sfe
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: control-plugin-path
timestamp: Thu 2008-11-13 15:26:26 -0500
message:
Simplify disable_plugins implementation
modified:
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
------------------------------------------------------------
revno: 3834.4.4
revision-id: aaron at aaronbentley.com-20081113201950-w3a98jl6d13z7sfe
parent: aaron at aaronbentley.com-20081113193842-v53xoga2fecdcc35
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: control-plugin-path
timestamp: Thu 2008-11-13 15:19:50 -0500
message:
Allow paths to be specified to load_plugins
modified:
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
------------------------------------------------------------
revno: 3834.4.3
revision-id: aaron at aaronbentley.com-20081113193842-v53xoga2fecdcc35
parent: aaron at aaronbentley.com-20081113193651-lvdru0153lrugo6u
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: control-plugin-path
timestamp: Thu 2008-11-13 14:38:42 -0500
message:
Revert vila's colordiff change.
modified:
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
------------------------------------------------------------
revno: 3834.4.2
revision-id: aaron at aaronbentley.com-20081113193651-lvdru0153lrugo6u
parent: aaron at aaronbentley.com-20081113175419-cbc89ihcue8zum0h
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: control-plugin-path
timestamp: Thu 2008-11-13 14:36:51 -0500
message:
Allow specifying plugin paths, disable co-installed plugins.
modified:
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
------------------------------------------------------------
revno: 3834.4.1
revision-id: aaron at aaronbentley.com-20081113175419-cbc89ihcue8zum0h
parent: pqm at pqm.ubuntu.com-20081113075004-skgl7ma39awgyjze
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: control-plugin-path
timestamp: Thu 2008-11-13 12:54:19 -0500
message:
Stop automagically setting plugins patch on importing bzrlib
modified:
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3834.1.6
revision-id: pqm at pqm.ubuntu.com-20081118222130-vczdog5my1bc6ta4
parent: pqm at pqm.ubuntu.com-20081117224017-jb8tr2wok8jjxn7r
parent: aaron at aaronbentley.com-20081118214336-53wku2p6og6kvl5r
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-11-18 22:21:30 +0000
message:
(abentley) Fix RemoteRepository.get_parent_map when stacked
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3834.3.7
revision-id: aaron at aaronbentley.com-20081118214336-53wku2p6og6kvl5r
parent: aaron at aaronbentley.com-20081118175606-195u5kcnjnedebny
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Tue 2008-11-18 16:43:36 -0500
message:
Updates from review
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3834.3.6
revision-id: aaron at aaronbentley.com-20081118175606-195u5kcnjnedebny
parent: aaron at aaronbentley.com-20081118171200-ajuln6fdb87yd8sa
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Tue 2008-11-18 12:56:06 -0500
message:
Reduce inefficiency when doing make_parents_provider frequently
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3834.3.5
revision-id: aaron at aaronbentley.com-20081118171200-ajuln6fdb87yd8sa
parent: aaron at aaronbentley.com-20081118170633-krfe08xg3nn2q6wr
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Tue 2008-11-18 12:12:00 -0500
message:
Fix make_parents_provider
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3834.3.4
revision-id: aaron at aaronbentley.com-20081118170633-krfe08xg3nn2q6wr
parent: aaron at aaronbentley.com-20081118045428-iqnvgupw1j1nysxu
parent: pqm at pqm.ubuntu.com-20081117224017-jb8tr2wok8jjxn7r
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Tue 2008-11-18 12:06:33 -0500
message:
Merge bzr.dev info remote-stacking-graph
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
------------------------------------------------------------
revno: 3834.3.3
revision-id: aaron at aaronbentley.com-20081118045428-iqnvgupw1j1nysxu
parent: aaron at aaronbentley.com-20081118044717-t6tx15x58dl3d1f9
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Mon 2008-11-17 23:54:28 -0500
message:
Add NEWS entry
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3834.3.2
revision-id: aaron at aaronbentley.com-20081118044717-t6tx15x58dl3d1f9
parent: aaron at aaronbentley.com-20081117142319-uy77nvajbqw87cfv
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Mon 2008-11-17 23:47:17 -0500
message:
Add tests for get_parent_map
modified:
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3834.3.1
revision-id: aaron at aaronbentley.com-20081117142319-uy77nvajbqw87cfv
parent: pqm at pqm.ubuntu.com-20081113075004-skgl7ma39awgyjze
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Mon 2008-11-17 09:23:19 -0500
message:
Stack get_parent_map on fallback repos
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3834.1.5
revision-id: pqm at pqm.ubuntu.com-20081117224017-jb8tr2wok8jjxn7r
parent: pqm at pqm.ubuntu.com-20081117034335-el4e1m7v3tnjmnhu
parent: john at arbash-meinel.com-20081029175839-9tifdbpcurai4fuk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-11-17 22:40:17 +0000
message:
(jam) fix a docstring.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 3805.5.1
revision-id: john at arbash-meinel.com-20081029175839-9tifdbpcurai4fuk
parent: john at arbash-meinel.com-20081028221931-uk9oan2xkocd0gis
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: repo_format_1.9
timestamp: Wed 2008-10-29 12:58:39 -0500
message:
Fix a docstring.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 3834.1.4
revision-id: pqm at pqm.ubuntu.com-20081117034335-el4e1m7v3tnjmnhu
parent: pqm at pqm.ubuntu.com-20081114025846-mke6wrhcr7scvx1z
parent: aaron at aaronbentley.com-20081115203736-6ikutv274y59s0jo
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-11-17 03:43:35 +0000
message:
(abentley) Use a registry to allow plugins to specify diff writers.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
------------------------------------------------------------
revno: 0.16.108
revision-id: aaron at aaronbentley.com-20081115203736-6ikutv274y59s0jo
parent: aaron at aaronbentley.com-20081115195929-2w9zzm3f9vi39f2q
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: shelf-updates
timestamp: Sat 2008-11-15 15:37:36 -0500
message:
Shelf supports multiple diff writers.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
------------------------------------------------------------
revno: 0.16.107
revision-id: aaron at aaronbentley.com-20081115195929-2w9zzm3f9vi39f2q
parent: aaron at aaronbentley.com-20081115195443-enphc227pw2vumju
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: shelf-updates
timestamp: Sat 2008-11-15 14:59:29 -0500
message:
Remove vila's colordiff change
modified:
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
------------------------------------------------------------
revno: 0.16.106
revision-id: aaron at aaronbentley.com-20081115195443-enphc227pw2vumju
parent: aaron at aaronbentley.com-20081111023239-g55qvly8vjnv07yi
parent: pqm at pqm.ubuntu.com-20081114025846-mke6wrhcr7scvx1z
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: shelf-updates
timestamp: Sat 2008-11-15 14:54:43 -0500
message:
Merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branchbuilder.py branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
doc/en/user-guide/writing_a_plugin.txt writing_a_plugin.txt-20071114035000-q36a9h57ps06uvnl-7
------------------------------------------------------------
revno: 3834.1.3
revision-id: pqm at pqm.ubuntu.com-20081114025846-mke6wrhcr7scvx1z
parent: pqm at pqm.ubuntu.com-20081113144206-sc0ufw1l26942lyv
parent: mbp at sourcefrog.net-20081114021307-ti77y451qb1gtbi3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-11-14 02:58:46 +0000
message:
(mbp) Better message when the user needs to set their Launchpad ID.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
------------------------------------------------------------
revno: 3834.2.4
revision-id: mbp at sourcefrog.net-20081114021307-ti77y451qb1gtbi3
parent: mbp at sourcefrog.net-20081114014356-p9dqitads84gk1yz
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 289148-sshkey-message
timestamp: Fri 2008-11-14 12:13:07 +1000
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3834.2.3
revision-id: mbp at sourcefrog.net-20081114014356-p9dqitads84gk1yz
parent: mbp at sourcefrog.net-20081114003537-a26v2m6ispgxvizw
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 289148-sshkey-message
timestamp: Fri 2008-11-14 11:43:56 +1000
message:
Shorter message about launchpad-login
modified:
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
------------------------------------------------------------
revno: 3834.2.2
revision-id: mbp at sourcefrog.net-20081114003537-a26v2m6ispgxvizw
parent: mbp at sourcefrog.net-20081114000837-0mweacj6x77q0sxa
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 289148-sshkey-message
timestamp: Fri 2008-11-14 10:35:37 +1000
message:
Better message when launchpad-login is needed
modified:
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
------------------------------------------------------------
revno: 3834.2.1
revision-id: mbp at sourcefrog.net-20081114000837-0mweacj6x77q0sxa
parent: pqm at pqm.ubuntu.com-20081112073322-dpai0jsluo3cvpf2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 289148-sshkey-message
timestamp: Fri 2008-11-14 10:08:37 +1000
message:
Better message when you have no Launchpad SSH keys (#289148)
modified:
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
------------------------------------------------------------
revno: 3834.1.2
revision-id: pqm at pqm.ubuntu.com-20081113144206-sc0ufw1l26942lyv
parent: pqm at pqm.ubuntu.com-20081113075004-skgl7ma39awgyjze
parent: aaron at aaronbentley.com-20081111023239-g55qvly8vjnv07yi
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-11-13 14:42:06 +0000
message:
(abentley) Remove references to 'shelf' command in docs
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 0.16.105
revision-id: aaron at aaronbentley.com-20081111023239-g55qvly8vjnv07yi
parent: aaron at aaronbentley.com-20081104195911-oe0co22ksc2bio8p
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: shelf-updates
timestamp: Mon 2008-11-10 21:32:39 -0500
message:
Remove reference to 'shelf' command
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3834.1.1
revision-id: pqm at pqm.ubuntu.com-20081113075004-skgl7ma39awgyjze
parent: pqm at pqm.ubuntu.com-20081112073322-dpai0jsluo3cvpf2
parent: andrew.bennetts at canonical.com-20081113071138-bwcfcsmnx4po24va
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-11-13 07:50:04 +0000
message:
Document suppress_errors flag in abort_write_group docstring.
(trivial)
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3825.4.6
revision-id: andrew.bennetts at canonical.com-20081113071138-bwcfcsmnx4po24va
parent: andrew.bennetts at canonical.com-20081112052319-q1nu7d0zp6cqkyva
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: abort_write_group-error
timestamp: Thu 2008-11-13 17:11:38 +1000
message:
Document the suppress_errors flag in the docstring.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
-------------- next part --------------
Diff too large for email (1716 lines, the limit is 1000).
More information about the bazaar-commits
mailing list