Rev 1503: Merge from integration. in /home/robertc/source/baz/repository/

Robert Collins robertc at robertcollins.net
Tue Feb 14 08:14:25 GMT 2006


------------------------------------------------------------
revno: 1503
revision-id: robertc at robertcollins.net-20060214081409-f4f364f43abf04da
parent: robertc at robertcollins.net-20060214040706-ab43d8450989c555
parent: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Tue 2006-02-14 19:14:09 +1100
message:
  Merge from integration.
added:
  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_log.py test_log.py-20060112090212-78f6ea560c868e24
  bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  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/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
  bzrlib/lockable_files.py       control_files.py-20051111201905-bb88546e799d669f
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
  bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
  bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
  bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
  bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
  bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
  bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
  bzrlib/tests/test_source.py    test_source.py-20051207061333-a58dea6abecc030d
  bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
  bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
  bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  bzrlib/transport/http.py       http_transport.py-20050711212304-506c5fd1059ace96
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
  bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
  bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
    parent: robertc at robertcollins.net-20060214064406-f4e4db1399d7069d
    parent: robertc at robertcollins.net-20060213220923-96b1df85739f0d8c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2006-02-14 17:52:21 +1100
    message:
       * Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
         behaviour. They use the existing serverless-mode and store no data
         locally. As such they are not suitable for use except in high bandwidth
         low latency environments like LAN's or local disk. (Robert Collins)
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060213220923-96b1df85739f0d8c
    parent: robertc at robertcollins.net-20060213215205-cb3bacc87092a639
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Tue 2006-02-14 09:09:23 +1100
    message:
      Forgot to update the last warn() to reference WorkingTree.open().
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060213215205-cb3bacc87092a639
    parent: robertc at robertcollins.net-20060212125715-75abf487b5ee1f5a
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Tue 2006-02-14 08:52:05 +1100
    message:
      Update per review comments.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060212125715-75abf487b5ee1f5a
    parent: robertc at robertcollins.net-20060212102856-bdc8733fbacfa73c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Sun 2006-02-12 23:57:15 +1100
    message:
      Add update command for use with checkouts.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060212102856-bdc8733fbacfa73c
    parent: robertc at robertcollins.net-20060212101913-bc160919173fc028
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Sun 2006-02-12 21:28:56 +1100
    message:
      Test that the working tree last revision is indeed set during commit.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060212101913-bc160919173fc028
    parent: robertc at robertcollins.net-20060212094015-0fba37745716a3d9
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Sun 2006-02-12 21:19:13 +1100
    message:
      implement out of date working tree checks in commit.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060212094015-0fba37745716a3d9
    parent: robertc at robertcollins.net-20060211231807-30cf1893956ebb07
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Sun 2006-02-12 20:40:15 +1100
    message:
      Implement -r limit for checkout command.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060211231807-30cf1893956ebb07
    parent: robertc at robertcollins.net-20060211115806-732dabc1e35714ed
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Sun 2006-02-12 10:18:07 +1100
    message:
      Create a checkout command.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060211115806-732dabc1e35714ed
    parent: robertc at robertcollins.net-20060210125935-fd07ea9a67b299d9
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Sat 2006-02-11 22:58:06 +1100
    message:
      Give format3 working trees their own last-revision marker.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060210125935-fd07ea9a67b299d9
    parent: robertc at robertcollins.net-20060110105314-c7cb6a57c52477bd
    parent: robertc at robertcollins.net-20060210123118-b4edbe22441ec029
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Fri 2006-02-10 23:59:35 +1100
    message:
      Merge in bzrdir work to enable checkout improvements.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060110105314-c7cb6a57c52477bd
    parent: robertc at robertcollins.net-20060110094553-4be9f3f7c641d03b
    parent: robertc at robertcollins.net-20060110062704-bf190acccbdc2457
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Tue 2006-01-10 21:53:14 +1100
    message:
      Merge from test-providers.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060110094553-4be9f3f7c641d03b
    parent: robertc at robertcollins.net-20051123071842-ac5f13e1eb9d905b
    parent: robertc at robertcollins.net-20060109051935-ee3847274413fe22
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: checkout
    timestamp: Tue 2006-01-10 20:45:53 +1100
    message:
      Merge from integration.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060214064406-f4e4db1399d7069d
    parent: robertc at robertcollins.net-20060213231929-686f2e0d9859cd83
    parent: robertc at robertcollins.net-20060213235519-8d0ee14d761be81b
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2006-02-14 17:44:06 +1100
    message:
      Merge in bzr-dir phase 2.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060213235519-8d0ee14d761be81b
    parent: robertc at robertcollins.net-20060212205854-5bd98a23ff8314f4
    parent: robertc at robertcollins.net-20060213231929-686f2e0d9859cd83
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bzr-dir
    timestamp: Tue 2006-02-14 10:55:19 +1100
    message:
      Merge from integration.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060213231929-686f2e0d9859cd83
    parent: robertc at robertcollins.net-20060201211329-b3faf2a411316ff7
    parent: john at arbash-meinel.com-20060213214027-f87283ba0fa50538
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2006-02-14 10:19:29 +1100
    message:
      Merge from jam-integration.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060213214027-f87283ba0fa50538
    parent: john at arbash-meinel.com-20060212224633-beec76e4ced17f96
    parent: abentley at panoramicfeedback.com-20060213194322-559e96ff793e0682
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Mon 2006-02-13 15:40:27 -0600
    message:
      [merge] bzr.ab, several small bugfixes.
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060213194322-559e96ff793e0682
    parent: abentley at panoramicfeedback.com-20060213194138-2a339f4efb33c673
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab2
    timestamp: Mon 2006-02-13 14:43:22 -0500
    message:
      Test case for discrepancy between fileid_involved and compare_tree [recommit]
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060213194138-2a339f4efb33c673
    parent: abentley at panoramicfeedback.com-20060213193541-bc073c45969f80ff
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab2
    timestamp: Mon 2006-02-13 14:41:38 -0500
    message:
      Restored blackbox tests [recommit]
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060213193541-bc073c45969f80ff
    parent: abentley at panoramicfeedback.com-20060213193447-6437ea35f5949df1
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab2
    timestamp: Mon 2006-02-13 14:35:41 -0500
    message:
      Removed more selftest spam [recommit]
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060213193447-6437ea35f5949df1
    parent: abentley at panoramicfeedback.com-20060213192244-b3bc3d4d0a53578d
    parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab2
    timestamp: Mon 2006-02-13 14:34:47 -0500
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060213192244-b3bc3d4d0a53578d
    parent: abentley at panoramicfeedback.com-20060213191949-bd6946ac59e19a25
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab2
    timestamp: Mon 2006-02-13 14:22:44 -0500
    message:
      Removed lock-related log spam [recommit]
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060213191949-bd6946ac59e19a25
    parent: abentley at panoramicfeedback.com-20060213191854-d7525def24951995
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab2
    timestamp: Mon 2006-02-13 14:19:49 -0500
    message:
      Fix find-merge-base for new API [recommit]
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060213191854-d7525def24951995
    parent: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab2
    timestamp: Mon 2006-02-13 14:18:54 -0500
    message:
      recommit 1527 PEP8 fixes
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060212224633-beec76e4ced17f96
    parent: john at arbash-meinel.com-20060206140209-793eeeb7f3f3d069
    parent: john at arbash-meinel.com-20060212193502-9c9da50d8ad48492
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Sun 2006-02-12 16:46:33 -0600
    message:
      [merge] fix weave join to display nicer progress messages.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060212193502-9c9da50d8ad48492
    parent: john at arbash-meinel.com-20060206140209-793eeeb7f3f3d069
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-fix-weave-join
    timestamp: Sun 2006-02-12 13:35:02 -0600
    message:
      Simplifying what bzr displays when merging
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060206140209-793eeeb7f3f3d069
    parent: john at arbash-meinel.com-20060206135424-e20c6607c047b096
    parent: erik at bagfors.nu-20060206083239-535fbe376baa4886
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Mon 2006-02-06 08:02:09 -0600
    message:
      [merge] Erik BÃ¥gfors: add --revision to bzr pull
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060206083239-535fbe376baa4886
    parent: erik at bagfors.nu-20060204193826-faeadb63784b823f
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: Erik BÃ¥gfors' pull --revision branch
    timestamp: Mon 2006-02-06 09:32:39 +0100
    message:
      update NEWS
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060204193826-faeadb63784b823f
    parent: erik at bagfors.nu-20060117114403-1f884dcb91d93eb3
    parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: Erik BÃ¥gfors' pull --revision branch
    timestamp: Sat 2006-02-04 20:38:26 +0100
    message:
      merge from bzr.dev
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060117114403-1f884dcb91d93eb3
    parent: erik at bagfors.nu-20060103093307-685b7da2a2b96a39
    parent: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: Erik BÃ¥gfors' pull --revision branch
    timestamp: Tue 2006-01-17 12:44:03 +0100
    message:
      merge from bzr.dev
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060103093307-685b7da2a2b96a39
    parent: erik at bagfors.nu-20060103092351-ca586a459c94e253
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: Erik BÃ¥gfors' pull --revision branch
    timestamp: Tue 2006-01-03 10:33:07 +0100
    message:
      better way to get to the rev_id
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060103092351-ca586a459c94e253
    parent: erik at bagfors.nu-20051224220300-c5c1a259d3bafb7b
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: Erik BÃ¥gfors' pull --revision branch
    timestamp: Tue 2006-01-03 10:23:51 +0100
    message:
      expanded tabs
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20051224220300-c5c1a259d3bafb7b
    parent: erik at bagfors.nu-20051223235548-57d23cf4d5d15ec3
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: Erik BÃ¥gfors' pull --revision branch
    timestamp: Sat 2005-12-24 23:03:00 +0100
    message:
      changes for pull --revision based on input from John
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20051223235548-57d23cf4d5d15ec3
    parent: erik at bagfors.nu-20051220112436-0c74ef0e272fe074
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: Erik BÃ¥gfors' pull --revision branch
    timestamp: Sat 2005-12-24 00:55:48 +0100
    message:
      test for pull --revision
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20051220112436-0c74ef0e272fe074
    parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: Erik BÃ¥gfors' pull --revision branch
    timestamp: Tue 2005-12-20 12:24:36 +0100
    message:
      Support for --revision in pull
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060206135424-e20c6607c047b096
    parent: john at arbash-meinel.com-20060204235841-23632e02a5097602
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Mon 2006-02-06 07:54:24 -0600
    message:
      Fix blackbox tests so they run again, and they load tests before loading the test suite, so you get proper errors.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060204235841-23632e02a5097602
    parent: john at arbash-meinel.com-20060204234145-4fcfb3fdd2c081e6
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Sat 2006-02-04 17:58:41 -0600
    message:
      Found a bug in my test_status.py cleanup
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060204234145-4fcfb3fdd2c081e6
    parent: john at arbash-meinel.com-20060204233046-72d1d7f41dd71180
    parent: robey at master-shake.local-20060117004349-64415dc6bbf883f8
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Sat 2006-02-04 17:41:45 -0600
    message:
      [merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
    ------------------------------------------------------------
    merged: robey at master-shake.local-20060117004349-64415dc6bbf883f8
    parent: robey at master-shake.local-20060116074642-3fea2503c99075a2
    parent: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
    committer: Robey Pointer <robey at master-shake.local>
    branch nick: bzr.robey
    timestamp: Mon 2006-01-16 16:43:49 -0800
    message:
      merge from bzr.dev
    ------------------------------------------------------------
    merged: robey at master-shake.local-20060116074642-3fea2503c99075a2
    parent: robey at master-shake.local-20060112090306-c25120c9586b2067
    committer: Robey Pointer <robey at master-shake.local>
    branch nick: bzr.robey
    timestamp: Sun 2006-01-15 23:46:42 -0800
    message:
      add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal)
    ------------------------------------------------------------
    merged: robey at master-shake.local-20060112090306-c25120c9586b2067
    parent: robey at master-shake.local-20060112073010-69b685c95ac1628d
    committer: Robey Pointer <robey at master-shake.local>
    branch nick: bzr.robey
    timestamp: Thu 2006-01-12 01:03:06 -0800
    message:
      make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
    ------------------------------------------------------------
    merged: robey at master-shake.local-20060112073010-69b685c95ac1628d
    parent: robey at master-shake.local-20060112071328-adc900e35a9dd0cd
    parent: mbp at sourcefrog.net-20060112045444-cc2e49b5bae40e06
    committer: Robey Pointer <robey at master-shake.local>
    branch nick: bzr.robey
    timestamp: Wed 2006-01-11 23:30:10 -0800
    message:
      merge from bzr.dev
    ------------------------------------------------------------
    merged: robey at master-shake.local-20060112071328-adc900e35a9dd0cd
    parent: robey at master-shake.local-20060111071938-f725715d3e0f097e
    committer: Robey Pointer <robey at master-shake.local>
    branch nick: bzr.robey
    timestamp: Wed 2006-01-11 23:13:28 -0800
    message:
      patch from robert collins to simplify the paramiko version test
    ------------------------------------------------------------
    merged: robey at master-shake.local-20060111071938-f725715d3e0f097e
    parent: robey at master-shake.local-20060109074939-325c56daf5ee2491
    committer: Robey Pointer <robey at master-shake.local>
    branch nick: bzr.robey
    timestamp: Tue 2006-01-10 23:19:38 -0800
    message:
      move the paramiko version check up to the top and use getattr instead of hasattr.  use BZR_SSH instead of BZR_USE_PARAMIKO, to allow overriding the ssh vendor check in a general way.
    ------------------------------------------------------------
    merged: robey at master-shake.local-20060109074939-325c56daf5ee2491
    parent: robey at master-shake.local-20060109074633-85245a191c3b8ca7
    committer: Röbey Pointer <robey at master-shake.local>
    branch nick: bzr.robey
    timestamp: Sun 2006-01-08 23:49:39 -0800
    message:
      allow forcing the use of paramiko via environ var; use prefetch on paramiko >= 1.5.2
    ------------------------------------------------------------
    merged: robey at master-shake.local-20060109074633-85245a191c3b8ca7
    parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
    committer: Röbey Pointer <robey at master-shake.local>
    branch nick: bzr.robey
    timestamp: Sun 2006-01-08 23:46:33 -0800
    message:
      change http url parsing to use urlparse, and use the ui_factory to ask for a password if necessary
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060204233046-72d1d7f41dd71180
    parent: john at arbash-meinel.com-20060201141338-d211b93a6adfa691
    parent: james.henstridge at canonical.com-20060202091151-fb40d3f83952167e
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Sat 2006-02-04 17:30:46 -0600
    message:
      [merge] James Henstridge: Set user agent for http
    ------------------------------------------------------------
    merged: james.henstridge at canonical.com-20060202091151-fb40d3f83952167e
    parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
    committer: James Henstridge <james.henstridge at canonical.com>
    branch nick: bzr.dev (Main development branch)
    timestamp: Thu 2006-02-02 17:11:51 +0800
    message:
      Set the user agent when grabbing files via http.



More information about the bazaar-commits mailing list