Rev 2537: merge trunk in http://sourcefrog.net/bzr/cleanup-runbzr
Martin Pool
mbp at sourcefrog.net
Wed Jun 27 02:43:07 BST 2007
At http://sourcefrog.net/bzr/cleanup-runbzr
------------------------------------------------------------
revno: 2537
revision-id: mbp at sourcefrog.net-20070627014303-z4ichnqm91hhm4ww
parent: mbp at sourcefrog.net-20070626101529-omfq0howuazwtr3s
parent: pqm at pqm.ubuntu.com-20070626234309-j6n7rdpbmjjfgicn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Wed 2007-06-27 11:43:03 +1000
message:
merge trunk
added:
bzrlib/api.py api.py-20070626082640-35lspz7j0ys7a8ld-1
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/smtp_connection.py smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
bzrlib/tests/blackbox/test_lsprof.py test_lsprof.py-20070622025641-nbsm2svy8anvj9df-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
doc/developers/dirstate.txt dirstate.txt-20070618020404-cdhv0ecgrukomemg-2
doc/developers/planned-change-integration.txt plannedchangeintegra-20070619004702-i1b3ccamjtfaoq6w-1
doc/developers/scratch.txt scratch.txt-20070618020404-cdhv0ecgrukomemg-3
doc/developers/uncommit.txt uncommit.txt-20070621042721-4clw8ucb9u9yda2h-1
renamed:
bzrlib/graph.py => bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/tests/test_graph.py => bzrlib/tests/test_deprecated_graph.py testgraph.py-20050905070950-42e6c958106610fd
doc/developers/performance-commit.txt => doc/developers/commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
bzrlib/tests/blackbox/test_bundle.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_api.py testapi.py-20051027033546-6f9be2d308d18a52
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_lsprof.py test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weave_commands.py weave_commands.py-20060320231507-8e9f300bffc1aa19
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance-use-case-analysis.txt performanceusecasean-20070508045640-zneiu1yzbci574c6-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/planned-performance-changes.txt plannedperformancech-20070604053752-bnjdhako613xfufb-1
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/tests/test_deprecated_graph.py testgraph.py-20050905070950-42e6c958106610fd
doc/developers/commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
------------------------------------------------------------
revno: 2530.1.24
merged: pqm at pqm.ubuntu.com-20070626234309-j6n7rdpbmjjfgicn
parent: pqm at pqm.ubuntu.com-20070626191000-flte155pupv54bcs
parent: robertc at robertcollins.net-20070626224643-50a7lzwugne0d8o0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-27 00:43:09 +0100
message:
(robertc) Export explicit API compatibility for bzrlib.
------------------------------------------------------------
revno: 2530.1.20.2.5
merged: robertc at robertcollins.net-20070626224643-50a7lzwugne0d8o0
parent: robertc at robertcollins.net-20070626085341-pb8fsoij016itqgf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: api_api
timestamp: Wed 2007-06-27 08:46:43 +1000
message:
NEWS entry was incorrectly capitalised.
------------------------------------------------------------
revno: 2530.1.20.2.4
merged: robertc at robertcollins.net-20070626085341-pb8fsoij016itqgf
parent: robertc at robertcollins.net-20070626085220-iovhwfjflk8vffbh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: api_api
timestamp: Tue 2007-06-26 18:53:41 +1000
message:
NEWS.
------------------------------------------------------------
revno: 2530.1.20.2.3
merged: robertc at robertcollins.net-20070626085220-iovhwfjflk8vffbh
parent: robertc at robertcollins.net-20070626082724-q95taws12ajox2io
committer: Robert Collins <robertc at robertcollins.net>
branch nick: api_api
timestamp: Tue 2007-06-26 18:52:20 +1000
message:
Add require_api API.
------------------------------------------------------------
revno: 2530.1.20.2.2
merged: robertc at robertcollins.net-20070626082724-q95taws12ajox2io
parent: robertc at robertcollins.net-20070626065720-w0btzadye6lpq104
committer: Robert Collins <robertc at robertcollins.net>
branch nick: api_api
timestamp: Tue 2007-06-26 18:27:24 +1000
message:
Add helpers to get api versions from objects.
------------------------------------------------------------
revno: 2530.1.20.2.1
merged: robertc at robertcollins.net-20070626065720-w0btzadye6lpq104
parent: pqm at pqm.ubuntu.com-20070625174647-pocypsjmp861qgv7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: api_api
timestamp: Tue 2007-06-26 16:57:20 +1000
message:
API Versioning proposal document.
------------------------------------------------------------
revno: 2530.1.23
merged: pqm at pqm.ubuntu.com-20070626191000-flte155pupv54bcs
parent: pqm at pqm.ubuntu.com-20070626061722-8m49gdqd8cb8zc0c
parent: john at arbash-meinel.com-20070626141056-zr6wslndfw8tkg5d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-26 20:10:00 +0100
message:
(Adeodato Simó) fix bug #120591 by using exact encoding for merge directives.
------------------------------------------------------------
revno: 2530.1.22.1.1
merged: john at arbash-meinel.com-20070626141056-zr6wslndfw8tkg5d
parent: pqm at pqm.ubuntu.com-20070626061722-8m49gdqd8cb8zc0c
parent: dato at net.com.org.es-20070617161104-8mqczaz3oobfg0xy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2007-06-26 09:10:56 -0500
message:
(Adeodato Simó) fix bug #120591 by using exact encoding for merge directives.
------------------------------------------------------------
revno: 2530.3.1
merged: dato at net.com.org.es-20070617161104-8mqczaz3oobfg0xy
parent: pqm at pqm.ubuntu.com-20070615082222-98j9j9nbl6p2dx0m
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.merge_directive_exact_encoding
timestamp: Sun 2007-06-17 17:11:04 +0100
message:
Add encoding_type = 'exact' to cmd_merge_directive. (LP #120591)
------------------------------------------------------------
revno: 2530.1.22
merged: pqm at pqm.ubuntu.com-20070626061722-8m49gdqd8cb8zc0c
parent: pqm at pqm.ubuntu.com-20070626045533-qni2zzf3cv41c1t8
parent: ian.clatworthy at internode.on.net-20070626043739-2ksn3hbnynt6zggj
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-26 07:17:22 +0100
message:
Refactor of commit to walk the working inventory less
------------------------------------------------------------
revno: 2530.1.20.1.1
merged: ian.clatworthy at internode.on.net-20070626043739-2ksn3hbnynt6zggj
parent: pqm at pqm.ubuntu.com-20070625174647-pocypsjmp861qgv7
parent: ian.clatworthy at internode.on.net-20070621001613-j04fg9qt7kh48llg
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Tue 2007-06-26 14:37:39 +1000
message:
Refactor of commit to walk the working inventory less
------------------------------------------------------------
revno: 2530.1.11.1.1
merged: ian.clatworthy at internode.on.net-20070621001613-j04fg9qt7kh48llg
parent: pqm at pqm.ubuntu.com-20070620205507-uuolokc2e0eckrb7
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.fast-commit
timestamp: Thu 2007-06-21 10:16:13 +1000
message:
Refactor commit.commit() to walk the working inventory once/less
------------------------------------------------------------
revno: 2530.1.21
merged: pqm at pqm.ubuntu.com-20070626045533-qni2zzf3cv41c1t8
parent: pqm at pqm.ubuntu.com-20070625174647-pocypsjmp861qgv7
parent: mbp at sourcefrog.net-20070626041504-sxdk4kjal60vnbxl
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-26 05:55:33 +0100
message:
(mbp) design notes for commit and uncommit
------------------------------------------------------------
revno: 2513.1.7
merged: mbp at sourcefrog.net-20070626041504-sxdk4kjal60vnbxl
parent: mbp at sourcefrog.net-20070626032049-whv447fmgyj2lf19
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Tue 2007-06-26 14:15:04 +1000
message:
fix another broken doc link
------------------------------------------------------------
revno: 2513.1.6
merged: mbp at sourcefrog.net-20070626032049-whv447fmgyj2lf19
parent: mbp at sourcefrog.net-20070621074424-ayfp2ycf98edc9ma
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Tue 2007-06-26 13:20:49 +1000
message:
Remove broken link to status design document
------------------------------------------------------------
revno: 2513.1.5
merged: mbp at sourcefrog.net-20070621074424-ayfp2ycf98edc9ma
parent: mbp at sourcefrog.net-20070621054143-ut9cw6zbkt3vwdzc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-06-21 17:44:24 +1000
message:
More analysis of commit
------------------------------------------------------------
revno: 2513.1.4
merged: mbp at sourcefrog.net-20070621054143-ut9cw6zbkt3vwdzc
parent: mbp at sourcefrog.net-20070621042747-e3g0tdn8if750mv5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-06-21 15:41:43 +1000
message:
More commit documentation
------------------------------------------------------------
revno: 2513.1.3
merged: mbp at sourcefrog.net-20070621042747-e3g0tdn8if750mv5
parent: mbp at sourcefrog.net-20070618065424-awsn4t4tv2bi4okt
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-06-21 14:27:47 +1000
message:
More commit specs
------------------------------------------------------------
revno: 2513.1.2
merged: mbp at sourcefrog.net-20070618065424-awsn4t4tv2bi4okt
parent: mbp at sourcefrog.net-20070618020420-3e205xzlugq682j9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Mon 2007-06-18 16:54:24 +1000
message:
Remove duplicated commit use case documentation
------------------------------------------------------------
revno: 2513.1.1
merged: mbp at sourcefrog.net-20070618020420-3e205xzlugq682j9
parent: pqm at pqm.ubuntu.com-20070606144200-rmsd3gyelimh8kal
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Mon 2007-06-18 12:04:20 +1000
message:
(in progress) analysis of commit
------------------------------------------------------------
revno: 2530.1.20
merged: pqm at pqm.ubuntu.com-20070625174647-pocypsjmp861qgv7
parent: pqm at pqm.ubuntu.com-20070625151932-yshsnfirhwggx07b
parent: john at arbash-meinel.com-20070625165906-rj1g8amflmksb95i
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-25 18:46:47 +0100
message:
(Vincent Ladeuil) Fix bug #121889 by working around urllib2 limitation.
------------------------------------------------------------
revno: 2530.1.17.2.1
merged: john at arbash-meinel.com-20070625165906-rj1g8amflmksb95i
parent: pqm at pqm.ubuntu.com-20070625092303-yr8bqbke8snrmkig
parent: v.ladeuil+lp at free.fr-20070624152356-2z0c3j94udya3mge
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-06-25 11:59:06 -0500
message:
(Vincent Ladeuil) Fix bug #121889 by working around urllib2 limitation.
------------------------------------------------------------
revno: 2530.1.15.2.2
merged: v.ladeuil+lp at free.fr-20070624152356-2z0c3j94udya3mge
parent: v.ladeuil+lp at free.fr-20070624151640-5tg62jb5g9tqvybd
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 121889
timestamp: Sun 2007-06-24 17:23:56 +0200
message:
Update NEWS.
------------------------------------------------------------
revno: 2530.1.15.2.1
merged: v.ladeuil+lp at free.fr-20070624151640-5tg62jb5g9tqvybd
parent: pqm at pqm.ubuntu.com-20070622160825-17gv0lorkzbr3x76
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 121889
timestamp: Sun 2007-06-24 17:16:40 +0200
message:
Fix 121889 by working around urllib2 bug.
* tests/HTTPTestUtil.py:
(DigestAuthRequestHandler.send_header_auth_reqed): python-2.4.1
fail to decode the header without the quotes. The RFC do not
require them, python >= 2.4.4 handles them gracefully. Not a big
deal.
* tests/test_http.py:
(TestAuth.setUp): Add a comment in hope I will not running around
shouting: "Who takes my traces ? Gimme my traces !" when running
the only tests who capture their own traces without showing them.
* transport/http/_urllib2_wrappers.py (BasicAuthHandler,
DigestAuthHandler): Not directly related to the bug, bug good to
fix anyway, the digest auth should be preferred to the basic
one. To do so, the digest handler should be tried before the basic
one.
* builtins.py:
(cmd_selftest.run): Fix typo. Note to reviewers: No, it's not
related to the bug. No there are no tests for that. No I don't
intend to write some :) But I'll understand if you veto that
because you want to take care of it :D
------------------------------------------------------------
revno: 2530.1.19
merged: pqm at pqm.ubuntu.com-20070625151932-yshsnfirhwggx07b
parent: pqm at pqm.ubuntu.com-20070625134610-4y70duw4fcuj8txe
parent: abentley at panoramicfeedback.com-20070625142708-m7i0qrtxi7k5y2o7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-25 16:19:32 +0100
message:
Don't suppress pipe errors for non-display commaneds (Belchenko, #87178)
------------------------------------------------------------
revno: 2530.1.18.1.1
merged: abentley at panoramicfeedback.com-20070625142708-m7i0qrtxi7k5y2o7
parent: pqm at pqm.ubuntu.com-20070625134610-4y70duw4fcuj8txe
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Mon 2007-06-25 10:27:08 -0400
message:
Don't suppress pipe errors for non-display commaneds (Belchenko, #87178)
------------------------------------------------------------
revno: 2530.1.18
merged: pqm at pqm.ubuntu.com-20070625134610-4y70duw4fcuj8txe
parent: pqm at pqm.ubuntu.com-20070625092303-yr8bqbke8snrmkig
parent: abentley at panoramicfeedback.com-20070625131732-8jp7229jrt5r7khp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-25 14:46:10 +0100
message:
Add SMTPConnection class (Adeodato Simó)
------------------------------------------------------------
revno: 2530.1.17.1.1
merged: abentley at panoramicfeedback.com-20070625131732-8jp7229jrt5r7khp
parent: pqm at pqm.ubuntu.com-20070625092303-yr8bqbke8snrmkig
parent: dato at net.com.org.es-20070623011151-i21l3zr5igkphd53
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Mon 2007-06-25 09:17:32 -0400
message:
Add SMTPConnection class (Adeodato Simó)
------------------------------------------------------------
revno: 2530.1.5.2.5
merged: dato at net.com.org.es-20070623011151-i21l3zr5igkphd53
parent: dato at net.com.org.es-20070620003933-cjj1lq1lqgav5gm6
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.smtp_connection
timestamp: Sat 2007-06-23 02:11:51 +0100
message:
Fix copyright statement not to contain "by".
------------------------------------------------------------
revno: 2530.1.5.2.4
merged: dato at net.com.org.es-20070620003933-cjj1lq1lqgav5gm6
parent: dato at net.com.org.es-20070620002245-t4ugu7418qmkdtmv
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.smtp_connection
timestamp: Wed 2007-06-20 01:39:33 +0100
message:
Don't use BzrCommandError in non-UI code; create and use an SMTPError
exception instead.
------------------------------------------------------------
revno: 2530.1.5.2.3
merged: dato at net.com.org.es-20070620002245-t4ugu7418qmkdtmv
parent: dato at net.com.org.es-20070619201517-0v2w6kvc9ur7ybpg
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.smtp_connection
timestamp: Wed 2007-06-20 01:22:45 +0100
message:
Import full email.Utils module instead of individual functions, as per
Aaron's review.
------------------------------------------------------------
revno: 2530.1.5.2.2
merged: dato at net.com.org.es-20070619201517-0v2w6kvc9ur7ybpg
parent: dato at net.com.org.es-20070619161126-zwni0l40maepwyj5
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.smtp_connection
timestamp: Tue 2007-06-19 21:15:17 +0100
message:
Swap the order of internal_error and _fmt for consistency.
------------------------------------------------------------
revno: 2530.1.5.2.1
merged: dato at net.com.org.es-20070619161126-zwni0l40maepwyj5
parent: pqm at pqm.ubuntu.com-20070619024533-oand7e7ns9eyis9x
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.smtp_connection
timestamp: Tue 2007-06-19 17:11:26 +0100
message:
New SMTPConnection class, a reduced version of that in bzr-email.
------------------------------------------------------------
revno: 2530.1.17
merged: pqm at pqm.ubuntu.com-20070625092303-yr8bqbke8snrmkig
parent: pqm at pqm.ubuntu.com-20070625072710-uiiv39h32diq0al7
parent: robertc at robertcollins.net-20070622050522-bi07tvlincf1h19m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-25 10:23:03 +0100
message:
(robertc) Relocate TestCaseWithRepository to be more central.
------------------------------------------------------------
revno: 2485.7.2
merged: robertc at robertcollins.net-20070622050522-bi07tvlincf1h19m
parent: robertc at robertcollins.net-20070510141122-91gp5mw7mmv88852
parent: pqm at pqm.ubuntu.com-20070621070542-od3c9uxurv03i41p
committer: Robert Collins <robertc at robertcollins.net>
branch nick: per-repository-test-setup
timestamp: Fri 2007-06-22 15:05:22 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 2485.7.1
merged: robertc at robertcollins.net-20070510141122-91gp5mw7mmv88852
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
committer: Robert Collins <robertc at robertcollins.net>
branch nick: per-repository-test-setup
timestamp: Fri 2007-05-11 00:11:22 +1000
message:
Relocate TestCaseWithRepository to be more central.
------------------------------------------------------------
revno: 2530.1.16
merged: pqm at pqm.ubuntu.com-20070625072710-uiiv39h32diq0al7
parent: pqm at pqm.ubuntu.com-20070622160825-17gv0lorkzbr3x76
parent: mbp at sourcefrog.net-20070625062227-vr2f1nwzlfa4vxb7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-25 08:27:10 +0100
message:
(trivial,mbp) doc updates
------------------------------------------------------------
revno: 2530.1.15.1.2
merged: mbp at sourcefrog.net-20070625062227-vr2f1nwzlfa4vxb7
parent: mbp at sourcefrog.net-20070625051257-fpzcv067ye6a341c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Mon 2007-06-25 16:22:27 +1000
message:
Explain where to get lsprof (John, Alexander)
------------------------------------------------------------
revno: 2530.1.15.1.1
merged: mbp at sourcefrog.net-20070625051257-fpzcv067ye6a341c
parent: pqm at pqm.ubuntu.com-20070622160825-17gv0lorkzbr3x76
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Mon 2007-06-25 15:12:57 +1000
message:
Fix typo and remove version number from README
------------------------------------------------------------
revno: 2530.1.15
merged: pqm at pqm.ubuntu.com-20070622160825-17gv0lorkzbr3x76
parent: pqm at pqm.ubuntu.com-20070621070542-od3c9uxurv03i41p
parent: abentley at panoramicfeedback.com-20070622152719-b843debqfvuykj0y
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-22 17:08:25 +0100
message:
Note lsprof filename via trace.note, not stdout
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.33
merged: abentley at panoramicfeedback.com-20070622152719-b843debqfvuykj0y
parent: abentley at panoramicfeedback.com-20070622152525-6uh2x3zz21s95t5q
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-06-22 11:27:19 -0400
message:
Add NEWS entry
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.32
merged: abentley at panoramicfeedback.com-20070622152525-6uh2x3zz21s95t5q
parent: abentley at panoramicfeedback.com-20070622152245-e5cewlvmqlj3q76w
parent: pqm at pqm.ubuntu.com-20070621070542-od3c9uxurv03i41p
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-06-22 11:25:25 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.31
merged: abentley at panoramicfeedback.com-20070622152245-e5cewlvmqlj3q76w
parent: aaron.bentley at utoronto.ca-20070622032823-2rsipnu2wmt1qoa3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-06-22 11:22:45 -0400
message:
Add check for LSProf
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.30
merged: aaron.bentley at utoronto.ca-20070622032823-2rsipnu2wmt1qoa3
parent: aaron.bentley at utoronto.ca-20070619052015-y7r2d7i5sihpfadm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-06-21 23:28:23 -0400
message:
Write lsprof file name to stderr, not stdout
------------------------------------------------------------
revno: 2530.1.14
merged: pqm at pqm.ubuntu.com-20070621070542-od3c9uxurv03i41p
parent: pqm at pqm.ubuntu.com-20070621055651-p2zqigyl0rju375h
parent: aaron.bentley at utoronto.ca-20070621063927-35dli0ujb998wku3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-21 08:05:42 +0100
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2490.2.35
merged: aaron.bentley at utoronto.ca-20070621063927-35dli0ujb998wku3
parent: aaron.bentley at utoronto.ca-20070621063206-rjmdoolr3qu24y7q
parent: pqm at pqm.ubuntu.com-20070621055651-p2zqigyl0rju375h
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Thu 2007-06-21 02:39:27 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2490.2.34
merged: aaron.bentley at utoronto.ca-20070621063206-rjmdoolr3qu24y7q
parent: aaron.bentley at utoronto.ca-20070621032939-kcnl1dmxsixygskb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Thu 2007-06-21 02:32:06 -0400
message:
Update NEWS and change implementation to return an iterator
------------------------------------------------------------
revno: 2530.1.13
merged: pqm at pqm.ubuntu.com-20070621055651-p2zqigyl0rju375h
parent: pqm at pqm.ubuntu.com-20070621052237-2phm1z5dg4arrwnk
parent: robertc at robertcollins.net-20070621030632-u20tpto23hcj15td
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-21 06:56:51 +0100
message:
(robertc) Create a document describing bundles and their motivation.
------------------------------------------------------------
revno: 2530.1.4.1.1
merged: robertc at robertcollins.net-20070621030632-u20tpto23hcj15td
parent: pqm at pqm.ubuntu.com-20070618210710-6y8wzcqiw2kvxdiy
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bundle
timestamp: Thu 2007-06-21 13:06:32 +1000
message:
Create a document describing bundles and their motivation.
------------------------------------------------------------
revno: 2530.1.12
merged: pqm at pqm.ubuntu.com-20070621052237-2phm1z5dg4arrwnk
parent: pqm at pqm.ubuntu.com-20070620205507-uuolokc2e0eckrb7
parent: aaron.bentley at utoronto.ca-20070621032939-kcnl1dmxsixygskb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-21 06:22:37 +0100
message:
Avoid topological sorting in Repository.get_ancestry where possible
------------------------------------------------------------
revno: 2490.2.33
merged: aaron.bentley at utoronto.ca-20070621032939-kcnl1dmxsixygskb
parent: aaron.bentley at utoronto.ca-20070621023343-3f3oy8iszatpjcui
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Wed 2007-06-20 23:29:39 -0400
message:
Disable topological sorting of get_ancestry where sensible
------------------------------------------------------------
revno: 2490.2.32
merged: aaron.bentley at utoronto.ca-20070621023343-3f3oy8iszatpjcui
parent: aaron.bentley at utoronto.ca-20070621015829-b62l2d1ehuvgnr3x
parent: aaron.bentley at utoronto.ca-20070617170704-z3xbz0t5nqddnyeo
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Wed 2007-06-20 22:33:43 -0400
message:
Merge of not-sorting-ancestry branch
------------------------------------------------------------
revno: 2530.2.1
merged: aaron.bentley at utoronto.ca-20070617170704-z3xbz0t5nqddnyeo
parent: pqm at pqm.ubuntu.com-20070615082222-98j9j9nbl6p2dx0m
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: get_ancestry_no_topo
timestamp: Sun 2007-06-17 13:07:04 -0400
message:
Make topological sorting optional for get_ancestry
------------------------------------------------------------
revno: 2490.2.31
merged: aaron.bentley at utoronto.ca-20070621015829-b62l2d1ehuvgnr3x
parent: aaron.bentley at utoronto.ca-20070621011219-a967wm19vxxc8dx5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Wed 2007-06-20 21:58:29 -0400
message:
Fix iter_topo_order to permit un-included parents
------------------------------------------------------------
revno: 2490.2.30
merged: aaron.bentley at utoronto.ca-20070621011219-a967wm19vxxc8dx5
parent: abentley at panoramicfeedback.com-20070619145132-xc0rgyfzebvraxb0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Wed 2007-06-20 21:12:19 -0400
message:
Add functionality for tsorting graphs
------------------------------------------------------------
revno: 2530.1.11
merged: pqm at pqm.ubuntu.com-20070620205507-uuolokc2e0eckrb7
parent: pqm at pqm.ubuntu.com-20070620092141-cniojlk01bdec2a1
parent: dato at net.com.org.es-20070620184523-mvaxuzuscq0mc0ua
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-20 21:55:07 +0100
message:
BzrBadParameter is an internal error.
------------------------------------------------------------
revno: 2530.1.10.1.1
merged: dato at net.com.org.es-20070620184523-mvaxuzuscq0mc0ua
parent: pqm at pqm.ubuntu.com-20070620092141-cniojlk01bdec2a1
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.bad_parameter_internal_error
timestamp: Wed 2007-06-20 19:45:23 +0100
message:
BzrBadParameter is an internal error.
------------------------------------------------------------
revno: 2530.1.10
merged: pqm at pqm.ubuntu.com-20070620092141-cniojlk01bdec2a1
parent: pqm at pqm.ubuntu.com-20070620033726-baiap8oniaidhdf1
parent: ian.clatworthy at internode.on.net-20070620084028-ro8ibkz1xb2gynt9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-20 10:21:41 +0100
message:
Better progress reporting in commit
------------------------------------------------------------
revno: 2530.1.9.1.1
merged: ian.clatworthy at internode.on.net-20070620084028-ro8ibkz1xb2gynt9
parent: pqm at pqm.ubuntu.com-20070620033726-baiap8oniaidhdf1
parent: ian.clatworthy at internode.on.net-20070620033232-eod2sjmf2ath8ya3
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Wed 2007-06-20 18:40:28 +1000
message:
Better progress reporting in commit
------------------------------------------------------------
revno: 2530.1.1.1.3
merged: ian.clatworthy at internode.on.net-20070620033232-eod2sjmf2ath8ya3
parent: ian.clatworthy at internode.on.net-20070619072624-73nm1uw3lu6jx4ko
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-better-progress
timestamp: Wed 2007-06-20 13:32:32 +1000
message:
Fix whitespace and improve tests to cover actual progress messages
------------------------------------------------------------
revno: 2530.1.1.1.2
merged: ian.clatworthy at internode.on.net-20070619072624-73nm1uw3lu6jx4ko
parent: ian.clatworthy at internode.on.net-20070619002628-8zq42ikpr57youbw
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-better-progress
timestamp: Tue 2007-06-19 17:26:24 +1000
message:
Improved progress reporting for commit
------------------------------------------------------------
revno: 2530.1.9
merged: pqm at pqm.ubuntu.com-20070620033726-baiap8oniaidhdf1
parent: pqm at pqm.ubuntu.com-20070620002213-fvt1s1yu2iujulio
parent: robertc at robertcollins.net-20070620030958-6ou886tyo5zpc3u4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-20 04:37:26 +0100
message:
(robertc) Propose integration ordering for the performance changes.
------------------------------------------------------------
revno: 2522.3.3
merged: robertc at robertcollins.net-20070620030958-6ou886tyo5zpc3u4
parent: robertc at robertcollins.net-20070619005518-r2n8pmtgnf9lq9yo
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2007-06-20 13:09:58 +1000
message:
Handle dot not being installed
------------------------------------------------------------
revno: 2522.3.2
merged: robertc at robertcollins.net-20070619005518-r2n8pmtgnf9lq9yo
parent: robertc at robertcollins.net-20070619004822-wsop5g2arwu1lti4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Tue 2007-06-19 10:55:18 +1000
message:
Make gdfo cache under discussion in the graph
------------------------------------------------------------
revno: 2522.3.1
merged: robertc at robertcollins.net-20070619004822-wsop5g2arwu1lti4
parent: pqm at pqm.ubuntu.com-20070612021742-uetsy3g747iq3xkk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Tue 2007-06-19 10:48:22 +1000
message:
Draft proposed integration order for performance changes.
------------------------------------------------------------
revno: 2530.1.8
merged: pqm at pqm.ubuntu.com-20070620002213-fvt1s1yu2iujulio
parent: pqm at pqm.ubuntu.com-20070619212256-y1148bn5gf4jg2dh
parent: aaron.bentley at utoronto.ca-20070619232722-4e3qyb29y1htltef
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-20 01:22:13 +0100
message:
Fix documentation of BzrError (Simó)
------------------------------------------------------------
revno: 2530.1.7.1.1
merged: aaron.bentley at utoronto.ca-20070619232722-4e3qyb29y1htltef
parent: pqm at pqm.ubuntu.com-20070619212256-y1148bn5gf4jg2dh
parent: dato at net.com.org.es-20070619152034-swymq71ibtadlvxb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Tue 2007-06-19 19:27:22 -0400
message:
Fix documentation of BzrError (Simó)
------------------------------------------------------------
revno: 2530.1.5.1.1
merged: dato at net.com.org.es-20070619152034-swymq71ibtadlvxb
parent: pqm at pqm.ubuntu.com-20070619024533-oand7e7ns9eyis9x
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.fix_internal_error_comment
timestamp: Tue 2007-06-19 16:20:34 +0100
message:
Fix BzrError docstring: internal_error defaults to False, not to True.
------------------------------------------------------------
revno: 2530.1.7
merged: pqm at pqm.ubuntu.com-20070619212256-y1148bn5gf4jg2dh
parent: pqm at pqm.ubuntu.com-20070619194321-g3qy7rh361kdvstd
parent: abentley at panoramicfeedback.com-20070619145132-xc0rgyfzebvraxb0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-19 22:22:56 +0100
message:
[MERGE] handle null revision properly for LCA
------------------------------------------------------------
revno: 2490.2.29
merged: abentley at panoramicfeedback.com-20070619145132-xc0rgyfzebvraxb0
parent: abentley at panoramicfeedback.com-20070619144906-zx160g6h377j729h
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Tue 2007-06-19 10:51:32 -0400
message:
Make parents provider private
------------------------------------------------------------
revno: 2490.2.28
merged: abentley at panoramicfeedback.com-20070619144906-zx160g6h377j729h
parent: abentley at panoramicfeedback.com-20070618201035-6c37yx8f70lk5570
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Tue 2007-06-19 10:49:06 -0400
message:
Fix handling of null revision
------------------------------------------------------------
revno: 2530.1.6
merged: pqm at pqm.ubuntu.com-20070619194321-g3qy7rh361kdvstd
parent: pqm at pqm.ubuntu.com-20070619024533-oand7e7ns9eyis9x
parent: aaron.bentley at utoronto.ca-20070619052015-y7r2d7i5sihpfadm
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-19 20:43:21 +0100
message:
Make merge directives robust against broken bundles
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.29
merged: aaron.bentley at utoronto.ca-20070619052015-y7r2d7i5sihpfadm
parent: abentley at panoramicfeedback.com-20070618135514-gitkdic3nfyak3ip
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-19 01:20:15 -0400
message:
Make merge directives robust against broken bundles
------------------------------------------------------------
revno: 2530.1.5
merged: pqm at pqm.ubuntu.com-20070619024533-oand7e7ns9eyis9x
parent: pqm at pqm.ubuntu.com-20070618210710-6y8wzcqiw2kvxdiy
parent: ian.clatworthy at internode.on.net-20070619002628-8zq42ikpr57youbw
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-19 03:45:33 +0100
message:
Merge the 0.17 fixes back into bzr.dev
------------------------------------------------------------
revno: 2530.1.1.1.1
merged: ian.clatworthy at internode.on.net-20070619002628-8zq42ikpr57youbw
parent: pqm at pqm.ubuntu.com-20070618033356-q24jtmuwbf03ojvd
parent: ian.clatworthy at internode.on.net-20070618041706-cz2c6c3hldwhj1ua
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.dev
timestamp: Tue 2007-06-19 10:26:28 +1000
message:
Merge the 0.17 fixes back into bzr.dev
------------------------------------------------------------
revno: 2522.2.4
merged: ian.clatworthy at internode.on.net-20070618041706-cz2c6c3hldwhj1ua
parent: ian.clatworthy at internode.on.net-20070618022513-md6e0xyqofhq4m7h
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.0.17
timestamp: Mon 2007-06-18 14:17:06 +1000
message:
(Ian Clatworthy) Release 0.17
------------------------------------------------------------
revno: 2522.2.3
merged: ian.clatworthy at internode.on.net-20070618022513-md6e0xyqofhq4m7h
parent: ian.clatworthy at internode.on.net-20070618015632-ug6lxcn6npzcqdym
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.0.17
timestamp: Mon 2007-06-18 12:25:13 +1000
message:
Revert logging just to stderr in commit as broke unicode filenames (#120930)
------------------------------------------------------------
revno: 2522.2.2
merged: ian.clatworthy at internode.on.net-20070618015632-ug6lxcn6npzcqdym
parent: pqm at pqm.ubuntu.com-20070612063654-zhioow9fdsvw6517
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.0.17
timestamp: Mon 2007-06-18 11:56:32 +1000
message:
Apply Colin Watson's patch fixing 120647
------------------------------------------------------------
revno: 2522.2.1
merged: pqm at pqm.ubuntu.com-20070612063654-zhioow9fdsvw6517
parent: pqm at pqm.ubuntu.com-20070612021742-uetsy3g747iq3xkk
parent: ian.clatworthy at internode.on.net-20070612024829-7r66qx0jsmv2m2oa
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.17
timestamp: Tue 2007-06-12 07:36:54 +0100
message:
(Ian Clatworthy) Release 0.17rc1
------------------------------------------------------------
revno: 2521.2.1
merged: ian.clatworthy at internode.on.net-20070612024829-7r66qx0jsmv2m2oa
parent: pqm at pqm.ubuntu.com-20070612000924-if8v5wnnp3nwmghg
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.0.17
timestamp: Tue 2007-06-12 12:48:29 +1000
message:
(Ian Clatworthy) Release 0.17rc1
------------------------------------------------------------
revno: 2530.1.4
merged: pqm at pqm.ubuntu.com-20070618210710-6y8wzcqiw2kvxdiy
parent: pqm at pqm.ubuntu.com-20070618142445-94nnc2l4o1yy6x8l
parent: abentley at panoramicfeedback.com-20070618201035-6c37yx8f70lk5570
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-18 22:07:10 +0100
message:
Better merge base selection and graph API
------------------------------------------------------------
revno: 2490.2.27
merged: abentley at panoramicfeedback.com-20070618201035-6c37yx8f70lk5570
parent: abentley at panoramicfeedback.com-20070618200416-9b164rn1a60uh82p
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Mon 2007-06-18 16:10:35 -0400
message:
Update NEWS
------------------------------------------------------------
revno: 2490.2.26
merged: abentley at panoramicfeedback.com-20070618200416-9b164rn1a60uh82p
parent: abentley at panoramicfeedback.com-20070618200218-pviwju0zlq1xgfq3
parent: pqm at pqm.ubuntu.com-20070618142445-94nnc2l4o1yy6x8l
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Mon 2007-06-18 16:04:16 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2490.2.25
merged: abentley at panoramicfeedback.com-20070618200218-pviwju0zlq1xgfq3
parent: aaron.bentley at utoronto.ca-20070613062425-hm2h2cj4u7bvz1zb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Mon 2007-06-18 16:02:18 -0400
message:
Update from review
------------------------------------------------------------
revno: 2490.2.24
merged: aaron.bentley at utoronto.ca-20070613062425-hm2h2cj4u7bvz1zb
parent: aaron.bentley at utoronto.ca-20070609051915-6bd1t4zmvw04f3wx
parent: pqm at pqm.ubuntu.com-20070613061627-xx5xk6q0oxcy1etm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Wed 2007-06-13 02:24:25 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2490.2.23
merged: aaron.bentley at utoronto.ca-20070609051915-6bd1t4zmvw04f3wx
parent: abentley at panoramicfeedback.com-20070609011331-nn6z6fkpmobp7we1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Sat 2007-06-09 01:19:15 -0400
message:
Adapt find_borders to produce a graph difference
------------------------------------------------------------
revno: 2490.2.22
merged: abentley at panoramicfeedback.com-20070609011331-nn6z6fkpmobp7we1
parent: abentley at panoramicfeedback.com-20070608214842-t47flt7htr2xz0yh
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 21:13:31 -0400
message:
Rename GraphWalker -> Graph, _AncestryWalker -> _BreadthFirstSearcher
------------------------------------------------------------
revno: 2490.2.21
merged: abentley at panoramicfeedback.com-20070608214842-t47flt7htr2xz0yh
parent: abentley at panoramicfeedback.com-20070608191331-ip308bfe0axs3oh2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 17:48:42 -0400
message:
Rename graph to deprecated_graph
------------------------------------------------------------
revno: 2490.2.20
merged: abentley at panoramicfeedback.com-20070608191331-ip308bfe0axs3oh2
parent: abentley at panoramicfeedback.com-20070608190814-a0dmj97o5osew1q8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 15:13:31 -0400
message:
Fix get_graph_walker for remote repositories
------------------------------------------------------------
revno: 2490.2.19
merged: abentley at panoramicfeedback.com-20070608190814-a0dmj97o5osew1q8
parent: abentley at panoramicfeedback.com-20070608170825-bg4vk6bg3t67oe6k
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 15:08:14 -0400
message:
Implement common-ancestor-based culling
------------------------------------------------------------
revno: 2490.2.18
merged: abentley at panoramicfeedback.com-20070608170825-bg4vk6bg3t67oe6k
parent: abentley at panoramicfeedback.com-20070608170537-4xj0m5c9ebcz8jgn
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 13:08:25 -0400
message:
Change AncestryWalker to take a set of ancestors
------------------------------------------------------------
revno: 2490.2.17
merged: abentley at panoramicfeedback.com-20070608170537-4xj0m5c9ebcz8jgn
parent: abentley at panoramicfeedback.com-20070608163729-bixvzevlbg4p9rfv
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 13:05:37 -0400
message:
Add start_searching, tweak stop_searching_any
------------------------------------------------------------
revno: 2490.2.16
merged: abentley at panoramicfeedback.com-20070608163729-bixvzevlbg4p9rfv
parent: abentley at panoramicfeedback.com-20070608154228-l1p3jz64h9901lap
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 12:37:29 -0400
message:
Tweak search
------------------------------------------------------------
revno: 2490.2.15
merged: abentley at panoramicfeedback.com-20070608154228-l1p3jz64h9901lap
parent: abentley at panoramicfeedback.com-20070608151814-0a716w37jzx3qv99
parent: pqm at pqm.ubuntu.com-20070607135016-0u2o57cfwa9ts265
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 11:42:28 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2490.2.14
merged: abentley at panoramicfeedback.com-20070608151814-0a716w37jzx3qv99
parent: abentley at panoramicfeedback.com-20070608150332-jxt1yx9hy7dmhxhv
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 11:18:14 -0400
message:
Avoid StackedParentsProvider when underlying repos match
------------------------------------------------------------
revno: 2490.2.13
merged: abentley at panoramicfeedback.com-20070608150332-jxt1yx9hy7dmhxhv
parent: abentley at panoramicfeedback.com-20070530151812-brau3xwf2568qqsb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Fri 2007-06-08 11:03:32 -0400
message:
Update distinct -> lowest, refactor, add ParentsProvider concept
------------------------------------------------------------
revno: 2490.2.12
merged: abentley at panoramicfeedback.com-20070530151812-brau3xwf2568qqsb
parent: aaron.bentley at utoronto.ca-20070530014615-bgq3ci6pxoj9luj6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: graphwalker
timestamp: Wed 2007-05-30 11:18:12 -0400
message:
Improve documentation
------------------------------------------------------------
revno: 2490.2.11
merged: aaron.bentley at utoronto.ca-20070530014615-bgq3ci6pxoj9luj6
parent: aaron.bentley at utoronto.ca-20070530011703-tgvzbyonqsol27e5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Tue 2007-05-29 21:46:15 -0400
message:
Rename minimal common ancestor to distinct common ancestor
------------------------------------------------------------
revno: 2490.2.10
merged: aaron.bentley at utoronto.ca-20070530011703-tgvzbyonqsol27e5
parent: aaron.bentley at utoronto.ca-20070527161519-noiyd4kly31xxclc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Tue 2007-05-29 21:17:03 -0400
message:
Clarify text, remove unused _get_ancestry method
------------------------------------------------------------
revno: 2490.2.9
merged: aaron.bentley at utoronto.ca-20070527161519-noiyd4kly31xxclc
parent: aaron.bentley at utoronto.ca-20070526172851-k9vmpi5eerfaocg3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Sun 2007-05-27 12:15:19 -0400
message:
Fix minimal common ancestor algorithm for non-minimal perhipheral ancestors
------------------------------------------------------------
revno: 2490.2.8
merged: aaron.bentley at utoronto.ca-20070526172851-k9vmpi5eerfaocg3
parent: aaron.bentley at utoronto.ca-20070526172421-16cyxl6ttbmsdfco
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Sat 2007-05-26 13:28:51 -0400
message:
fix iteration stuff
------------------------------------------------------------
revno: 2490.2.7
merged: aaron.bentley at utoronto.ca-20070526172421-16cyxl6ttbmsdfco
parent: aaron.bentley at utoronto.ca-20070526061115-tml5fdh1rij2o0g9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Sat 2007-05-26 13:24:21 -0400
message:
Start implementing mca that scales with number of uncommon ancestors
------------------------------------------------------------
revno: 2490.2.6
merged: aaron.bentley at utoronto.ca-20070526061115-tml5fdh1rij2o0g9
parent: aaron.bentley at utoronto.ca-20070526042739-0o2yva7r05fslgqm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Sat 2007-05-26 02:11:15 -0400
message:
Use new common-ancestor code everywhere
------------------------------------------------------------
revno: 2490.2.5
merged: aaron.bentley at utoronto.ca-20070526042739-0o2yva7r05fslgqm
parent: aaron.bentley at utoronto.ca-20070526003301-dd583nsr8qr5limk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Sat 2007-05-26 00:27:39 -0400
message:
Use GraphWalker.unique_ancestor to determine merge base
------------------------------------------------------------
revno: 2490.2.4
merged: aaron.bentley at utoronto.ca-20070526003301-dd583nsr8qr5limk
parent: aaron.bentley at utoronto.ca-20070526002009-8wekbvf32o7rufn2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Fri 2007-05-25 20:33:01 -0400
message:
More tests for unique common ancestor
------------------------------------------------------------
revno: 2490.2.3
merged: aaron.bentley at utoronto.ca-20070526002009-8wekbvf32o7rufn2
parent: aaron.bentley at utoronto.ca-20070525044429-xleriyljmuaw4kxz
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Fri 2007-05-25 20:20:09 -0400
message:
Implement new merge base picker
------------------------------------------------------------
revno: 2490.2.2
merged: aaron.bentley at utoronto.ca-20070525044429-xleriyljmuaw4kxz
parent: aaron.bentley at utoronto.ca-20070525031726-tey81wph8x3hg4po
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Fri 2007-05-25 00:44:29 -0400
message:
add minimal-common-ancestor calculation
------------------------------------------------------------
revno: 2490.2.1
merged: aaron.bentley at utoronto.ca-20070525031726-tey81wph8x3hg4po
parent: pqm at pqm.ubuntu.com-20070523095110-bqaodkh3q7v0fime
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: graphwalker
timestamp: Thu 2007-05-24 23:17:26 -0400
message:
Start work on GraphWalker
------------------------------------------------------------
revno: 2530.1.3
merged: pqm at pqm.ubuntu.com-20070618142445-94nnc2l4o1yy6x8l
parent: pqm at pqm.ubuntu.com-20070618052235-mvns8j28szyzscy0
parent: abentley at panoramicfeedback.com-20070618135514-gitkdic3nfyak3ip
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-18 15:24:45 +0100
message:
Improve Feature usage style w/ lsprof
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.28
merged: abentley at panoramicfeedback.com-20070618135514-gitkdic3nfyak3ip
parent: aaron.bentley at utoronto.ca-20070618045658-a2sjuk0r29yx610c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-06-18 09:55:14 -0400
message:
Improve Feature usage style w/ lsprof
------------------------------------------------------------
revno: 2530.1.2
merged: pqm at pqm.ubuntu.com-20070618052235-mvns8j28szyzscy0
parent: pqm at pqm.ubuntu.com-20070618033356-q24jtmuwbf03ojvd
parent: aaron.bentley at utoronto.ca-20070618045658-a2sjuk0r29yx610c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-18 06:22:35 +0100
message:
Turn list-weave into list-versionedfile
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.27
merged: aaron.bentley at utoronto.ca-20070618045658-a2sjuk0r29yx610c
parent: aaron.bentley at utoronto.ca-20070618045410-nysseluvoupymb9i
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-06-18 00:56:58 -0400
message:
fix NEWS
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.26
merged: aaron.bentley at utoronto.ca-20070618045410-nysseluvoupymb9i
parent: aaron.bentley at utoronto.ca-20070618024552-ya7hg0rd1e9fo1ym
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-06-18 00:54:10 -0400
message:
Update NEWS
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.25
merged: aaron.bentley at utoronto.ca-20070618024552-ya7hg0rd1e9fo1ym
parent: aaron.bentley at utoronto.ca-20070617223937-nziy1cki818xykth
parent: pqm at pqm.ubuntu.com-20070615082222-98j9j9nbl6p2dx0m
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-06-17 22:45:52 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.24
merged: aaron.bentley at utoronto.ca-20070617223937-nziy1cki818xykth
parent: aaron.bentley at utoronto.ca-20070613030239-yrkk8z0m5me87fpp
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-06-17 18:39:37 -0400
message:
Make list-weave list knits, rename to list-versionedfile
------------------------------------------------------------
revno: 2530.1.1
merged: pqm at pqm.ubuntu.com-20070618033356-q24jtmuwbf03ojvd
parent: pqm at pqm.ubuntu.com-20070615082222-98j9j9nbl6p2dx0m
parent: mbp at sourcefrog.net-20070613092840-0v9ph8iklj52agdj
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-18 04:33:56 +0100
message:
Fix race in test_breakin_harder that can cause test suite hang.
------------------------------------------------------------
revno: 2527.1.1
merged: mbp at sourcefrog.net-20070613092840-0v9ph8iklj52agdj
parent: pqm at pqm.ubuntu.com-20070613061627-xx5xk6q0oxcy1etm
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: breakin
timestamp: Wed 2007-06-13 19:28:40 +1000
message:
Fix race in test_breakin_harder that can cause test suite hang.
We don't know quite when the subprocess is ready to receive a signal,
so send it a few times til it has an effect. (#119566)
Diff too large for email (4160 lines, the limit is 1000).
More information about the bazaar-commits
mailing list