Rev 2600: Merge trunk in http://sourcefrog.net/bzr/test-cleanup

Martin Pool mbp at sourcefrog.net
Thu Jul 12 04:55:43 BST 2007


At http://sourcefrog.net/bzr/test-cleanup

------------------------------------------------------------
revno: 2600
revision-id: mbp at sourcefrog.net-20070712035539-dl43w69md9ni92m3
parent: mbp at sourcefrog.net-20070711014446-up0nkhg2u8nvupyl
parent: pqm at pqm.ubuntu.com-20070712021235-0a3tqhdt9nxk0x9y
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Thu 2007-07-12 13:55:39 +1000
message:
  Merge trunk
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bundle/commands.py      __init__.py-20050617152058-1b6530d9ab85c11c
  bzrlib/cmd_version_info.py     __init__.py-20051228204928-697d01fdca29c99b
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
  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/test_help.py      test_help.py-20070419045354-6q6rq15j9e2n5fna-1
  bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
  bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
  bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
  doc/developers/HACKING         HACKING-20050805200004-2a5dc975d870f78c
  doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
    ------------------------------------------------------------
    revno: 2598.1.5
    revision-id: pqm at pqm.ubuntu.com-20070712021235-0a3tqhdt9nxk0x9y
    parent: pqm at pqm.ubuntu.com-20070711221443-ntcgqkwy42mislml
    parent: abentley at panoramicfeedback.com-20070710181401-lfw19orwavwyk603
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-07-12 03:12:35 +0100
    message:
      Merge uses Tree._iter_changes (Aaron Bentley)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
      bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
      doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
        ------------------------------------------------------------
        revno: 2590.2.10
        revision-id: abentley at panoramicfeedback.com-20070710181401-lfw19orwavwyk603
        parent: abentley at panoramicfeedback.com-20070710175519-qfdqkmx0zankbgfo
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: changes-merge
        timestamp: Tue 2007-07-10 14:14:01 -0400
        message:
          Updates from review
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
        ------------------------------------------------------------
        revno: 2590.2.9
        revision-id: abentley at panoramicfeedback.com-20070710175519-qfdqkmx0zankbgfo
        parent: abentley at panoramicfeedback.com-20070706172134-kz3k30d2pu61qngi
        parent: pqm at pqm.ubuntu.com-20070710021221-8o98e4q8vcpaarnk
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: changes-merge
        timestamp: Tue 2007-07-10 13:55:19 -0400
        message:
          Merge from bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-1
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
          bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
          bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
          bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/chroot.py     chroot.py-20061011104729-0us9mgm97z378vnt-1
          bzrlib/transport/decorator.py  decorator.py-20060402223305-e913a0f25319ab42
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          doc/developers/scratch.txt     scratch.txt-20070618020404-cdhv0ecgrukomemg-3
        ------------------------------------------------------------
        revno: 2590.2.8
        revision-id: abentley at panoramicfeedback.com-20070706172134-kz3k30d2pu61qngi
        parent: aaron.bentley at utoronto.ca-20070706013111-gykms7zh122pm0z8
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: changes-merge
        timestamp: Fri 2007-07-06 13:21:34 -0400
        message:
          Restore conflict handling changes
        modified:
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 2590.2.7
        revision-id: aaron.bentley at utoronto.ca-20070706013111-gykms7zh122pm0z8
        parent: aaron.bentley at utoronto.ca-20070706005922-7j1b5ed8spn9ml7d
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: changes-merge
        timestamp: Thu 2007-07-05 21:31:11 -0400
        message:
          Misc cleanup
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
        ------------------------------------------------------------
        revno: 2590.2.6
        revision-id: aaron.bentley at utoronto.ca-20070706005922-7j1b5ed8spn9ml7d
        parent: aaron.bentley at utoronto.ca-20070706005858-covn9uur45ir2mz9
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: changes-merge
        timestamp: Thu 2007-07-05 20:59:22 -0400
        message:
          Update docs to note that iter_changes-merge is done
        modified:
          doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
        ------------------------------------------------------------
        revno: 2590.2.5
        revision-id: aaron.bentley at utoronto.ca-20070706005858-covn9uur45ir2mz9
        parent: abentley at panoramicfeedback.com-20070705161911-35s2ct3lnb8mx3wq
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: changes-merge
        timestamp: Thu 2007-07-05 20:58:58 -0400
        message:
          Allow selected files to be specified instead of selected ids
        modified:
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
        ------------------------------------------------------------
        revno: 2590.2.4
        revision-id: abentley at panoramicfeedback.com-20070705161911-35s2ct3lnb8mx3wq
        parent: abentley at panoramicfeedback.com-20070705153934-ap3nxs9fa9u8yvfr
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: changes-merge
        timestamp: Thu 2007-07-05 12:19:11 -0400
        message:
          Move entry generation to a helper
        modified:
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
        ------------------------------------------------------------
        revno: 2590.2.3
        revision-id: abentley at panoramicfeedback.com-20070705153934-ap3nxs9fa9u8yvfr
        parent: abentley at panoramicfeedback.com-20070705151112-207czq9spmtd485e
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: changes-merge
        timestamp: Thu 2007-07-05 11:39:34 -0400
        message:
          Merge the execute bit based on iter_changes
        modified:
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
        ------------------------------------------------------------
        revno: 2590.2.2
        revision-id: abentley at panoramicfeedback.com-20070705151112-207czq9spmtd485e
        parent: abentley at panoramicfeedback.com-20070705144545-fnl4i5s4vdi8wyh0
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: changes-merge
        timestamp: Thu 2007-07-05 11:11:12 -0400
        message:
          Do most name merging from iter_changes output
        modified:
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
        ------------------------------------------------------------
        revno: 2590.2.1
        revision-id: abentley at panoramicfeedback.com-20070705144545-fnl4i5s4vdi8wyh0
        parent: pqm at pqm.ubuntu.com-20070705054119-z89j99ne0vvywkgu
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: changes-merge
        timestamp: Thu 2007-07-05 10:45:45 -0400
        message:
          Start work on merging names based on iter_changes
        modified:
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
    ------------------------------------------------------------
    revno: 2598.1.4
    revision-id: pqm at pqm.ubuntu.com-20070711221443-ntcgqkwy42mislml
    parent: pqm at pqm.ubuntu.com-20070711162842-8fx9cc0c3ogyxudl
    parent: kuno.meyer at gmx.ch-20070710200445-ckfv00qm9fampvro
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-07-11 23:14:43 +0100
    message:
      (Kuno Meyer) Fix glob_expand_for_win32
    modified:
      bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
        ------------------------------------------------------------
        revno: 2598.4.1
        revision-id: kuno.meyer at gmx.ch-20070710200445-ckfv00qm9fampvro
        parent: pqm at pqm.ubuntu.com-20070710021221-8o98e4q8vcpaarnk
        committer: Kuno Meyer <kuno.meyer at gmx.ch>
        branch nick: rprot
        timestamp: Tue 2007-07-10 22:04:45 +0200
        message:
          fix method rename glob_expand_for_win32 -> win32utils.glob_expand
        modified:
          bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
    ------------------------------------------------------------
    revno: 2598.1.3
    revision-id: pqm at pqm.ubuntu.com-20070711162842-8fx9cc0c3ogyxudl
    parent: pqm at pqm.ubuntu.com-20070711055149-s5wsfnc1jatpoi1x
    parent: john at arbash-meinel.com-20070710200733-ihnfsn13afibbs6w
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-07-11 17:28:42 +0100
    message:
      (John Arbash Meinel) Simple fix to avoid a .split('/') when we don't need it
    modified:
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 2598.3.1
        revision-id: john at arbash-meinel.com-20070710200733-ihnfsn13afibbs6w
        parent: pqm at pqm.ubuntu.com-20070710021221-8o98e4q8vcpaarnk
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: simple_no_split
        timestamp: Tue 2007-07-10 15:07:33 -0500
        message:
          Update WT4._iter_changes to not split the basename, since it will
          never contain a '/' character.
        modified:
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    revno: 2598.1.2
    revision-id: pqm at pqm.ubuntu.com-20070711055149-s5wsfnc1jatpoi1x
    parent: pqm at pqm.ubuntu.com-20070711041950-ci5yz9nyhbcdmuqv
    parent: aaron.bentley at utoronto.ca-20070711045443-oi9vk0jgepts5k5s
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-07-11 06:51:49 +0100
    message:
      nicer path display in info command
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
      bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
      bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.44
        revision-id: aaron.bentley at utoronto.ca-20070711045443-oi9vk0jgepts5k5s
        parent: abentley at panoramicfeedback.com-20070706212010-yesdnjys9484lftu
        parent: pqm at pqm.ubuntu.com-20070710021221-8o98e4q8vcpaarnk
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Wed 2007-07-11 00:54:43 -0400
        message:
          Merge bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
          doc/developers/scratch.txt     scratch.txt-20070618020404-cdhv0ecgrukomemg-3
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.43
        revision-id: abentley at panoramicfeedback.com-20070706212010-yesdnjys9484lftu
        parent: abentley at panoramicfeedback.com-20070706184146-e3rxswzbfslos4mi
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Fri 2007-07-06 17:20:10 -0400
        message:
          Provide ways of getting at unicode-clean output
        modified:
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.42
        revision-id: abentley at panoramicfeedback.com-20070706184146-e3rxswzbfslos4mi
        parent: abentley at panoramicfeedback.com-20070706183050-2folzf1brc3syc3a
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Fri 2007-07-06 14:41:46 -0400
        message:
          Add NEWS entry
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.41
        revision-id: abentley at panoramicfeedback.com-20070706183050-2folzf1brc3syc3a
        parent: abentley at panoramicfeedback.com-20070706163615-wxdeft13etu780bk
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Fri 2007-07-06 14:30:50 -0400
        message:
          Make info provide more related brances, and format all branches nicely
        modified:
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.40
        revision-id: abentley at panoramicfeedback.com-20070706163615-wxdeft13etu780bk
        parent: aaron.bentley at utoronto.ca-20070705101146-on81r29qia562yfe
        parent: pqm at pqm.ubuntu.com-20070706141845-sije5bdx8pjw2fhk
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Fri 2007-07-06 12:36:15 -0400
        message:
          Merge bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-1
          bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/chroot.py     chroot.py-20061011104729-0us9mgm97z378vnt-1
          bzrlib/transport/decorator.py  decorator.py-20060402223305-e913a0f25319ab42
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
    ------------------------------------------------------------
    revno: 2598.1.1
    revision-id: pqm at pqm.ubuntu.com-20070711041950-ci5yz9nyhbcdmuqv
    parent: pqm at pqm.ubuntu.com-20070710021221-8o98e4q8vcpaarnk
    parent: mbp at sourcefrog.net-20070711032003-9t03vnewhh4fg6qw
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-07-11 05:19:50 +0100
    message:
      (mbp,r=jamesw,r=aaron) Make option grammar consistent and enforce that with a test
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/bundle/commands.py      __init__.py-20050617152058-1b6530d9ab85c11c
      bzrlib/cmd_version_info.py     __init__.py-20051228204928-697d01fdca29c99b
      bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
      bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
      bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
      bzrlib/sign_my_commits.py      sign_my_commits.py-20060215152201-5a6363365180e671
      bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
      bzrlib/tests/test_help.py      test_help.py-20070419045354-6q6rq15j9e2n5fna-1
      bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
      doc/developers/HACKING         HACKING-20050805200004-2a5dc975d870f78c
    ------------------------------------------------------------
    revno: 2598.2.5
    revision-id: mbp at sourcefrog.net-20070711032003-9t03vnewhh4fg6qw
    parent: mbp at sourcefrog.net-20070711023238-3t8dcgltds9566ke
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: check-options
    timestamp: Wed 2007-07-11 13:20:03 +1000
    message:
      Fix one more option message.
    modified:
      bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
    ------------------------------------------------------------
    revno: 2598.2.4
    revision-id: mbp at sourcefrog.net-20070711023238-3t8dcgltds9566ke
    parent: mbp at sourcefrog.net-20070711015533-dzcxkjg0ujh8yuhl
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: check-options
    timestamp: Wed 2007-07-11 12:32:38 +1000
    message:
      Fix up tests for option help cleanups
    modified:
      bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
      bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
      bzrlib/tests/test_help.py      test_help.py-20070419045354-6q6rq15j9e2n5fna-1
      bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
    ------------------------------------------------------------
    revno: 2598.2.3
    revision-id: mbp at sourcefrog.net-20070711015533-dzcxkjg0ujh8yuhl
    parent: mbp at sourcefrog.net-20070710103345-hwfpnzxcx1mfv31x
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: check-options
    timestamp: Wed 2007-07-11 11:55:33 +1000
    message:
      Option help improvements (thanks jamesw)
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 2598.2.2
    revision-id: mbp at sourcefrog.net-20070710103345-hwfpnzxcx1mfv31x
    parent: mbp at sourcefrog.net-20070710102027-2os88re33c57m522
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: check-options
    timestamp: Tue 2007-07-10 20:33:45 +1000
    message:
      Also check that option help ends in a period, and fix those that don't
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
      bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
      bzrlib/sign_my_commits.py      sign_my_commits.py-20060215152201-5a6363365180e671
      bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
    ------------------------------------------------------------
    revno: 2598.2.1
    revision-id: mbp at sourcefrog.net-20070710102027-2os88re33c57m522
    parent: pqm at pqm.ubuntu.com-20070710021221-8o98e4q8vcpaarnk
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: check-options
    timestamp: Tue 2007-07-10 20:20:27 +1000
    message:
      Add test for and documentation of option style, fix up existing options to comply
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/bundle/commands.py      __init__.py-20050617152058-1b6530d9ab85c11c
      bzrlib/cmd_version_info.py     __init__.py-20051228204928-697d01fdca29c99b
      bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
      bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
      bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
      bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
      doc/developers/HACKING         HACKING-20050805200004-2a5dc975d870f78c

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



More information about the bazaar-commits mailing list