Rev 3231: Merge in real stacked repository work. in http://people.ubuntu.com/~robertc/baz2.0/shallow-branch
Robert Collins
robertc at robertcollins.net
Fri Feb 22 01:53:25 GMT 2008
At http://people.ubuntu.com/~robertc/baz2.0/shallow-branch
------------------------------------------------------------
revno: 3231
revision-id:robertc at robertcollins.net-20080222015318-hea8aug1bqiowzk1
parent: robertc at robertcollins.net-20080215032610-5u2bbflfg1zi4dk0
parent: robertc at robertcollins.net-20080222011034-qsrzuxugew1k0eb9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: StackableBranch
timestamp: Fri 2008-02-22 12:53:18 +1100
message:
Merge in real stacked repository work.
added:
bzrlib/tests/repository_external_reference_implementations/ repository_external_-20080220025549-nnm2s80it1lvcwnc-1
bzrlib/tests/repository_external_reference_implementations/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/repository_external_reference_implementations/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
bzrlib/tests/repository_external_reference_implementations/test_add_revision.py test_add_revision.py-20080220034108-ao1u8qgakqbo5a08-1
bzrlib/tests/repository_external_reference_implementations/test_add_signature_text.py test_add_signature_t-20080220041905-1j2g4lyz3c6h34v4-1
bzrlib/tests/repository_external_reference_implementations/test_all_revision_ids.py test_all_revision_id-20080220041905-1j2g4lyz3c6h34v4-2
bzrlib/tests/repository_external_reference_implementations/test_break_lock.py test_break_lock.py-20080220042825-1f48qmpnuqqp5wg2-1
bzrlib/tests/repository_external_reference_implementations/test_check.py test_check.py-20080220044229-sxxe747gzi6q8fyv-1
bzrlib/tests/repository_implementations/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
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/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3224.1.7
revision-id:robertc at robertcollins.net-20080222011034-qsrzuxugew1k0eb9
parent: robertc at robertcollins.net-20080221230453-1l0e7r26sbmjkz11
parent: robertc at robertcollins.net-20080222002055-30veteyvioimdvfs
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Development1
timestamp: Fri 2008-02-22 12:10:34 +1100
message:
Implement basic repository supporting external references.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_external_reference_implementations/test_all_revision_ids.py test_all_revision_id-20080220041905-1j2g4lyz3c6h34v4-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3224.2.5
revision-id:robertc at robertcollins.net-20080222002055-30veteyvioimdvfs
parent: robertc at robertcollins.net-20080221230321-v8cm2p91zd3vbvyv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: external_reference_tests
timestamp: Fri 2008-02-22 11:20:55 +1100
message:
Update repository parameterisation tests to match refactoring.
modified:
bzrlib/tests/repository_external_reference_implementations/test_all_revision_ids.py test_all_revision_id-20080220041905-1j2g4lyz3c6h34v4-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3224.1.6
revision-id:robertc at robertcollins.net-20080221230453-1l0e7r26sbmjkz11
parent: robertc at robertcollins.net-20080220044647-5rws6n3tn2xfjfvr
parent: robertc at robertcollins.net-20080221230321-v8cm2p91zd3vbvyv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Development1
timestamp: Fri 2008-02-22 10:04:53 +1100
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/repository_external_reference_implementations/test_check.py test_check.py-20080220044229-sxxe747gzi6q8fyv-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3224.2.4
revision-id:robertc at robertcollins.net-20080221230321-v8cm2p91zd3vbvyv
parent: robertc at robertcollins.net-20080221053607-4jgwnpvx5s5hewhb
parent: robertc at robertcollins.net-20080221225343-lp5xf6hl5g91088a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: external_reference_tests
timestamp: Fri 2008-02-22 10:03:21 +1100
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3224.3.1
revision-id:robertc at robertcollins.net-20080221225343-lp5xf6hl5g91088a
parent: robertc at robertcollins.net-20080220002317-5bdinlaczri004x2
parent: pqm at pqm.ubuntu.com-20080220014008-9appc9kw4rjg8v1k
committer: Robert Collins <robertc at robertcollins.net>
branch nick: errors
timestamp: Fri 2008-02-22 09:53:43 +1100
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3221.2.7
revision-id:pqm at pqm.ubuntu.com-20080220014008-9appc9kw4rjg8v1k
parent: pqm at pqm.ubuntu.com-20080219222102-rqz9oxck1qbibvkm
parent: robertc at robertcollins.net-20080219041134-03amd7siou1c8ugw
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-02-20 01:40:08 +0000
message:
Add external references support attribute to repository formats.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-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/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3221.2.6
revision-id:pqm at pqm.ubuntu.com-20080219222102-rqz9oxck1qbibvkm
parent: pqm at pqm.ubuntu.com-20080219014045-w3igijttjdcpwshz
parent: bialix at ukr.net-20080219091728-qg1xo2i5r4r3u72w
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-02-19 22:21:02 +0000
message:
(bialix) Include quick-start-summary.svg file to python-based installer
for Windows (bug #192924)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3221.5.1
revision-id:bialix at ukr.net-20080219091728-qg1xo2i5r4r3u72w
parent: pqm at pqm.ubuntu.com-20080213062701-74mocrhfz0n4uj4r
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: bugfix.192924
timestamp: Tue 2008-02-19 11:17:28 +0200
message:
(bialix) Include quick-start-summary.svg file to python-based installer for Windows (bug #192924)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3224.2.3
revision-id:robertc at robertcollins.net-20080221053607-4jgwnpvx5s5hewhb
parent: robertc at robertcollins.net-20080220044500-vs5ywyhc85b2gavx
committer: Robert Collins <robertc at robertcollins.net>
branch nick: external_reference_tests
timestamp: Thu 2008-02-21 16:36:07 +1100
message:
external references test_check needs to look for the absence of the warning string.
modified:
bzrlib/tests/repository_external_reference_implementations/test_check.py test_check.py-20080220044229-sxxe747gzi6q8fyv-1
------------------------------------------------------------
revno: 3224.1.5
revision-id:robertc at robertcollins.net-20080220044647-5rws6n3tn2xfjfvr
parent: robertc at robertcollins.net-20080220004239-jieihiu0h1kno7fc
parent: robertc at robertcollins.net-20080220044500-vs5ywyhc85b2gavx
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Development1
timestamp: Wed 2008-02-20 15:46:47 +1100
message:
Merge in tests that demonstrate the failure to stack data correctly.
added:
bzrlib/tests/repository_external_reference_implementations/ repository_external_-20080220025549-nnm2s80it1lvcwnc-1
bzrlib/tests/repository_external_reference_implementations/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/repository_external_reference_implementations/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
bzrlib/tests/repository_external_reference_implementations/test_add_revision.py test_add_revision.py-20080220034108-ao1u8qgakqbo5a08-1
bzrlib/tests/repository_external_reference_implementations/test_add_signature_text.py test_add_signature_t-20080220041905-1j2g4lyz3c6h34v4-1
bzrlib/tests/repository_external_reference_implementations/test_all_revision_ids.py test_all_revision_id-20080220041905-1j2g4lyz3c6h34v4-2
bzrlib/tests/repository_external_reference_implementations/test_break_lock.py test_break_lock.py-20080220042825-1f48qmpnuqqp5wg2-1
bzrlib/tests/repository_external_reference_implementations/test_check.py test_check.py-20080220044229-sxxe747gzi6q8fyv-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
------------------------------------------------------------
revno: 3224.2.2
revision-id:robertc at robertcollins.net-20080220044500-vs5ywyhc85b2gavx
parent: robertc at robertcollins.net-20080220030028-c3r2ue2nd4h3a1th
committer: Robert Collins <robertc at robertcollins.net>
branch nick: external_reference_tests
timestamp: Wed 2008-02-20 15:45:00 +1100
message:
More external reference tests.
added:
bzrlib/tests/repository_external_reference_implementations/test_add_revision.py test_add_revision.py-20080220034108-ao1u8qgakqbo5a08-1
bzrlib/tests/repository_external_reference_implementations/test_add_signature_text.py test_add_signature_t-20080220041905-1j2g4lyz3c6h34v4-1
bzrlib/tests/repository_external_reference_implementations/test_all_revision_ids.py test_all_revision_id-20080220041905-1j2g4lyz3c6h34v4-2
bzrlib/tests/repository_external_reference_implementations/test_break_lock.py test_break_lock.py-20080220042825-1f48qmpnuqqp5wg2-1
bzrlib/tests/repository_external_reference_implementations/test_check.py test_check.py-20080220044229-sxxe747gzi6q8fyv-1
modified:
bzrlib/tests/repository_external_reference_implementations/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
------------------------------------------------------------
revno: 3224.2.1
revision-id:robertc at robertcollins.net-20080220030028-c3r2ue2nd4h3a1th
parent: robertc at robertcollins.net-20080220002317-5bdinlaczri004x2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: external_reference_tests
timestamp: Wed 2008-02-20 14:00:28 +1100
message:
Add add_inventory external reference interface tests and tweak broken test support function adapt_tests.
added:
bzrlib/tests/repository_external_reference_implementations/ repository_external_-20080220025549-nnm2s80it1lvcwnc-1
bzrlib/tests/repository_external_reference_implementations/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/repository_external_reference_implementations/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
------------------------------------------------------------
revno: 3224.1.4
revision-id:robertc at robertcollins.net-20080220004239-jieihiu0h1kno7fc
parent: robertc at robertcollins.net-20080220002317-5bdinlaczri004x2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Development1
timestamp: Wed 2008-02-20 11:42:39 +1100
message:
Backport development1 format (stackable packs) to before-shallow-branches.
added:
bzrlib/tests/repository_implementations/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
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/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 3224.1.3
revision-id:robertc at robertcollins.net-20080220002317-5bdinlaczri004x2
parent: robertc at robertcollins.net-20080219041134-03amd7siou1c8ugw
committer: Robert Collins <robertc at robertcollins.net>
branch nick: errors
timestamp: Wed 2008-02-20 11:23:17 +1100
message:
Port across errors for shallow branch support.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
------------------------------------------------------------
revno: 3224.1.2
revision-id:robertc at robertcollins.net-20080219041134-03amd7siou1c8ugw
parent: robertc at robertcollins.net-20080219035832-lyyksopcl80ncwes
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository-stackable-flag
timestamp: Tue 2008-02-19 15:11:34 +1100
message:
Relocate NEWS entries to 1.3.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3224.1.1
revision-id:robertc at robertcollins.net-20080219035832-lyyksopcl80ncwes
parent: robertc at robertcollins.net-20080212051725-m8fjb5ouzl1pkso0
parent: pqm at pqm.ubuntu.com-20080219014045-w3igijttjdcpwshz
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository-stackable-flag
timestamp: Tue 2008-02-19 14:58:32 +1100
message:
Integrate bzr.dev.
added:
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3221.2.5
revision-id:pqm at pqm.ubuntu.com-20080219014045-w3igijttjdcpwshz
parent: pqm at pqm.ubuntu.com-20080218234410-0w6zg2617n24of1m
parent: robertc at robertcollins.net-20080213221140-0h6pxt7zdm7af20d
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-02-19 01:40:45 +0000
message:
(robertc) Add development formats and methodology. (Robert Collins)
added:
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 3221.2.4
revision-id:pqm at pqm.ubuntu.com-20080218234410-0w6zg2617n24of1m
parent: pqm at pqm.ubuntu.com-20080213062701-74mocrhfz0n4uj4r
parent: john at arbash-meinel.com-20080218211742-fdd2sw2nvubl9cg8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-02-18 23:44:10 +0000
message:
(jam) Ignore .dll for building on cygwin
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
------------------------------------------------------------
revno: 3221.4.1
revision-id:john at arbash-meinel.com-20080218211742-fdd2sw2nvubl9cg8
parent: pqm at pqm.ubuntu.com-20080213062701-74mocrhfz0n4uj4r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Mon 2008-02-18 15:17:42 -0600
message:
ignore .dll for cygwin
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Diff too large for email (1507 lines, the limit is 1000).
More information about the bazaar-commits
mailing list