Rev 3783: Merge bzr.dev 3789 in http://bzr.arbash-meinel.com/branches/bzr/1.9-dev/btree_optimize
John Arbash Meinel
john at arbash-meinel.com
Wed Oct 22 20:25:54 BST 2008
At http://bzr.arbash-meinel.com/branches/bzr/1.9-dev/btree_optimize
------------------------------------------------------------
revno: 3783
revision-id: john at arbash-meinel.com-20081022192527-t9vrlcebnylxyv4f
parent: john at arbash-meinel.com-20081022192446-gh0f5zijpmurmdmg
parent: pqm at pqm.ubuntu.com-20081021231845-k119hl1icewguq50
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree_optimize
timestamp: Wed 2008-10-22 14:25:27 -0500
message:
Merge bzr.dev 3789
added:
bzrlib/tests/fake_command.py fake_command.py-20081021195002-r9v65tgxx63c25v9-1
doc/developers/cycle.txt cycle.txt-20081017031739-rw24r0cywm2ok3xu-1
tools/packaging/lp-upload-release lpuploadrelease-20081020075647-56zdf9z6yav1bx81-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3777.2.12
revision-id: pqm at pqm.ubuntu.com-20081021231845-k119hl1icewguq50
parent: pqm at pqm.ubuntu.com-20081021060139-fpwr4fxr2oww2x5o
parent: aaron at aaronbentley.com-20081021204954-6ly1dyb9ix92el1a
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-10-22 00:18:45 +0100
message:
Use Registry for plugin commands, enable lazy command loading.
added:
bzrlib/tests/fake_command.py fake_command.py-20081021195002-r9v65tgxx63c25v9-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
------------------------------------------------------------
revno: 3777.11.5
revision-id: aaron at aaronbentley.com-20081021204954-6ly1dyb9ix92el1a
parent: aaron at aaronbentley.com-20081021204305-4yf2n78r6b61yo91
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: command-registry
timestamp: Tue 2008-10-21 21:49:54 +0100
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3777.11.4
revision-id: aaron at aaronbentley.com-20081021204305-4yf2n78r6b61yo91
parent: aaron at aaronbentley.com-20081021184910-kvfby9230xv2mbfz
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: command-registry
timestamp: Tue 2008-10-21 21:43:05 +0100
message:
Enable lazy-loading of commands
added:
bzrlib/tests/fake_command.py fake_command.py-20081021195002-r9v65tgxx63c25v9-1
modified:
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
------------------------------------------------------------
revno: 3777.11.3
revision-id: aaron at aaronbentley.com-20081021184910-kvfby9230xv2mbfz
parent: aaron at aaronbentley.com-20081021184829-wb5obp7gst2207ge
parent: pqm at pqm.ubuntu.com-20081021060139-fpwr4fxr2oww2x5o
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: command-registry
timestamp: Tue 2008-10-21 19:49:10 +0100
message:
merge with bzr.dev
added:
doc/developers/cycle.txt cycle.txt-20081017031739-rw24r0cywm2ok3xu-1
tools/packaging/lp-upload-release lpuploadrelease-20081020075647-56zdf9z6yav1bx81-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3777.11.2
revision-id: aaron at aaronbentley.com-20081021184829-wb5obp7gst2207ge
parent: aaron at aaronbentley.com-20081021140831-a8sqdr5sg8y82z4e
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: command-registry
timestamp: Tue 2008-10-21 19:48:29 +0100
message:
Avoid getting plugins unnecessarily
modified:
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
------------------------------------------------------------
revno: 3777.11.1
revision-id: aaron at aaronbentley.com-20081021140831-a8sqdr5sg8y82z4e
parent: pqm at pqm.ubuntu.com-20081017223605-ais9run1hp476y1c
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: command-registry
timestamp: Tue 2008-10-21 15:08:31 +0100
message:
Switch from dict to Registry for plugin_cmds
modified:
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
------------------------------------------------------------
revno: 3777.2.11
revision-id: pqm at pqm.ubuntu.com-20081021060139-fpwr4fxr2oww2x5o
parent: pqm at pqm.ubuntu.com-20081021012629-d2xnxqmr42xrtiy2
parent: robertc at robertcollins.net-20081021034713-dhjfb9ypmnyr6nga
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-10-21 07:01:39 +0100
message:
(robertc) Allow recovery of the text when sha1 checks fail. (Robert
Collins)
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
------------------------------------------------------------
revno: 3777.10.2
revision-id: robertc at robertcollins.net-20081021034713-dhjfb9ypmnyr6nga
parent: robertc at robertcollins.net-20081021033614-e29ktibkuh7e5zps
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knits
timestamp: Tue 2008-10-21 14:47:13 +1100
message:
Ensure SHA1KnitCorrupt formats ok.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
------------------------------------------------------------
revno: 3777.10.1
revision-id: robertc at robertcollins.net-20081021033614-e29ktibkuh7e5zps
parent: pqm at pqm.ubuntu.com-20081021012629-d2xnxqmr42xrtiy2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knits
timestamp: Tue 2008-10-21 14:36:14 +1100
message:
Embed the failed text in sha1 knit errors.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
------------------------------------------------------------
revno: 3777.2.10
revision-id: pqm at pqm.ubuntu.com-20081021012629-d2xnxqmr42xrtiy2
parent: pqm at pqm.ubuntu.com-20081020020359-7f8c4hviijt1m5vq
parent: mbp at sourcefrog.net-20081021004957-hb823jymj6m2nbpw
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-10-21 02:26:29 +0100
message:
(mbp) add lp-upload-release script
added:
tools/packaging/lp-upload-release lpuploadrelease-20081020075647-56zdf9z6yav1bx81-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3777.9.5
revision-id: mbp at sourcefrog.net-20081021004957-hb823jymj6m2nbpw
parent: mbp at sourcefrog.net-20081020235812-itg90mk0u4dez92z
parent: pqm at pqm.ubuntu.com-20081020020359-7f8c4hviijt1m5vq
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: release-scripts
timestamp: Tue 2008-10-21 11:49:57 +1100
message:
merge trunk
added:
doc/developers/cycle.txt cycle.txt-20081017031739-rw24r0cywm2ok3xu-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3777.9.4
revision-id: mbp at sourcefrog.net-20081020235812-itg90mk0u4dez92z
parent: mbp at sourcefrog.net-20081020080933-xba7zw9ffozm6brl
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: release-scripts
timestamp: Tue 2008-10-21 10:58:12 +1100
message:
lp-upload-release now handles names like bzr-1.8.tar.gz
modified:
tools/packaging/lp-upload-release lpuploadrelease-20081020075647-56zdf9z6yav1bx81-1
------------------------------------------------------------
revno: 3777.9.3
revision-id: mbp at sourcefrog.net-20081020080933-xba7zw9ffozm6brl
parent: mbp at sourcefrog.net-20081020075805-txtgvuxddmnnf0vz
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: release-scripts
timestamp: Mon 2008-10-20 19:09:33 +1100
message:
Build zip file from 'make dist' and document this; also tweak standard announcement mail
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3777.9.2
revision-id: mbp at sourcefrog.net-20081020075805-txtgvuxddmnnf0vz
parent: mbp at sourcefrog.net-20081020075705-fervpy1m4xbcjg4y
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: release-scripts
timestamp: Mon 2008-10-20 18:58:05 +1100
message:
Doc lp-upload-release
modified:
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3777.9.1
revision-id: mbp at sourcefrog.net-20081020075705-fervpy1m4xbcjg4y
parent: pqm at pqm.ubuntu.com-20081015214444-ztwoizx180edy73v
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: release-scripts
timestamp: Mon 2008-10-20 18:57:05 +1100
message:
Add a script to upload a download file to Ubuntu
added:
tools/packaging/lp-upload-release lpuploadrelease-20081020075647-56zdf9z6yav1bx81-1
------------------------------------------------------------
revno: 3777.2.9
revision-id: pqm at pqm.ubuntu.com-20081020020359-7f8c4hviijt1m5vq
parent: pqm at pqm.ubuntu.com-20081017223605-ais9run1hp476y1c
parent: john at arbash-meinel.com-20081017214424-28m1fwycfvlydpf4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-10-20 03:03:59 +0100
message:
(mbp) Updated release process docs
added:
doc/developers/cycle.txt cycle.txt-20081017031739-rw24r0cywm2ok3xu-1
modified:
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3777.8.2
revision-id: john at arbash-meinel.com-20081017214424-28m1fwycfvlydpf4
parent: mbp at sourcefrog.net-20081017080503-u801jhy4h66dy638
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: release_doc_update
timestamp: Fri 2008-10-17 16:44:24 -0500
message:
Rewrap some doc text, update the diff hunk to be accurate for current NEWS.
modified:
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3777.8.1
revision-id: mbp at sourcefrog.net-20081017080503-u801jhy4h66dy638
parent: pqm at pqm.ubuntu.com-20081015214444-ztwoizx180edy73v
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Fri 2008-10-17 19:05:03 +1100
message:
Updated release process documentation.
This separates out the things that need to be done *to make the release*
from things that are done at other times in the cycle or by other people
doc.bazaar-vcs.org is now automatically updated and doesn't need manual
intervention.
added:
doc/developers/cycle.txt cycle.txt-20081017031739-rw24r0cywm2ok3xu-1
modified:
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3777.2.8
revision-id: pqm at pqm.ubuntu.com-20081017223605-ais9run1hp476y1c
parent: pqm at pqm.ubuntu.com-20081017220336-a1m0npnjf9ojnfbj
parent: john at arbash-meinel.com-20081017195853-i31d3g7sur1prgvi
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-10-17 23:36:05 +0100
message:
(jam) Re-enable the fast-path for annotate,
and allow it to work with non-lh compression parents.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3777.7.2
revision-id: john at arbash-meinel.com-20081017195853-i31d3g7sur1prgvi
parent: john at arbash-meinel.com-20081017161420-q7au1ngfvf2rwb4j
parent: pqm at pqm.ubuntu.com-20081017125551-l5zi213vopny82nt
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanups
timestamp: Fri 2008-10-17 14:58:53 -0500
message:
Merge bzr.dev 3783, resolve NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3777.7.1
revision-id: john at arbash-meinel.com-20081017161420-q7au1ngfvf2rwb4j
parent: pqm at pqm.ubuntu.com-20081014031836-0pn8u98igc7gvtv0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanups
timestamp: Fri 2008-10-17 11:14:20 -0500
message:
Two fixes for annotate code.
Restore the fast path when a branch is not stacked.
Handle when compression_parent is not the left-hand parent.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3777.2.7
revision-id: pqm at pqm.ubuntu.com-20081017220336-a1m0npnjf9ojnfbj
parent: pqm at pqm.ubuntu.com-20081017125551-l5zi213vopny82nt
parent: aaron at aaronbentley.com-20081017142511-jr470g67voko39dd
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-10-17 23:03:36 +0100
message:
Include staging in lp-login, remove username from lp: urls (abentley)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
------------------------------------------------------------
revno: 3777.1.22
revision-id: aaron at aaronbentley.com-20081017142511-jr470g67voko39dd
parent: aaron at aaronbentley.com-20081017142120-tuh84cyuh9z6emod
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remove-url-username
timestamp: Fri 2008-10-17 10:25:11 -0400
message:
Add name
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3777.1.21
revision-id: aaron at aaronbentley.com-20081017142120-tuh84cyuh9z6emod
parent: aaron at aaronbentley.com-20081017140437-po5jewwstmc1lo6w
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remove-url-username
timestamp: Fri 2008-10-17 10:21:20 -0400
message:
Stop including usernames in resolved lp: urls
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
------------------------------------------------------------
revno: 3777.1.20
revision-id: aaron at aaronbentley.com-20081017140437-po5jewwstmc1lo6w
parent: aaron at aaronbentley.com-20081017133742-7ysoh4gx7kxs29lh
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: update-staging
timestamp: Fri 2008-10-17 10:04:37 -0400
message:
Include staging in launchpad-login authentication.
modified:
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
------------------------------------------------------------
revno: 3777.1.19
revision-id: aaron at aaronbentley.com-20081017133742-7ysoh4gx7kxs29lh
parent: aaron at aaronbentley.com-20081017122234-4lygct4bu1hsube6
parent: pqm at pqm.ubuntu.com-20081017125551-l5zi213vopny82nt
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: update-staging
timestamp: Fri 2008-10-17 09:37:42 -0400
message:
Merge with bzr.dev
modified:
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3777.2.6
revision-id: pqm at pqm.ubuntu.com-20081017125551-l5zi213vopny82nt
parent: pqm at pqm.ubuntu.com-20081016213135-0115pw9c95l2dyxq
parent: aaron at aaronbentley.com-20081017122234-4lygct4bu1hsube6
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-10-17 13:55:51 +0100
message:
Implement default ssh usernames via launchpad-login (abentley)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
------------------------------------------------------------
revno: 3777.1.18
revision-id: aaron at aaronbentley.com-20081017122234-4lygct4bu1hsube6
parent: aaron at aaronbentley.com-20081016184810-ago29htjdh2z0x0t
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: launchpad-login
timestamp: Fri 2008-10-17 08:22:34 -0400
message:
Fix None handling wrt auth upgrades
modified:
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
------------------------------------------------------------
revno: 3777.1.17
revision-id: aaron at aaronbentley.com-20081016184810-ago29htjdh2z0x0t
parent: aaron at aaronbentley.com-20081016184139-ve0w21oeg0by6he6
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: launchpad-login
timestamp: Thu 2008-10-16 14:48:10 -0400
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3777.1.16
revision-id: aaron at aaronbentley.com-20081016184139-ve0w21oeg0by6he6
parent: aaron at aaronbentley.com-20081016183519-llt3cr4n24ymrlrh
parent: aaron at aaronbentley.com-20081016183758-1c4qosfpmdoee03b
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: launchpad-login
timestamp: Thu 2008-10-16 14:41:39 -0400
message:
Merge with lower thread
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3777.6.3
revision-id: aaron at aaronbentley.com-20081016183758-1c4qosfpmdoee03b
parent: aaron at aaronbentley.com-20081016183032-cybgqp6y0ip27mem
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: set_credentials
timestamp: Thu 2008-10-16 14:37:58 -0400
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3777.1.15
revision-id: aaron at aaronbentley.com-20081016183519-llt3cr4n24ymrlrh
parent: aaron at aaronbentley.com-20081016183220-7e692v9fac5613zb
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: launchpad-login
timestamp: Thu 2008-10-16 14:35:19 -0400
message:
Update docs
modified:
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
------------------------------------------------------------
revno: 3777.1.14
revision-id: aaron at aaronbentley.com-20081016183220-7e692v9fac5613zb
parent: aaron at aaronbentley.com-20081016183043-v3d3226g1x7c05ns
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: launchpad-login
timestamp: Thu 2008-10-16 14:32:20 -0400
message:
Adjust for new set_credentials signature
modified:
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
------------------------------------------------------------
revno: 3777.1.13
revision-id: aaron at aaronbentley.com-20081016183043-v3d3226g1x7c05ns
parent: aaron at aaronbentley.com-20081016160555-6ux64504nzwyxog9
parent: aaron at aaronbentley.com-20081016183032-cybgqp6y0ip27mem
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: launchpad-login
timestamp: Thu 2008-10-16 14:30:43 -0400
message:
Merge set_credentials into launchpad-login
modified:
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
------------------------------------------------------------
revno: 3777.6.2
revision-id: aaron at aaronbentley.com-20081016183032-cybgqp6y0ip27mem
parent: aaron at aaronbentley.com-20081016182657-1xi0vmda0iffc2g8
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: set_credentials
timestamp: Thu 2008-10-16 14:30:32 -0400
message:
Reverse order of scheme and password
modified:
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
------------------------------------------------------------
revno: 3777.6.1
revision-id: aaron at aaronbentley.com-20081016182657-1xi0vmda0iffc2g8
parent: aaron at aaronbentley.com-20081016160425-z6e33epyqltcn6wj
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: set_credentials
timestamp: Thu 2008-10-16 14:26:57 -0400
message:
Update docs
modified:
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
------------------------------------------------------------
revno: 3777.1.12
revision-id: aaron at aaronbentley.com-20081016160555-6ux64504nzwyxog9
parent: aaron at aaronbentley.com-20081016160425-z6e33epyqltcn6wj
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: launchpad-login
timestamp: Thu 2008-10-16 12:05:55 -0400
message:
Enable configuring ssh auth from launchpad-login, with auto-upgrade.
modified:
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
------------------------------------------------------------
revno: 3777.1.11
revision-id: aaron at aaronbentley.com-20081016160425-z6e33epyqltcn6wj
parent: aaron at aaronbentley.com-20081016132940-24l3emoih65h1nsq
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: launchpad-login
timestamp: Thu 2008-10-16 12:04:25 -0400
message:
Ensure changed-name updates clear old values
modified:
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
------------------------------------------------------------
revno: 3777.1.10
revision-id: aaron at aaronbentley.com-20081016132940-24l3emoih65h1nsq
parent: aaron at aaronbentley.com-20081016130333-0cti66q6xo5napqd
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: launchpad-login
timestamp: Thu 2008-10-16 09:29:40 -0400
message:
Ensure credentials are stored
modified:
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
------------------------------------------------------------
revno: 3777.1.9
revision-id: aaron at aaronbentley.com-20081016130333-0cti66q6xo5napqd
parent: aaron at aaronbentley.com-20081015211105-49xq5y8jnla6clni
parent: aaron at aaronbentley.com-20081016130324-547q140zwnh6g8aq
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: launchpad-login
timestamp: Thu 2008-10-16 09:03:33 -0400
message:
Merge authconfig into launchpad-login
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3777.5.1
revision-id: aaron at aaronbentley.com-20081016130324-547q140zwnh6g8aq
parent: aaron at aaronbentley.com-20081015191156-mrykcuir96zszuh7
parent: pqm at pqm.ubuntu.com-20081016043554-38i4ho6svnlyba65
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: authconfig
timestamp: Thu 2008-10-16 09:03:24 -0400
message:
Merge with bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3777.1.8
revision-id: aaron at aaronbentley.com-20081015211105-49xq5y8jnla6clni
parent: aaron at aaronbentley.com-20081015191156-mrykcuir96zszuh7
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: launchpad-login
timestamp: Wed 2008-10-15 17:11:05 -0400
message:
Commit work-in-progress
modified:
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
------------------------------------------------------------
revno: 3777.2.5
revision-id: pqm at pqm.ubuntu.com-20081016213135-0115pw9c95l2dyxq
parent: pqm at pqm.ubuntu.com-20081016204321-ayg99pvl7sr7y6qu
parent: aaron at aaronbentley.com-20081016190501-rvjm4em0kmlilhyf
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-10-16 22:31:35 +0100
message:
PreviewTree.iter_changes accepts all standard parameters (abentley)
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.19.4
revision-id: aaron at aaronbentley.com-20081016190501-rvjm4em0kmlilhyf
parent: aaron at aaronbentley.com-20081014030954-g0ht1o6t40v7ecdp
parent: aaron at aaronbentley.com-20081016190448-2a4ilw7bqsw08190
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: fix-iter-changes
timestamp: Thu 2008-10-16 15:05:01 -0400
message:
Merge direct-patching into fix-iter-changes
modified:
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
------------------------------------------------------------
revno: 3363.19.3
revision-id: aaron at aaronbentley.com-20081014030954-g0ht1o6t40v7ecdp
parent: aaron at aaronbentley.com-20081014025056-dlyb96nmtv4aenuj
parent: aaron at aaronbentley.com-20081014030136-8h0rtrxhq8q1d1zu
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: fix-iter-changes
timestamp: Mon 2008-10-13 23:09:54 -0400
message:
Merge direct-patching into fix-iter-changes
modified:
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
------------------------------------------------------------
revno: 3363.19.2
revision-id: aaron at aaronbentley.com-20081014025056-dlyb96nmtv4aenuj
parent: aaron at aaronbentley.com-20081013150916-fq1vm0mvw72jcc3n
parent: aaron at aaronbentley.com-20081014025051-hd8sbbq3yeqrb49t
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: fix-iter-changes
timestamp: Mon 2008-10-13 22:50:56 -0400
message:
Merge direct-patching into fix-iter-changes
added:
bzrlib/tests/blackbox/test_dump_btree.py test_dump_btree.py-20081008203335-zkpcq230b6vubszz-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3363.19.1
revision-id: aaron at aaronbentley.com-20081013150916-fq1vm0mvw72jcc3n
parent: aaron at aaronbentley.com-20081010231442-6be32m59zo304a90
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: merge-into2
timestamp: Mon 2008-10-13 11:09:16 -0400
message:
Make PreviewTree.iter_changes accept all options.
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3777.2.4
revision-id: pqm at pqm.ubuntu.com-20081016204321-ayg99pvl7sr7y6qu
parent: pqm at pqm.ubuntu.com-20081016131807-r3p1hsepd24feegv
parent: aaron at aaronbentley.com-20081016190448-2a4ilw7bqsw08190
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-10-16 21:43:21 +0100
message:
Add iter_patched_from_hunks to reduce API friction (abentley)
modified:
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
------------------------------------------------------------
revno: 3363.18.4
revision-id: aaron at aaronbentley.com-20081016190448-2a4ilw7bqsw08190
parent: aaron at aaronbentley.com-20081014030136-8h0rtrxhq8q1d1zu
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: direct-patching
timestamp: Thu 2008-10-16 15:04:48 -0400
message:
Updates from review (and a doc update)
modified:
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
------------------------------------------------------------
revno: 3363.18.3
revision-id: aaron at aaronbentley.com-20081014030136-8h0rtrxhq8q1d1zu
parent: aaron at aaronbentley.com-20081014025051-hd8sbbq3yeqrb49t
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: direct-patching
timestamp: Mon 2008-10-13 23:01:36 -0400
message:
Add tests for iter_patched_from_hunks
modified:
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
------------------------------------------------------------
revno: 3363.18.2
revision-id: aaron at aaronbentley.com-20081014025051-hd8sbbq3yeqrb49t
parent: aaron at aaronbentley.com-20081010231442-6be32m59zo304a90
parent: aaron at aaronbentley.com-20081014024517-pu1q1kz1v51rvk9f
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: direct-patching
timestamp: Mon 2008-10-13 22:50:51 -0400
message:
Merge merge-into2 into direct-patching
added:
bzrlib/tests/blackbox/test_dump_btree.py test_dump_btree.py-20081008203335-zkpcq230b6vubszz-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3363.18.1
revision-id: aaron at aaronbentley.com-20081010231442-6be32m59zo304a90
parent: aaron at aaronbentley.com-20081010225929-08pkzo68wbfr3yqg
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: merge-into2
timestamp: Fri 2008-10-10 19:14:42 -0400
message:
Allow patching directly from parsed hunks
modified:
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
------------------------------------------------------------
revno: 3777.2.3
revision-id: pqm at pqm.ubuntu.com-20081016131807-r3p1hsepd24feegv
parent: pqm at pqm.ubuntu.com-20081016043554-38i4ho6svnlyba65
parent: v.ladeuil+lp at free.fr-20081016121145-0a86u6kjd4prz3nn
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-10-16 14:18:07 +0100
message:
Trivial doc fix
modified:
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3777.4.1
revision-id: v.ladeuil+lp at free.fr-20081016121145-0a86u6kjd4prz3nn
parent: pqm at pqm.ubuntu.com-20081016043554-38i4ho6svnlyba65
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 284343-doc
timestamp: Thu 2008-10-16 14:11:45 +0200
message:
Use '.patch. instead of '.diff'.
* HACKING.txt:
Fix the only occurrence of '.diff' in the whole documentation,
using '.patch' instead as we do in everywhere else.
modified:
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3777.2.2
revision-id: pqm at pqm.ubuntu.com-20081016043554-38i4ho6svnlyba65
parent: pqm at pqm.ubuntu.com-20081015214444-ztwoizx180edy73v
parent: mbp at sourcefrog.net-20081016035842-77pczqghpnd5rxkt
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-10-16 05:35:54 +0100
message:
(mbp) merge 1.8final back to trunk
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3777.3.1
revision-id: mbp at sourcefrog.net-20081016035842-77pczqghpnd5rxkt
parent: pqm at pqm.ubuntu.com-20081015214444-ztwoizx180edy73v
parent: pqm at pqm.ubuntu.com-20081016023607-p9j30et9foqm0wa7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Thu 2008-10-16 14:58:42 +1100
message:
merge 1.8final back to trunk
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3763.3.3
tags: bzr-1.8
revision-id: pqm at pqm.ubuntu.com-20081016023607-p9j30et9foqm0wa7
parent: pqm at pqm.ubuntu.com-20081009001122-ftxm8443zmis8vm4
parent: mbp at sourcefrog.net-20081016015506-kr5oefh484xj90aw
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.8
timestamp: Thu 2008-10-16 03:36:07 +0100
message:
(mbp) prepare 1.8final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
------------------------------------------------------------
revno: 3763.7.2
revision-id: mbp at sourcefrog.net-20081016015506-kr5oefh484xj90aw
parent: mbp at sourcefrog.net-20081016015304-6rq775qvvlxtadk4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.8
timestamp: Thu 2008-10-16 12:55:06 +1100
message:
Release bzr 1.8 final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3763.7.1
revision-id: mbp at sourcefrog.net-20081016015304-6rq775qvvlxtadk4
parent: pqm at pqm.ubuntu.com-20081009001122-ftxm8443zmis8vm4
parent: andrew.bennetts at canonical.com-20081010070446-mqf1sj2g3fy7u6j1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.8
timestamp: Thu 2008-10-16 12:53:04 +1100
message:
Merge Andrew's fix for 230902
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
------------------------------------------------------------
revno: 3763.6.1
revision-id: andrew.bennetts at canonical.com-20081010070446-mqf1sj2g3fy7u6j1
parent: pqm at pqm.ubuntu.com-20081009001122-ftxm8443zmis8vm4
parent: andrew.bennetts at canonical.com-20081007115411-uq38cuumnrw0trsm
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: push-unlock-1.8
timestamp: Fri 2008-10-10 18:04:46 +1100
message:
Merge fix for #230902, adding NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
------------------------------------------------------------
revno: 3758.1.1
revision-id: andrew.bennetts at canonical.com-20081007115411-uq38cuumnrw0trsm
parent: pqm at pqm.ubuntu.com-20081001235145-nh3r3qcg0nwwmvdg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: push-unlock
timestamp: Tue 2008-10-07 22:54:11 +1100
message:
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock()
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
------------------------------------------------------------
revno: 3763.3.2
revision-id: pqm at pqm.ubuntu.com-20081009001122-ftxm8443zmis8vm4
parent: pqm at pqm.ubuntu.com-20081007091257-ec2725q2xsrji7dn
parent: mbp at sourcefrog.net-20081008225502-ekthueaqnz3cutg3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.8
timestamp: Thu 2008-10-09 01:11:22 +0100
message:
(mbp) define -DWIN32 for pyrex
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3763.5.4
revision-id: mbp at sourcefrog.net-20081008225502-ekthueaqnz3cutg3
parent: mbp at sourcefrog.net-20081008053353-aqjccu3zsifjz0f1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 277481-win32-pyrex
timestamp: Thu 2008-10-09 09:55:02 +1100
message:
News for 277481
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3763.5.3
revision-id: mbp at sourcefrog.net-20081008053353-aqjccu3zsifjz0f1
parent: mbp at sourcefrog.net-20081008011605-tzgv9owfn2wde4cg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 277481-win32-pyrex
timestamp: Wed 2008-10-08 16:33:53 +1100
message:
Review feedback on add_pyrex_extension
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3763.5.2
revision-id: mbp at sourcefrog.net-20081008011605-tzgv9owfn2wde4cg
parent: mbp at sourcefrog.net-20081008011111-z68x2eto2j52648n
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.8
timestamp: Wed 2008-10-08 12:16:05 +1100
message:
Set -DWIN32 for all pyrex extensions, not one by one
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3763.5.1
revision-id: mbp at sourcefrog.net-20081008011111-z68x2eto2j52648n
parent: pqm at pqm.ubuntu.com-20081007091257-ec2725q2xsrji7dn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.8
timestamp: Wed 2008-10-08 12:11:11 +1100
message:
WIN32 must be defined when building all Pyrex extensions on Windows (#277481, from bialix)
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3777.2.1
revision-id: pqm at pqm.ubuntu.com-20081015214444-ztwoizx180edy73v
parent: pqm at pqm.ubuntu.com-20081014031836-0pn8u98igc7gvtv0
parent: aaron at aaronbentley.com-20081015191156-mrykcuir96zszuh7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-10-15 22:44:44 +0100
message:
Enable specifying default ssh username in authentication.conf
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
------------------------------------------------------------
revno: 3777.1.7
revision-id: aaron at aaronbentley.com-20081015191156-mrykcuir96zszuh7
parent: aaron at aaronbentley.com-20081015190711-so8c7mo9rfzs479e
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: ssh-authconfig
timestamp: Wed 2008-10-15 15:11:56 -0400
message:
Restore AuthenticationConfig
modified:
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
------------------------------------------------------------
revno: 3777.1.6
revision-id: aaron at aaronbentley.com-20081015190711-so8c7mo9rfzs479e
parent: aaron at aaronbentley.com-20081015185954-6hm2y83u6fddrkeg
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: ssh-authconfig
timestamp: Wed 2008-10-15 15:07:11 -0400
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3777.1.5
revision-id: aaron at aaronbentley.com-20081015185954-6hm2y83u6fddrkeg
parent: aaron at aaronbentley.com-20081015185907-lw5srt2ah0huccvt
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: ssh-authconfig
timestamp: Wed 2008-10-15 14:59:54 -0400
message:
Remove AuthenticationConfig handling from Paramiko SSHVendor
modified:
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
------------------------------------------------------------
revno: 3777.1.4
revision-id: aaron at aaronbentley.com-20081015185907-lw5srt2ah0huccvt
parent: aaron at aaronbentley.com-20081015184528-mcdgasht0vz5bo8k
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: ssh-authconfig
timestamp: Wed 2008-10-15 14:59:07 -0400
message:
bzr+ssh and sftp both use ssh scheme.
modified:
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 3777.1.3
revision-id: aaron at aaronbentley.com-20081015184528-mcdgasht0vz5bo8k
parent: aaron at aaronbentley.com-20081015172318-kg6h9v0daz8m66ns
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: ssh-authconfig
timestamp: Wed 2008-10-15 14:45:28 -0400
message:
Use SSH default username from authentication.conf
modified:
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 3777.1.2
revision-id: aaron at aaronbentley.com-20081015172318-kg6h9v0daz8m66ns
parent: aaron at aaronbentley.com-20081015155150-ewayhro15dhve4cs
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: ssh-authconfig
timestamp: Wed 2008-10-15 13:23:18 -0400
message:
Make testing more thorough
modified:
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
------------------------------------------------------------
revno: 3777.1.1
revision-id: aaron at aaronbentley.com-20081015155150-ewayhro15dhve4cs
parent: pqm at pqm.ubuntu.com-20081014031836-0pn8u98igc7gvtv0
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: ssh-authconfig
timestamp: Wed 2008-10-15 11:51:50 -0400
message:
Use auth.conf for sftp
modified:
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
-------------- next part --------------
Diff too large for email (2003 lines, the limit is 1000).
More information about the bazaar-commits
mailing list