Rev 3963: Merge bzr.dev 3960, resolve NEWS in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

John Arbash Meinel john at arbash-meinel.com
Tue Jan 27 16:17:52 GMT 2009


At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 3963
revision-id: john at arbash-meinel.com-20090127161617-paqmej2501xnuktf
parent: jml at canonical.com-20090123224833-cqsppcpqokk84wu3
parent: pqm at pqm.ubuntu.com-20090126181248-yl5ctbxc3y6nu9m4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2009-01-27 10:16:17 -0600
message:
  Merge bzr.dev 3960, resolve NEWS
added:
  bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
  bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
  bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
  bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
  bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
  bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
  bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
  bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
  bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
  doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
  doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
    ------------------------------------------------------------
    revno: 3955.1.5
    revision-id: pqm at pqm.ubuntu.com-20090126181248-yl5ctbxc3y6nu9m4
    parent: pqm at pqm.ubuntu.com-20090126115928-bzzqlmw316iv8o3k
    parent: mbp at sourcefrog.net-20090126170421-dypt01en9zx8y16o
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2009-01-26 18:12:48 +0000
    message:
      (mbp) Merge back 1.11final
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3955.4.1
        revision-id: mbp at sourcefrog.net-20090126170421-dypt01en9zx8y16o
        parent: pqm at pqm.ubuntu.com-20090123181416-tku4gdtorboy6d0y
        parent: mbp at sourcefrog.net-20090119113338-81srt3d42gpqyhqb
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: integration
        timestamp: Mon 2009-01-26 15:04:21 -0200
        message:
          Merge back 1.11final
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3932.2.7
        revision-id: mbp at sourcefrog.net-20090119113338-81srt3d42gpqyhqb
        parent: mbp at sourcefrog.net-20090115074041-a4im46in3f8cb1vd
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: prepare-1.11
        timestamp: Mon 2009-01-19 22:33:38 +1100
        message:
          Prepare 1.11final
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
        ------------------------------------------------------------
        revno: 3932.2.6
        revision-id: mbp at sourcefrog.net-20090115074041-a4im46in3f8cb1vd
        parent: mbp at sourcefrog.net-20090115073758-1wmwy7kvgh7hxnh4
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: prepare-1.11
        timestamp: Thu 2009-01-15 18:40:41 +1100
        message:
          Update news
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3932.2.5
        revision-id: mbp at sourcefrog.net-20090115073758-1wmwy7kvgh7hxnh4
        parent: pqm at pqm.ubuntu.com-20090114230346-i9lm6l9v3gz8zzeu
        parent: pqm at pqm.ubuntu.com-20090110235923-dibvaa8suy8gk1ef
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: prepare-1.11
        timestamp: Thu 2009-01-15 18:37:58 +1100
        message:
          Fix failing test when CompiledChunksToLines is not available.
        modified:
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
        ------------------------------------------------------------
        revno: 3932.2.4
        revision-id: pqm at pqm.ubuntu.com-20090114230346-i9lm6l9v3gz8zzeu
        parent: pqm at pqm.ubuntu.com-20090109083113-p1thptdqdbf68wix
        parent: john at arbash-meinel.com-20090114193109-sramygcktbcz589f
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: 1.11
        timestamp: Wed 2009-01-14 23:03:46 +0000
        message:
          (jam) Update stacking code so stacked branches don't open multiple
          	connections.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
          bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
        ------------------------------------------------------------
        revno: 3928.3.5
        revision-id: john at arbash-meinel.com-20090114193109-sramygcktbcz589f
        parent: john at arbash-meinel.com-20090109031355-rg3grll5bbshstf2
        parent: pqm at pqm.ubuntu.com-20090109083113-p1thptdqdbf68wix
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: stacking_tweaks
        timestamp: Wed 2009-01-14 13:31:09 -0600
        message:
          Merge in bzr.1.11, resolve NEWS
        added:
          bzrlib/tests/blackbox/test_filesystem_cicp.py test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
          bzrlib/tests/https_server.py   https_server.py-20071121173708-aj8zczi0ziwbwz21-1
          bzrlib/tests/ssl_certs/        ssl_certs-20071124141654-dc9za9nho2gmzbri-1
          bzrlib/tests/ssl_certs/__init__.py __init__.py-20071124141703-j5hr254lm287lyut-8
          bzrlib/tests/ssl_certs/ca.crt  ca.crt-20071124141703-j5hr254lm287lyut-7
          bzrlib/tests/ssl_certs/ca.key  ca.key-20071124141703-j5hr254lm287lyut-6
          bzrlib/tests/ssl_certs/create_ssls.py create_ssls.py-20071124141703-j5hr254lm287lyut-5
          bzrlib/tests/ssl_certs/server.crt server.crt-20071124141703-j5hr254lm287lyut-4
          bzrlib/tests/ssl_certs/server.csr server.csr-20071124141703-j5hr254lm287lyut-3
          bzrlib/tests/ssl_certs/server_with_pass.key server_with_pass.key-20071124141703-j5hr254lm287lyut-2
          bzrlib/tests/ssl_certs/server_without_pass.key server_without_pass.-20071124141703-j5hr254lm287lyut-1
          doc/developers/case-insensitive-file-systems.txt caseinsensitivefiles-20081117224243-p84xpmqnsa1p8k91-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
          bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/ca_bundle.py ca_bundle.py-20070226091335-84kb1xg1r2jjf858-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
    ------------------------------------------------------------
    revno: 3955.1.4
    revision-id: pqm at pqm.ubuntu.com-20090126115928-bzzqlmw316iv8o3k
    parent: pqm at pqm.ubuntu.com-20090124185051-8oryvqq68n6repso
    parent: mbp at sourcefrog.net-20090124151523-fb5fbarjmbqcygd7
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2009-01-26 11:59:28 +0000
    message:
      (mbp) improved plugin developer documentation
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
      doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3939.1.9
        revision-id: mbp at sourcefrog.net-20090124151523-fb5fbarjmbqcygd7
        parent: mbp at sourcefrog.net-20090123223931-kb1la553lxibnbpd
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Sat 2009-01-24 13:15:23 -0200
        message:
          News entry about plugin docs
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3939.1.8
        revision-id: mbp at sourcefrog.net-20090123223931-kb1la553lxibnbpd
        parent: mbp at sourcefrog.net-20090123200435-umq1l6xoepcvgw0c
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Fri 2009-01-23 20:39:31 -0200
        message:
          Rephrase api docs
        modified:
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3939.1.7
        revision-id: mbp at sourcefrog.net-20090123200435-umq1l6xoepcvgw0c
        parent: mbp at sourcefrog.net-20090123185245-mjqgjwrw4py3a3kb
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Fri 2009-01-23 18:04:35 -0200
        message:
          Suggest looking at __name__ in plugins
        modified:
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3939.1.6
        revision-id: mbp at sourcefrog.net-20090123185245-mjqgjwrw4py3a3kb
        parent: mbp at sourcefrog.net-20090123184533-8p7762lg1jh5cwli
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Fri 2009-01-23 16:52:45 -0200
        message:
          Correction to how plugins advertise their version
        modified:
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3939.1.5
        revision-id: mbp at sourcefrog.net-20090123184533-8p7762lg1jh5cwli
        parent: mbp at sourcefrog.net-20090123184410-8no3skbgeghur5jh
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Fri 2009-01-23 16:45:33 -0200
        message:
          Suggestions how to publish plugins
        modified:
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3939.1.4
        revision-id: mbp at sourcefrog.net-20090123184410-8no3skbgeghur5jh
        parent: mbp at sourcefrog.net-20090123181344-z40j1j2zjwn4vswy
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Fri 2009-01-23 16:44:10 -0200
        message:
          More documentation and links about writing plugins
        modified:
          doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3939.1.3
        revision-id: mbp at sourcefrog.net-20090123181344-z40j1j2zjwn4vswy
        parent: mbp at sourcefrog.net-20090123175030-etahwt2dg0lqdcel
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Fri 2009-01-23 16:13:44 -0200
        message:
          More plugin api docs
        modified:
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3939.1.2
        revision-id: mbp at sourcefrog.net-20090123175030-etahwt2dg0lqdcel
        parent: mbp at sourcefrog.net-20090115075305-lu6m9n2gzl432lh0
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Fri 2009-01-23 15:50:30 -0200
        message:
          Mention plugin docstrings and give a short example of the api requirement function
        modified:
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
    ------------------------------------------------------------
    revno: 3955.1.3
    revision-id: pqm at pqm.ubuntu.com-20090124185051-8oryvqq68n6repso
    parent: pqm at pqm.ubuntu.com-20090124044940-7j90kl1qq22la0rx
    parent: john at arbash-meinel.com-20090123212239-kbt36lwczrha6q67
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2009-01-24 18:50:51 +0000
    message:
      (jam) Add Transport._report_activity support to HTTP transports.
    modified:
      bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
      bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
      bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
      bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
      bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
      bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
        ------------------------------------------------------------
        revno: 3955.3.2
        revision-id: john at arbash-meinel.com-20090123212239-kbt36lwczrha6q67
        parent: john at arbash-meinel.com-20090123212055-qsa1szqtrrxtwgdl
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: 1.12-network-io
        timestamp: Fri 2009-01-23 15:22:39 -0600
        message:
          Start using report_activity for HTTP (pycurl + urllib)
        modified:
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
        ------------------------------------------------------------
        revno: 3955.3.1
        revision-id: john at arbash-meinel.com-20090123212055-qsa1szqtrrxtwgdl
        parent: pqm at pqm.ubuntu.com-20090123181416-tku4gdtorboy6d0y
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: 1.12-network-io
        timestamp: Fri 2009-01-23 15:20:55 -0600
        message:
          Add report_activity to osutils.pumpfile
        modified:
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
    ------------------------------------------------------------
    revno: 3955.1.2
    revision-id: pqm at pqm.ubuntu.com-20090124044940-7j90kl1qq22la0rx
    parent: pqm at pqm.ubuntu.com-20090123181416-tku4gdtorboy6d0y
    parent: ian.clatworthy at canonical.com-20090124040308-m6u33ditaksvwrrq
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2009-01-24 04:49:40 +0000
    message:
      Branch.iter_merge_sorted_revisions API (Ian Clatworthy)
    added:
      bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
        ------------------------------------------------------------
        revno: 3955.2.1
        revision-id: ian.clatworthy at canonical.com-20090124040308-m6u33ditaksvwrrq
        parent: pqm at pqm.ubuntu.com-20090123181416-tku4gdtorboy6d0y
        parent: ian.clatworthy at canonical.com-20090124035735-r7joe4qxqj0wsp9r
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: ianc-integration
        timestamp: Sat 2009-01-24 14:03:08 +1000
        message:
          Branch.iter_merge_sorted_revisions API (Ian Clatworthy)
        added:
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
        ------------------------------------------------------------
        revno: 3949.3.8
        revision-id: ian.clatworthy at canonical.com-20090124035735-r7joe4qxqj0wsp9r
        parent: ian.clatworthy at canonical.com-20090124014858-t8snms0c708b22cj
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Sat 2009-01-24 13:57:35 +1000
        message:
          feedback from poolie
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
        ------------------------------------------------------------
        revno: 3949.3.7
        revision-id: ian.clatworthy at canonical.com-20090124014858-t8snms0c708b22cj
        parent: ian.clatworthy at canonical.com-20090124001510-1zy4ycf7et22tq5d
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Sat 2009-01-24 11:48:58 +1000
        message:
          drop seqnum from in-memory cache
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
        ------------------------------------------------------------
        revno: 3949.3.6
        revision-id: ian.clatworthy at canonical.com-20090124001510-1zy4ycf7et22tq5d
        parent: ian.clatworthy at canonical.com-20090123212235-e9rkelh590rcdmbb
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Sat 2009-01-24 10:15:10 +1000
        message:
          feedback from beuno
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
        ------------------------------------------------------------
        revno: 3949.3.5
        revision-id: ian.clatworthy at canonical.com-20090123212235-e9rkelh590rcdmbb
        parent: ian.clatworthy at canonical.com-20090123211924-am3uaq95d1ebsfcq
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Sat 2009-01-24 07:22:35 +1000
        message:
          NEWS tweak
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3949.3.4
        revision-id: ian.clatworthy at canonical.com-20090123211924-am3uaq95d1ebsfcq
        parent: ian.clatworthy at canonical.com-20090122123241-bv173v5plq0f3s4k
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Sat 2009-01-24 07:19:24 +1000
        message:
          jam feedback: start & stop limits; simple caching
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
        ------------------------------------------------------------
        revno: 3949.3.3
        revision-id: ian.clatworthy at canonical.com-20090122123241-bv173v5plq0f3s4k
        parent: ian.clatworthy at canonical.com-20090121030800-q0epxz7r2wq9wklb
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Thu 2009-01-22 22:32:41 +1000
        message:
          simplify the meaning of forward to be appropriate to this layer
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
        ------------------------------------------------------------
        revno: 3949.3.2
        revision-id: ian.clatworthy at canonical.com-20090121030800-q0epxz7r2wq9wklb
        parent: ian.clatworthy at canonical.com-20090121005320-o96d2epcbtd6z331
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Wed 2009-01-21 13:08:00 +1000
        message:
          feedback from jam
        renamed:
          bzrlib/tests/branch_implementations/test_merge_sorted_revisions.py => bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
        ------------------------------------------------------------
        revno: 3949.3.1
        revision-id: ian.clatworthy at canonical.com-20090121005320-o96d2epcbtd6z331
        parent: pqm at pqm.ubuntu.com-20090120210300-641tutf1rkdn8a3n
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Wed 2009-01-21 10:53:20 +1000
        message:
          introduce Branch.merge_sorted_revisions API
        added:
          bzrlib/tests/branch_implementations/test_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
    ------------------------------------------------------------
    revno: 3955.1.1
    revision-id: pqm at pqm.ubuntu.com-20090123181416-tku4gdtorboy6d0y
    parent: pqm at pqm.ubuntu.com-20090123103145-yvo3icrif75vkt20
    parent: mbp at sourcefrog.net-20090123172552-uu2eh59t0azzvcq9
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2009-01-23 18:14:16 +0000
    message:
      (mbp) further progress bar fixes
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
      bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
      bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
      bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
      bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
    ------------------------------------------------------------
    revno: 3948.2.8
    revision-id: mbp at sourcefrog.net-20090123172552-uu2eh59t0azzvcq9
    parent: mbp at sourcefrog.net-20090122214649-awlvm833pao0t1wp
    parent: pqm at pqm.ubuntu.com-20090123103145-yvo3icrif75vkt20
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: progress
    timestamp: Fri 2009-01-23 15:25:52 -0200
    message:
      merge trunk
    added:
      bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
      bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py test_revision_id_to_-20090122052032-g3czslif6sdqfkh3-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
      bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
      bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
      bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
    ------------------------------------------------------------
    revno: 3948.2.7
    revision-id: mbp at sourcefrog.net-20090122214649-awlvm833pao0t1wp
    parent: mbp at sourcefrog.net-20090121060117-4c3xrje8jahq70uu
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: progress
    timestamp: Thu 2009-01-22 19:46:49 -0200
    message:
      pep8
    modified:
      bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
    ------------------------------------------------------------
    revno: 3948.2.6
    revision-id: mbp at sourcefrog.net-20090121060117-4c3xrje8jahq70uu
    parent: mbp at sourcefrog.net-20090121054918-174smoskf8srdm41
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: progress
    timestamp: Wed 2009-01-21 04:01:17 -0200
    message:
      ProgressBarStack is deprecated
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
      bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
      bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
    ------------------------------------------------------------
    revno: 3948.2.5
    revision-id: mbp at sourcefrog.net-20090121054918-174smoskf8srdm41
    parent: mbp at sourcefrog.net-20090121054258-cyngfg4gdv4tmqm1
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: progress
    timestamp: Wed 2009-01-21 03:49:18 -0200
    message:
      rename to _progress_all_finished
    modified:
      bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
      bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
    ------------------------------------------------------------
    revno: 3948.2.4
    revision-id: mbp at sourcefrog.net-20090121054258-cyngfg4gdv4tmqm1
    parent: mbp at sourcefrog.net-20090121053816-b2eua3hvawjhguzk
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: progress
    timestamp: Wed 2009-01-21 03:42:58 -0200
    message:
      Remove some obsolete progress docstring
    modified:
      bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
    ------------------------------------------------------------
    revno: 3948.2.3
    revision-id: mbp at sourcefrog.net-20090121053816-b2eua3hvawjhguzk
    parent: mbp at sourcefrog.net-20090121053044-mhynfsubozjh9wol
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: progress
    timestamp: Wed 2009-01-21 03:38:16 -0200
    message:
      Make the interface from ProgressTask to ui more private
    modified:
      bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
      bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
      bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
    ------------------------------------------------------------
    revno: 3948.2.2
    revision-id: mbp at sourcefrog.net-20090121053044-mhynfsubozjh9wol
    parent: mbp at sourcefrog.net-20090121050132-8j59ox99p84hiz51
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: progress
    timestamp: Wed 2009-01-21 03:30:44 -0200
    message:
      Corrections to finishing progress bars
    modified:
      bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
      bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
      bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
    ------------------------------------------------------------
    revno: 3948.2.1
    revision-id: mbp at sourcefrog.net-20090121050132-8j59ox99p84hiz51
    parent: pqm at pqm.ubuntu.com-20090120044335-pwr2rshr1yu6vzti
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: progress
    timestamp: Wed 2009-01-21 03:01:32 -0200
    message:
      Add ProgressTask repr
    modified:
      bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
-------------- next part --------------

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


More information about the bazaar-commits mailing list