Rev 2545: Merge more of bzr.dev. in sftp://rookery/~/public_html/baz2.0/roadmap

Robert Collins robertc at robertcollins.net
Thu Jun 28 03:51:27 BST 2007


At sftp://rookery/~/public_html/baz2.0/roadmap

------------------------------------------------------------
revno: 2545
revision-id: robertc at robertcollins.net-20070628025122-yvcg4br3d7o20kyx
parent: robertc at robertcollins.net-20070628024812-w7idw3rg3hahe9e8
parent: pqm at pqm.ubuntu.com-20070627080723-ci6ghe3bsm0snyit
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-28 12:51:22 +1000
message:
  Merge more of bzr.dev.
added:
  bzrlib/api.py                  api.py-20070626082640-35lspz7j0ys7a8ld-1
  doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
  bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
  bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
  bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
  bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
  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_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
  bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
  bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
  bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
  bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
  bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
  bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
  bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
  bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
  bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
  bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
  bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
  bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
  bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
  bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
  bzrlib/tests/blackbox/test_revision_history.py test_revision_history.py-20060530150249-i2szwjr5uioe9ujb-1
  bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
  bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
  bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
  bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
  bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
  bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
  bzrlib/tests/test_api.py       testapi.py-20051027033546-6f9be2d308d18a52
  bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
  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_options.py   testoptions.py-20051014093702-96457cfc86319a8f
  bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
  bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
  bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
  bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
  doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
    ------------------------------------------------------------
    revno: 2541.1.16
    revision-id: pqm at pqm.ubuntu.com-20070627080723-ci6ghe3bsm0snyit
    parent: pqm at pqm.ubuntu.com-20070627051257-kgk2thfvi2k3k37o
    parent: mbp at sourcefrog.net-20070627073753-rrxu5bbux3vi5yda
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-06-27 09:07:23 +0100
    message:
      Give a cleaner error when failing to decode knit index entry.
        ------------------------------------------------------------
        revno: 2541.1.14.2.1
        revision-id: mbp at sourcefrog.net-20070627073753-rrxu5bbux3vi5yda
        parent: pqm at pqm.ubuntu.com-20070627023032-h316n5k05g1nqqem
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: knit-index-reader
        timestamp: Wed 2007-06-27 17:37:53 +1000
        message:
          Give a cleaner error when failing to decode knit index entry.
    ------------------------------------------------------------
    revno: 2541.1.15
    revision-id: pqm at pqm.ubuntu.com-20070627051257-kgk2thfvi2k3k37o
    parent: pqm at pqm.ubuntu.com-20070627023032-h316n5k05g1nqqem
    parent: mbp at sourcefrog.net-20070627043304-wn1incchxkxa0h2l
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-06-27 06:12:57 +0100
    message:
      Remove use of 'assert False' to raise an exception unconditionally
        ------------------------------------------------------------
        revno: 2541.1.14.1.1
        revision-id: mbp at sourcefrog.net-20070627043304-wn1incchxkxa0h2l
        parent: pqm at pqm.ubuntu.com-20070627023032-h316n5k05g1nqqem
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: trivial
        timestamp: Wed 2007-06-27 14:33:04 +1000
        message:
          Remove use of 'assert False' to raise an exception unconditionally
    ------------------------------------------------------------
    revno: 2541.1.14
    revision-id: pqm at pqm.ubuntu.com-20070627023032-h316n5k05g1nqqem
    parent: pqm at pqm.ubuntu.com-20070626234309-j6n7rdpbmjjfgicn
    parent: mbp at sourcefrog.net-20070627014303-z4ichnqm91hhm4ww
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-06-27 03:30:32 +0100
    message:
      Cleanup blackbox tests
        ------------------------------------------------------------
        revno: 2530.3.7
        revision-id: mbp at sourcefrog.net-20070627014303-z4ichnqm91hhm4ww
        parent: mbp at sourcefrog.net-20070626101529-omfq0howuazwtr3s
        parent: pqm at pqm.ubuntu.com-20070626234309-j6n7rdpbmjjfgicn
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: cleanup-runbzr
        timestamp: Wed 2007-06-27 11:43:03 +1000
        message:
          merge trunk
        ------------------------------------------------------------
        revno: 2530.3.6
        revision-id: mbp at sourcefrog.net-20070626101529-omfq0howuazwtr3s
        parent: mbp at sourcefrog.net-20070626101427-b8x0vsdg7b1e6f4x
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: cleanup-runbzr
        timestamp: Tue 2007-06-26 20:15:29 +1000
        message:
          Remove BzrTestBase alias (little used)
        ------------------------------------------------------------
        revno: 2530.3.5
        revision-id: mbp at sourcefrog.net-20070626101427-b8x0vsdg7b1e6f4x
        parent: mbp at sourcefrog.net-20070626101233-hrmvl09320gt6b8m
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: cleanup-runbzr
        timestamp: Tue 2007-06-26 20:14:27 +1000
        message:
          NEWS on run_bzr changes
        ------------------------------------------------------------
        revno: 2530.3.4
        revision-id: mbp at sourcefrog.net-20070626101233-hrmvl09320gt6b8m
        parent: mbp at sourcefrog.net-20070626093507-6g30srio9kuy2j0e
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: cleanup-runbzr
        timestamp: Tue 2007-06-26 20:12:33 +1000
        message:
          Deprecate run_bzr_captured in favour of just  run_bzr
        ------------------------------------------------------------
        revno: 2530.3.3
        revision-id: mbp at sourcefrog.net-20070626093507-6g30srio9kuy2j0e
        parent: mbp at sourcefrog.net-20070626084623-5l1ej6s026urooi1
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: cleanup-runbzr
        timestamp: Tue 2007-06-26 19:35:07 +1000
        message:
          Clean up some callers that use varargs syntax for run_bzr, but don't 
          deprecate it yet because it's too widely used.
          
          Separate out _run_bzr_core from _run_bzr_autosplit.
          
          Remove long-deprecated TestCase.merge helper.
        ------------------------------------------------------------
        revno: 2530.3.2
        revision-id: mbp at sourcefrog.net-20070626084623-5l1ej6s026urooi1
        parent: mbp at sourcefrog.net-20070626080236-14ihgomtffc9tezj
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: cleanup-runbzr
        timestamp: Tue 2007-06-26 18:46:23 +1000
        message:
          Refactoring run_bzr code into more of a common base.
        ------------------------------------------------------------
        revno: 2530.3.1
        revision-id: mbp at sourcefrog.net-20070626080236-14ihgomtffc9tezj
        parent: pqm at pqm.ubuntu.com-20070615082222-98j9j9nbl6p2dx0m
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: cleanup-runbzr
        timestamp: Tue 2007-06-26 18:02:36 +1000
        message:
          Cleanup old variations on run_bzr in the test suite
    ------------------------------------------------------------
    revno: 2541.1.13
    revision-id: pqm at pqm.ubuntu.com-20070626234309-j6n7rdpbmjjfgicn
    parent: pqm at pqm.ubuntu.com-20070626191000-flte155pupv54bcs
    parent: robertc at robertcollins.net-20070626224643-50a7lzwugne0d8o0
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-06-27 00:43:09 +0100
    message:
      (robertc) Export explicit API compatibility for bzrlib.
    ------------------------------------------------------------
    revno: 2541.1.9.2.5
    revision-id: robertc at robertcollins.net-20070626224643-50a7lzwugne0d8o0
    parent: robertc at robertcollins.net-20070626085341-pb8fsoij016itqgf
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: api_api
    timestamp: Wed 2007-06-27 08:46:43 +1000
    message:
      NEWS entry was incorrectly capitalised.
    ------------------------------------------------------------
    revno: 2541.1.9.2.4
    revision-id: robertc at robertcollins.net-20070626085341-pb8fsoij016itqgf
    parent: robertc at robertcollins.net-20070626085220-iovhwfjflk8vffbh
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: api_api
    timestamp: Tue 2007-06-26 18:53:41 +1000
    message:
      NEWS.
    ------------------------------------------------------------
    revno: 2541.1.9.2.3
    revision-id: robertc at robertcollins.net-20070626085220-iovhwfjflk8vffbh
    parent: robertc at robertcollins.net-20070626082724-q95taws12ajox2io
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: api_api
    timestamp: Tue 2007-06-26 18:52:20 +1000
    message:
      Add require_api API.
    ------------------------------------------------------------
    revno: 2541.1.9.2.2
    revision-id: robertc at robertcollins.net-20070626082724-q95taws12ajox2io
    parent: robertc at robertcollins.net-20070626065720-w0btzadye6lpq104
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: api_api
    timestamp: Tue 2007-06-26 18:27:24 +1000
    message:
      Add helpers to get api versions from objects.
    ------------------------------------------------------------
    revno: 2541.1.9.2.1
    revision-id: robertc at robertcollins.net-20070626065720-w0btzadye6lpq104
    parent: pqm at pqm.ubuntu.com-20070625174647-pocypsjmp861qgv7
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: api_api
    timestamp: Tue 2007-06-26 16:57:20 +1000
    message:
      API Versioning proposal document.

Diff too large for email (4126 lines, the limit is 1000).



More information about the bazaar-commits mailing list