Rev 1466: Merge in InterRepository api to have it available. in /home/robertc/source/baz/versioned-file-new-repo-format/

Robert Collins robertc at robertcollins.net
Tue Feb 21 01:51:31 GMT 2006


------------------------------------------------------------
revno: 1466
revision-id: robertc at robertcollins.net-20060221015126-bde20d0239fd8c47
parent: robertc at robertcollins.net-20060221004343-ccf22f64d96aa17d
parent: robertc at robertcollins.net-20060221014955-c8bdf2cae88c5e34
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-new-repo-format
timestamp: Tue 2006-02-21 12:51:26 +1100
message:
  Merge in InterRepository api to have it available.
added:
  bzrlib/tests/interrepository_implementations/ interrepository_implementations-20060220054716-8b62476625d70af3
  bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
  bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
  bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
  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_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
  bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
  bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060221014955-c8bdf2cae88c5e34
    parent: robertc at robertcollins.net-20060221000809-e41f2f69a365093f
    parent: robertc at robertcollins.net-20060221004343-ccf22f64d96aa17d
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: inter-repo-api
    timestamp: Tue 2006-02-21 12:49:55 +1100
    message:
      Merge from bzr.dev.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060221000809-e41f2f69a365093f
    parent: robertc at robertcollins.net-20060220230332-29bbe74a3d04c302
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: inter-repo-api
    timestamp: Tue 2006-02-21 11:08:09 +1100
    message:
      Update NEWS.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060220230332-29bbe74a3d04c302
    parent: robertc at robertcollins.net-20060220115204-1777ed5964b0cf8d
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: inter-repo-api
    timestamp: Tue 2006-02-21 10:03:32 +1100
    message:
      Move missing_revision_ids from Repository to InterRepository, and eliminate the now unused Repository._compatible_formats method.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060220115204-1777ed5964b0cf8d
    parent: robertc at robertcollins.net-20060220102233-70839cc4cdbc2011
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: inter-repo-api
    timestamp: Mon 2006-02-20 22:52:04 +1100
    message:
      Move copy_content_into into InterRepository and InterWeaveRepo, and disable the default codepath test as we have optimised paths for all current combinations.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060220102233-70839cc4cdbc2011
    parent: robertc at robertcollins.net-20060220095027-c52f5024a6f5fcdb
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: inter-repo-api
    timestamp: Mon 2006-02-20 21:22:33 +1100
    message:
      Deprecate direct use of fetch.Fetcher.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060220095027-c52f5024a6f5fcdb
    parent: robertc at robertcollins.net-20060220070554-b738a65e99cd2e9c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: inter-repo-api
    timestamp: Mon 2006-02-20 20:50:27 +1100
    message:
      Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060220070554-b738a65e99cd2e9c
    parent: robertc at robertcollins.net-20060220070110-a49ef22c8ad18929
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: inter-repo-api
    timestamp: Mon 2006-02-20 18:05:54 +1100
    message:
      Test that we get the right optimiser back in the InterRepository tests.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060220070110-a49ef22c8ad18929
    parent: robertc at robertcollins.net-20060220052207-3e772753f9599e98
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: inter-repo-api
    timestamp: Mon 2006-02-20 18:01:10 +1100
    message:
      Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060220052207-3e772753f9599e98
    parent: robertc at robertcollins.net-20060220042908-a76ec132a7286899
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: inter-repo-api
    timestamp: Mon 2006-02-20 16:22:07 +1100
    message:
      Allow for optimised InterRepository selection.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060220042908-a76ec132a7286899
    parent: robertc at robertcollins.net-20060220010359-5475bce47a5ebcd4
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: inter-repo-api
    timestamp: Mon 2006-02-20 15:29:08 +1100
    message:
      Start InterRepository with InterRepository.get.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060220010359-5475bce47a5ebcd4
    parent: robertc at robertcollins.net-20060219234731-4f361d82e113cbb0
    parent: robertc at robertcollins.net-20060220002935-c653f31ef30cadff
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: inter-repo-api
    timestamp: Mon 2006-02-20 12:03:59 +1100
    message:
      Merge repository tweaks.



More information about the bazaar-commits mailing list