Rev 1510: Merge bzr.dev. in /home/robertc/source/baz/repository/

Robert Collins robertc at robertcollins.net
Mon Feb 20 23:52:28 GMT 2006


------------------------------------------------------------
revno: 1510
revision-id: robertc at robertcollins.net-20060220235212-6ea74479df313969
parent: robertc at robertcollins.net-20060220002935-c653f31ef30cadff
parent: pqm at pqm.ubuntu.com-20060220043919-b01f8960604b339d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Tue 2006-02-21 10:52:12 +1100
message:
  Merge bzr.dev.
removed:
  patches/                       patches-20050517065551-d76e971b4c04e6e3
added:
  bzrlib/sign_my_commits.py      sign_my_commits.py-20060215152201-5a6363365180e671
  bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
  bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
  bzrlib/tests/blackbox/test_logformats.py test_logformats.py-20060216104208-ba5a16c83480b7e4
  bzrlib/tests/blackbox/test_re_sign.py test_re_sign.py-20060214165921-4d04eba231454693
  bzrlib/tests/blackbox/test_sign_my_commits.py test_sign_my_commits.py-20060215152957-270238a1ffacc841
  bzrlib/tests/workingtree_implementations/test_is_control_filename.py test_is_control_filename.py-20060216024958-f5afdebb2fa36418
modified:
  BRANCH.TODO                    BRANCH.TODO-20060103052123-79ac4969351c03a9
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/add.py                  add.py-20050323030017-3a77d63feda58e33
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/store/__init__.py       store.py-20050309040759-164dc5173d6406c2
  bzrlib/store/weave.py          weavestore.py-20050907094258-88262e0434babab9
  bzrlib/testament.py            testament.py-20051011100429-6d319a18183b13c8
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
  bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
  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/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/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
  bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
  bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
  bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
  bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
  bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
  bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
  bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060220043919-b01f8960604b339d
    parent: pqm at pqm.ubuntu.com-20060219235508-029a9d591a35f189
    parent: robertc at robertcollins.net-20060220002935-c653f31ef30cadff
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-02-20 04:39:19 +0000
    message:
      Merge push/pull and branching within repositories bugfix.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060219235508-029a9d591a35f189
    parent: pqm at pqm.ubuntu.com-20060218023347-0952c65f668bfd68
    parent: robertc at robertcollins.net-20060219234731-4f361d82e113cbb0
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-02-19 23:55:08 +0000
    message:
      Remove unused patches/ directory.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060219234731-4f361d82e113cbb0
    parent: robertc at robertcollins.net-20060218005717-348c76bf711254a5
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Mon 2006-02-20 10:47:31 +1100
    message:
      Remove unused patches/ directory.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060218005717-348c76bf711254a5
    parent: robertc at robertcollins.net-20060217044707-8c15dab107f79a40
    parent: robertc at robertcollins.net-20060217041709-7251eb701f69ca7e
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Sat 2006-02-18 11:57:17 +1100
    message:
      Merge in bzr-dir phase 3, enabling controlled upgrades and shared repositories.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060217041709-7251eb701f69ca7e
    parent: robertc at robertcollins.net-20060216212934-c10d24ea7748de86
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Fri 2006-02-17 15:17:09 +1100
    message:
      Review feedback.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060216212934-c10d24ea7748de86
    parent: robertc at robertcollins.net-20060216112639-6a6a78dbb33a4cc8
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Fri 2006-02-17 08:29:34 +1100
    message:
      Review fixups
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060216112639-6a6a78dbb33a4cc8
    parent: robertc at robertcollins.net-20060216111947-e6946ac37fe8b21a
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Thu 2006-02-16 22:26:39 +1100
    message:
      Bugfix upgrades to metadir to set the last-revision correctly.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060216111947-e6946ac37fe8b21a
    parent: robertc at robertcollins.net-20060216093327-7c4374cea3c33734
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Thu 2006-02-16 22:19:47 +1100
    message:
      Correct buggy test.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060216093327-7c4374cea3c33734
    parent: robertc at robertcollins.net-20060216093135-c9345853176d94b2
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Thu 2006-02-16 20:33:27 +1100
    message:
      Remove ancestry.weave removal todo.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060216093135-c9345853176d94b2
    parent: robertc at robertcollins.net-20060216085152-d0311d8efd0c654c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Thu 2006-02-16 20:31:35 +1100
    message:
      Implement upgrades to Metaformat trees.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060216085152-d0311d8efd0c654c
    parent: robertc at robertcollins.net-20060216081832-4ef742424a888da0
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Thu 2006-02-16 19:51:52 +1100
    message:
      Make upgrade driver unaware of the specific formats in play.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060216081832-4ef742424a888da0
    parent: robertc at robertcollins.net-20060216072216-1cd8117a8e2a24bf
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Thu 2006-02-16 19:18:32 +1100
    message:
      Advise users running upgrade on a checkout to also run it on the branch.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060216072216-1cd8117a8e2a24bf
    parent: robertc at robertcollins.net-20060216072025-8a97e0b2c3f3cc92
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Thu 2006-02-16 18:22:16 +1100
    message:
      Ensure that bzrdir implementations offer the can_update_format and needs_format_update api.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060216072025-8a97e0b2c3f3cc92
    parent: robertc at robertcollins.net-20060216055402-bb6afc4d15c715cd
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Thu 2006-02-16 18:20:25 +1100
    message:
      Start factoring out the upgrade policy logic.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060216055402-bb6afc4d15c715cd
    parent: robertc at robertcollins.net-20060216025300-dfb5d2536908f060
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Thu 2006-02-16 16:54:02 +1100
    message:
      split out converter logic into per-format objects.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060216025300-dfb5d2536908f060
    parent: robertc at robertcollins.net-20060216004439-5110484bd7b39a88
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Thu 2006-02-16 13:53:00 +1100
    message:
      Move is_control_file into WorkingTree.is_control_filename and test.
      Remove the bzrlib.BZRDIR constant as no longer needed. Deliberately
      not deprecating is as it should not ever have been public.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060216004439-5110484bd7b39a88
    parent: robertc at robertcollins.net-20060215081137-4c27377517e96dd1
    parent: robertc at robertcollins.net-20060215221605-09ef2fed453334c6
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Thu 2006-02-16 11:44:39 +1100
    message:
      merge repository.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060215081137-4c27377517e96dd1
    parent: robertc at robertcollins.net-20060215070853-c7b2e20915f6be58
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Wed 2006-02-15 19:11:37 +1100
    message:
      Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060215070853-c7b2e20915f6be58
    parent: robertc at robertcollins.net-20060215060808-d47d40998fea0aee
    parent: robertc at robertcollins.net-20060215035815-93475eacfb0b41d2
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Wed 2006-02-15 18:08:53 +1100
    message:
      Merge repository so I dont trample on myself.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060215060808-d47d40998fea0aee
    parent: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Wed 2006-02-15 17:08:08 +1100
    message:
      Give info some reasonable output and tests.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060217044707-8c15dab107f79a40
    parent: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
    parent: john at arbash-meinel.com-20060217035556-b86991407ef095d9
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Fri 2006-02-17 15:47:07 +1100
    message:
      Merge jam-integration.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060217035556-b86991407ef095d9
    parent: john at arbash-meinel.com-20060217024753-edfa0e845eed8993
    parent: john at arbash-meinel.com-20060217020102-a26538d2b32bff80
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Thu 2006-02-16 21:55:56 -0600
    message:
      [merge] jam-pending: add sign-my-commits, fix repository.clone, add progress bars.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060217020102-a26538d2b32bff80
    parent: john at arbash-meinel.com-20060216171015-1c017977993fbe9b
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-pending
    timestamp: Thu 2006-02-16 20:01:02 -0600
    message:
      cleanups from Robert
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060216171015-1c017977993fbe9b
    parent: john at arbash-meinel.com-20060216170909-155c5aa4a20620dc
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-pending
    timestamp: Thu 2006-02-16 11:10:15 -0600
    message:
      Adding progress bars to copy_all and copy_multi, fixing ordering of repository.clone() to pull inventories after weaves.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060216170909-155c5aa4a20620dc
    parent: john at arbash-meinel.com-20060216170234-28b00293a6fdb5bf
    parent: john at arbash-meinel.com-20060215223111-db659aff6ab35804
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-pending
    timestamp: Thu 2006-02-16 11:09:09 -0600
    message:
      [merge] bump up sign-my-commits
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060215223111-db659aff6ab35804
    parent: john at arbash-meinel.com-20060215154209-1db9dff063341810
    parent: john at arbash-meinel.com-20060215220155-08afc2aced7548dc
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-pending
    timestamp: Wed 2006-02-15 16:31:11 -0600
    message:
      [merge] jam-integration, along with BzrDir changes
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060215220155-08afc2aced7548dc
    parent: john at arbash-meinel.com-20060214181443-42056ee264cc28fe
    parent: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Wed 2006-02-15 16:01:55 -0600
    message:
      [merge] robertc's integration branch: add BzrDir, and checkouts
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060214181443-42056ee264cc28fe
    parent: john at arbash-meinel.com-20060213214027-f87283ba0fa50538
    parent: john at arbash-meinel.com-20060214170602-5959f911674708c9
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Tue 2006-02-14 12:14:43 -0600
    message:
      [merge] jam-pending: allow bzr re-sign to take multiple arguments
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060214170602-5959f911674708c9
    parent: john at arbash-meinel.com-20060214170148-2765fe23e7309b93
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-pending
    timestamp: Tue 2006-02-14 11:06:02 -0600
    message:
      Updated NEWS
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060214170148-2765fe23e7309b93
    parent: john at arbash-meinel.com-20060213214027-f87283ba0fa50538
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-pending
    timestamp: Tue 2006-02-14 11:01:48 -0600
    message:
      Updating bzr re-sign to allow multiple arguments, and updating tests
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060215154209-1db9dff063341810
    parent: john at arbash-meinel.com-20060215153329-5d70f0eda01f5cfe
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-pending
    timestamp: Wed 2006-02-15 09:42:09 -0600
    message:
      Adding sign-my-commits as a builtin, along with some simple tests.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060215153329-5d70f0eda01f5cfe
    parent: john at arbash-meinel.com-20060215151844-ce3e3efccd19da3f
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-pending
    timestamp: Wed 2006-02-15 09:33:29 -0600
    message:
      Fix doc bug
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060215151844-ce3e3efccd19da3f
    parent: john at arbash-meinel.com-20060214183630-bf533b848ea5edce
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-pending
    timestamp: Wed 2006-02-15 09:18:44 -0600
    message:
      Reverting gpg changes, should not be mainline, see gpg_uses_tempfile plugin.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060214183630-bf533b848ea5edce
    parent: john at arbash-meinel.com-20060214170602-5959f911674708c9
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-pending
    timestamp: Tue 2006-02-14 12:36:30 -0600
    message:
      Updated gpg to use a named file, rather than using stdin, so that gpg-agent will work properly
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060216170234-28b00293a6fdb5bf
    parent: john at arbash-meinel.com-20060216164908-3b469d969279998a
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Thu 2006-02-16 11:02:34 -0600
    message:
      small cleanup of test
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060216164908-3b469d969279998a
    parent: john at arbash-meinel.com-20060216164307-5a0d008322cbf1d8
    parent: marienz at gentoo.org-20060213232429-dd6f4ee24918e675
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Thu 2006-02-16 10:49:08 -0600
    message:
      [merge] Marien Zwart: make testament actually support unicode strings.
    ------------------------------------------------------------
    merged: marienz at gentoo.org-20060213232429-dd6f4ee24918e675
    parent: marienz at gentoo.org-20060212234125-9d198c5d818af110
    committer: Marien Zwart <marienz at gentoo.org>
    branch nick: bzr.dev
    timestamp: Tue 2006-02-14 00:24:29 +0100
    message:
      Move the encoding step into the test to make it more obvious we are comparing bytestrings.
    ------------------------------------------------------------
    merged: marienz at gentoo.org-20060212234125-9d198c5d818af110
    parent: marienz at gentoo.org-20060212224024-782d3bcc922d980c
    committer: Marien Zwart <marienz at gentoo.org>
    branch nick: bzr.dev
    timestamp: Mon 2006-02-13 00:41:25 +0100
    message:
      Whitespace cleanup (pep 3)
    ------------------------------------------------------------
    merged: marienz at gentoo.org-20060212224024-782d3bcc922d980c
    parent: marienz at gentoo.org-20060212223951-4827a2850a0da0e6
    committer: Marien Zwart <marienz at gentoo.org>
    branch nick: bzr.dev
    timestamp: Sun 2006-02-12 23:40:24 +0100
    message:
      Remove a useless local function.
    ------------------------------------------------------------
    merged: marienz at gentoo.org-20060212223951-4827a2850a0da0e6
    parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
    committer: Marien Zwart <marienz at gentoo.org>
    branch nick: bzr.dev
    timestamp: Sun 2006-02-12 23:39:51 +0100
    message:
      Make Testament.as_text_lines return utf-8 instead of unicode objects and add a test for this.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060216164307-5a0d008322cbf1d8
    parent: john at arbash-meinel.com-20060215220155-08afc2aced7548dc
    parent: erik at bagfors.nu-20060216104622-46a6394829db2ee8
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Thu 2006-02-16 10:43:07 -0600
    message:
      [merge] bzr.log.plugins: add --log-format to 'bzr log', allow a default to be set in config
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060216104622-46a6394829db2ee8
    parent: erik at bagfors.nu-20060216104544-42f90be7bc2e5856
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.log.plugins
    timestamp: Thu 2006-02-16 11:46:22 +0100
    message:
      reformat NEWS
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060216104544-42f90be7bc2e5856
    parent: erik at bagfors.nu-20060216104359-444d0956bed3a1f7
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.log.plugins
    timestamp: Thu 2006-02-16 11:45:44 +0100
    message:
      bugfix, typo bug
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060216104359-444d0956bed3a1f7
    parent: erik at bagfors.nu-20060215204913-66b12988b85e0b57
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.log.plugins
    timestamp: Thu 2006-02-16 11:43:59 +0100
    message:
      blackbox tests for default log format and log-format arguments
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060215204913-66b12988b85e0b57
    parent: erik at bagfors.nu-20060210212329-0b949820c96ebe15
    parent: john at arbash-meinel.com-20060213214027-f87283ba0fa50538
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.log.plugins
    timestamp: Wed 2006-02-15 21:49:13 +0100
    message:
      [merge] jam-integration
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060210212329-0b949820c96ebe15
    parent: erik at bagfors.nu-20060206201243-3f60d7473fcf9ef3
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.log.plugins
    timestamp: Fri 2006-02-10 22:23:29 +0100
    message:
      log_formatter => log_format for "named" formatters
      The name of a formatter is now called log_format and is exposed
      as "log-format" and not "log-formatter" to the user for more consitency
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060206201243-3f60d7473fcf9ef3
    parent: erik at bagfors.nu-20060206201150-73d89be9e6320dad
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.log.plugins
    timestamp: Mon 2006-02-06 21:12:43 +0100
    message:
      tests for config log_formatter
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060206201150-73d89be9e6320dad
    parent: erik at bagfors.nu-20060204115126-c9ee420cc8876c25
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.log.plugins
    timestamp: Mon 2006-02-06 21:11:50 +0100
    message:
      fix in help, log_format -> log_formatter
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060204115126-c9ee420cc8876c25
    parent: erik at bagfors.nu-20060204114014-ef72c583019c8342
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.log.plugins
    timestamp: Sat 2006-02-04 12:51:26 +0100
    message:
      Make default formatter work for the missing command
      Also, removed debugging
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060204114014-ef72c583019c8342
    parent: erik at bagfors.nu-20060204113623-016da21eeb5723ca
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.log.plugins
    timestamp: Sat 2006-02-04 12:40:14 +0100
    message:
      update NEWS
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060204113623-016da21eeb5723ca
    parent: erik at bagfors.nu-20060203213448-af43e1511444f3fd
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.log.plugins
    timestamp: Sat 2006-02-04 12:36:23 +0100
    message:
      Support for setting the default log format at a configuration option
      Also, removed the possibility for plugins to set the default formatter
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060203213448-af43e1511444f3fd
    parent: erik at bagfors.nu-20060203195457-046f39c916b2ee12
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.log.plugins
    timestamp: Fri 2006-02-03 22:34:48 +0100
    message:
      cover the missing command with formatters as well
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060203195457-046f39c916b2ee12
    parent: erik at bagfors.nu-20060203195059-1cf8ff5aa68de0ea
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.log.plugins
    timestamp: Fri 2006-02-03 20:54:57 +0100
    message:
      Made "unknown log formatter" error message work
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060203195059-1cf8ff5aa68de0ea
    parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.log.plugins
    timestamp: Fri 2006-02-03 20:50:59 +0100
    message:
      Support for plugins to register log formatters and set default formatter
      Also, change one command line option for "log"
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060217024753-edfa0e845eed8993
    parent: john at arbash-meinel.com-20060216170234-28b00293a6fdb5bf
    parent: michael at ellerman.id.au-20060216005059-dde4ec75b1b58ebf
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Thu 2006-02-16 20:47:53 -0600
    message:
      [merge] Michael Ellerman: support 'bzr log -r ..' and add tests, also clarify 'bzr help --long'
    ------------------------------------------------------------
    merged: michael at ellerman.id.au-20060216005059-dde4ec75b1b58ebf
    parent: michael at ellerman.id.au-20060216004340-37abb307ac2b63cf
    committer: Michael Ellerman <michael at ellerman.id.au>
    branch nick: mpe
    timestamp: Thu 2006-02-16 11:50:59 +1100
    message:
      Add custom description for help's --long option, this fixes bug #31217.
      There were no real tests for help, so add a bunch of black box tests
      to confirm all the various incantations work.
    ------------------------------------------------------------
    merged: michael at ellerman.id.au-20060216004340-37abb307ac2b63cf
    parent: michael at ellerman.id.au-20060215050736-2b2c17f50a210b4d
    committer: Michael Ellerman <michael at ellerman.id.au>
    branch nick: mpe
    timestamp: Thu 2006-02-16 11:43:40 +1100
    message:
      Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure
      it doesn't break in future.
    ------------------------------------------------------------
    merged: michael at ellerman.id.au-20060215050736-2b2c17f50a210b4d
    parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
    parent: john at arbash-meinel.com-20060214181443-42056ee264cc28fe
    committer: Michael Ellerman <michael at ellerman.id.au>
    branch nick: revision-ranges
    timestamp: Wed 2006-02-15 16:07:36 +1100
    message:
      Merge JAM Integration
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060218023347-0952c65f668bfd68
    parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
    parent: robertc at robertcollins.net-20060218005717-348c76bf711254a5
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2006-02-18 02:33:47 +0000
    message:
      Merge Robert Collins integration.



More information about the bazaar-commits mailing list