Rev 1459: Merge integration. in /home/robertc/source/baz/test-pb/

Robert Collins robertc at robertcollins.net
Tue Feb 14 07:34:19 GMT 2006


------------------------------------------------------------
revno: 1459
revision-id: robertc at robertcollins.net-20060214073400-7af074e41329e377
parent: robertc at robertcollins.net-20060214051545-7567c24a4a29862e
parent: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-pb
timestamp: Tue 2006-02-14 18:34:00 +1100
message:
  Merge integration.
added:
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/doc/api/branch.txt      branch.txt-20060130010728-d96c35d50b205aed
  bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
  bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
  bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
  bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
  bzrlib/tests/bzrdir_implementations/ bzrdir_implementations-20060131065642-5f93a74343e7c596
  bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
  bzrlib/tests/repository_implementations/ repository_implementations-20060131092037-ec97814745cc6128
  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_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
  bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
  bzrlib/tests/workingtree_implementations/ workingtree_implementations-20060203003124-eada934f41adc89b
  bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
  bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
renamed:
  bzrlib/tests/test_fileid_involved.py => bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
  bzrlib/tests/test_parent.py => bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
modified:
  BRANCH.TODO                    BRANCH.TODO-20060103052123-79ac4969351c03a9
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/add.py                  add.py-20050323030017-3a77d63feda58e33
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/decorators.py           decorators.py-20060112082512-6bfc2d882df1698d
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/hashcache.py            hashcache.py-20050706091756-fe3a8cc1143ff24f
  bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/store/weave.py          weavestore.py-20050907094258-88262e0434babab9
  bzrlib/tests/HTTPTestUtil.py   HTTPTestUtil.py-20050914180604-247d3aafb7a43343
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
  bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
  bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
  bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
  bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
  bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
  bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
  bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
  bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
  bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
  bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
  bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
  bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
  bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
  bzrlib/tests/test_source.py    test_source.py-20051207061333-a58dea6abecc030d
  bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
  bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
  bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
  bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
  bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
    parent: robertc at robertcollins.net-20060214064406-f4e4db1399d7069d
    parent: robertc at robertcollins.net-20060213220923-96b1df85739f0d8c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2006-02-14 17:52:21 +1100
    message:
       * Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
         behaviour. They use the existing serverless-mode and store no data
         locally. As such they are not suitable for use except in high bandwidth
         low latency environments like LAN's or local disk. (Robert Collins)
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060213220923-96b1df85739f0d8c
    parent: robertc at robertcollins.net-20060213215205-cb3bacc87092a639
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Tue 2006-02-14 09:09:23 +1100
    message:
      Forgot to update the last warn() to reference WorkingTree.open().
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060213215205-cb3bacc87092a639
    parent: robertc at robertcollins.net-20060212125715-75abf487b5ee1f5a
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Tue 2006-02-14 08:52:05 +1100
    message:
      Update per review comments.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060212125715-75abf487b5ee1f5a
    parent: robertc at robertcollins.net-20060212102856-bdc8733fbacfa73c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Sun 2006-02-12 23:57:15 +1100
    message:
      Add update command for use with checkouts.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060212102856-bdc8733fbacfa73c
    parent: robertc at robertcollins.net-20060212101913-bc160919173fc028
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Sun 2006-02-12 21:28:56 +1100
    message:
      Test that the working tree last revision is indeed set during commit.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060212101913-bc160919173fc028
    parent: robertc at robertcollins.net-20060212094015-0fba37745716a3d9
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Sun 2006-02-12 21:19:13 +1100
    message:
      implement out of date working tree checks in commit.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060212094015-0fba37745716a3d9
    parent: robertc at robertcollins.net-20060211231807-30cf1893956ebb07
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Sun 2006-02-12 20:40:15 +1100
    message:
      Implement -r limit for checkout command.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060211231807-30cf1893956ebb07
    parent: robertc at robertcollins.net-20060211115806-732dabc1e35714ed
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Sun 2006-02-12 10:18:07 +1100
    message:
      Create a checkout command.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060211115806-732dabc1e35714ed
    parent: robertc at robertcollins.net-20060210125935-fd07ea9a67b299d9
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Sat 2006-02-11 22:58:06 +1100
    message:
      Give format3 working trees their own last-revision marker.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060210125935-fd07ea9a67b299d9
    parent: robertc at robertcollins.net-20060110105314-c7cb6a57c52477bd
    parent: robertc at robertcollins.net-20060210123118-b4edbe22441ec029
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Fri 2006-02-10 23:59:35 +1100
    message:
      Merge in bzrdir work to enable checkout improvements.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060210123118-b4edbe22441ec029
    parent: robertc at robertcollins.net-20060210110338-60cc15f6fadf02c1
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: repository
    timestamp: Fri 2006-02-10 23:31:18 +1100
    message:
      Test the disk layout of format3 working trees.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060210110338-60cc15f6fadf02c1
    parent: robertc at robertcollins.net-20060208061510-87fac5de56491872
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: repository
    timestamp: Fri 2006-02-10 22:03:38 +1100
    message:
      Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060208061510-87fac5de56491872
    parent: robertc at robertcollins.net-20060208052453-cdbadf93fb7822ee
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: repository
    timestamp: Wed 2006-02-08 17:15:10 +1100
    message:
      Provide a revision.get_history(repository) method for generating a synthetic revision history.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060208052453-cdbadf93fb7822ee
    parent: robertc at robertcollins.net-20060206034527-030f392f27eb1bc6
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: repository
    timestamp: Wed 2006-02-08 16:24:53 +1100
    message:
      Make needs_read_lock and needs_write_lock more visible in tracebacks
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060206034527-030f392f27eb1bc6
    parent: robertc at robertcollins.net-20060203021848-4159dfb7a3778151
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: repository
    timestamp: Mon 2006-02-06 14:45:27 +1100
    message:
      Split out repository into .bzr/repository
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060203021848-4159dfb7a3778151
    parent: robertc at robertcollins.net-20060202114532-6f7ff10cbd86448c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: repository
    timestamp: Fri 2006-02-03 13:18:48 +1100
    message:
      Nearly complete .bzr/checkout splitout.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060202114532-6f7ff10cbd86448c
    parent: robertc at robertcollins.net-20060202085718-d8e121b420d4c76e
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: repository
    timestamp: Thu 2006-02-02 22:45:32 +1100
    message:
      Start WorkingTree -> .bzr/checkout transition
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060202085718-d8e121b420d4c76e
    parent: robertc at robertcollins.net-20060202001402-7d7900a210fccdac
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: repository
    timestamp: Thu 2006-02-02 19:57:18 +1100
    message:
      Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060202001402-7d7900a210fccdac
    parent: robertc at robertcollins.net-20060201232934-8c2e49d220f5a52f
    parent: robertc at robertcollins.net-20060201211329-b3faf2a411316ff7
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Thu 2006-02-02 11:14:02 +1100
    message:
      Merge from integration
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060201232934-8c2e49d220f5a52f
    parent: robertc at robertcollins.net-20060201115027-62c24211ee63b688
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Thu 2006-02-02 10:29:34 +1100
    message:
      add working tree to the BzrDir facilities.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060201115027-62c24211ee63b688
    parent: robertc at robertcollins.net-20060131115127-5d5aa204da2b31a2
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Wed 2006-02-01 22:50:27 +1100
    message:
      Branch now uses BzrDir reasonably sanely.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060131115127-5d5aa204da2b31a2
    parent: robertc at robertcollins.net-20060131070809-39bb6d774cb93abc
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Tue 2006-01-31 22:51:27 +1100
    message:
      Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060131070809-39bb6d774cb93abc
    parent: robertc at robertcollins.net-20060130025636-0b9dc25ca69e501a
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Tue 2006-01-31 18:08:09 +1100
    message:
      Basic BzrDir support.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060130025636-0b9dc25ca69e501a
    parent: robertc at robertcollins.net-20060130010545-17e73c5d58baccda
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: branch-formats
    timestamp: Mon 2006-01-30 13:56:36 +1100
    message:
      Start a branch api document.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060130010545-17e73c5d58baccda
    parent: robertc at robertcollins.net-20060127080959-8cf1dbe5e2a254e5
    parent: robertc at robertcollins.net-20060129221024-3fb7b838e5cd3e02
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: branch-formats
    timestamp: Mon 2006-01-30 12:05:45 +1100
    message:
      Merge from integration.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060127080959-8cf1dbe5e2a254e5
    parent: robertc at robertcollins.net-20060127052812-bb60c863088c4141
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: branch-formats
    timestamp: Fri 2006-01-27 19:09:59 +1100
    message:
      Finish deprecating Branch.working_tree()
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060127052812-bb60c863088c4141
    parent: robertc at robertcollins.net-20060126231725-be1d4faaac4298db
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: branch-formats
    timestamp: Fri 2006-01-27 16:28:12 +1100
    message:
      Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060126231725-be1d4faaac4298db
    parent: robertc at robertcollins.net-20060126224318-282ad27f4c81da2a
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: branch-formats
    timestamp: Fri 2006-01-27 10:17:25 +1100
    message:
      Fix remaining uses of deprecated apis within bzrlib.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060126224318-282ad27f4c81da2a
    parent: robertc at robertcollins.net-20060126223910-4500ee14cdc22d64
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: branch-formats
    timestamp: Fri 2006-01-27 09:43:18 +1100
    message:
      remove done TODO.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060110105314-c7cb6a57c52477bd
    parent: robertc at robertcollins.net-20060110094553-4be9f3f7c641d03b
    parent: robertc at robertcollins.net-20060110062704-bf190acccbdc2457
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Tue 2006-01-10 21:53:14 +1100
    message:
      Merge from test-providers.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060110094553-4be9f3f7c641d03b
    parent: robertc at robertcollins.net-20051123071842-ac5f13e1eb9d905b
    parent: robertc at robertcollins.net-20060109051935-ee3847274413fe22
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Tue 2006-01-10 20:45:53 +1100
    message:
      Merge from integration.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060214064406-f4e4db1399d7069d
    parent: robertc at robertcollins.net-20060213231929-686f2e0d9859cd83
    parent: robertc at robertcollins.net-20060213235519-8d0ee14d761be81b
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2006-02-14 17:44:06 +1100
    message:
      Merge in bzr-dir phase 2.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060213235519-8d0ee14d761be81b
    parent: robertc at robertcollins.net-20060212205854-5bd98a23ff8314f4
    parent: robertc at robertcollins.net-20060213231929-686f2e0d9859cd83
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Tue 2006-02-14 10:55:19 +1100
    message:
      Merge from integration.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060212205854-5bd98a23ff8314f4
    parent: robertc at robertcollins.net-20060210125339-a4c03f338943ed71
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Mon 2006-02-13 07:58:54 +1100
    message:
      Review feedback from John Meinel.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060210125339-a4c03f338943ed71
    parent: robertc at robertcollins.net-20060210123118-b4edbe22441ec029
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: repository
    timestamp: Fri 2006-02-10 23:53:39 +1100
    message:
      update BRANCH.TODO



More information about the bazaar-commits mailing list