Rev 3280: (jam) Tweak annotate performance for pack repositories, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sat Mar 15 17:44:55 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3280
revision-id:pqm at pqm.ubuntu.com-20080315174441-l8xpw6femn0syal1
parent: pqm at pqm.ubuntu.com-20080315010714-k7pnu991eg5f0k0q
parent: john at arbash-meinel.com-20080315100128-a0ebcfhmfayqaa38
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-03-15 17:44:41 +0000
message:
(jam) Tweak annotate performance for pack repositories,
improving speed and decreasing memory consumption.
added:
bzrlib/tests/tree_implementations/test_annotate_iter.py test_annotate_iter.p-20080315092519-h4dc43rntmfmq16d-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3224.1.29
revision-id:john at arbash-meinel.com-20080315100128-a0ebcfhmfayqaa38
parent: john at arbash-meinel.com-20080315092532-14k76uwlfp91g4zy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_finish
timestamp: Sat 2008-03-15 10:01:28 +0000
message:
Properly handle annotating when ghosts are present.
get_build_details just skips ghosts, but layers on top may
want to raise RevisionNotPresent.
Also, _KnitAnnotator should not block waiting for a ghost to
show up before we annotate the child.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3224.1.28
revision-id:john at arbash-meinel.com-20080315092532-14k76uwlfp91g4zy
parent: john at arbash-meinel.com-20080314184527-lzsyiiua2kx100ug
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_finish
timestamp: Sat 2008-03-15 09:25:32 +0000
message:
Add some direct tests for Tree.annotate_iter
added:
bzrlib/tests/tree_implementations/test_annotate_iter.py test_annotate_iter.p-20080315092519-h4dc43rntmfmq16d-1
modified:
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
------------------------------------------------------------
revno: 3224.1.27
revision-id:john at arbash-meinel.com-20080314184527-lzsyiiua2kx100ug
parent: john at arbash-meinel.com-20080314163201-33r5errgr41hzaci
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_finish
timestamp: Fri 2008-03-14 18:45:27 +0000
message:
Handle when the knit index doesn't track parents.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3224.1.26
revision-id:john at arbash-meinel.com-20080314163201-33r5errgr41hzaci
parent: john at arbash-meinel.com-20080314120134-pmgsm1z237zxd7o7
parent: pqm at pqm.ubuntu.com-20080314211658-bjlcjsk0zl2ppcai
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_finish
timestamp: Fri 2008-03-14 16:32:01 +0000
message:
[merge] bzr.dev 3277, cleanup NEWS indentation.
added:
bzrlib/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
doc/en/admin-guide/ docenadminguide-20080305135054-y7y2c986yf94zljn-1
doc/en/admin-guide/index.txt index.txt-20080305140741-ecw0lap8dxkxc05g-1
renamed:
bzrlib/plugins/launchpad/lp_indirect.py => bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_indirect.py => bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
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/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_registry.py test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
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: 3224.1.25
revision-id:john at arbash-meinel.com-20080314120134-pmgsm1z237zxd7o7
parent: john at arbash-meinel.com-20080314115552-37na0d823hfrkm1l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_finish
timestamp: Fri 2008-03-14 12:01:34 +0000
message:
Quick change to the _KnitAnnotator api to use .annotate() instead of get_annotated_lines()
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3224.1.24
revision-id:john at arbash-meinel.com-20080314115552-37na0d823hfrkm1l
parent: john at arbash-meinel.com-20080314115207-3rhsb74dnh0ex0pg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_finish
timestamp: Fri 2008-03-14 11:55:52 +0000
message:
Fix up docstring since FrozenHeadsCache doesn't let you mutate the result.
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
------------------------------------------------------------
revno: 3224.1.23
revision-id:john at arbash-meinel.com-20080314115207-3rhsb74dnh0ex0pg
parent: john at arbash-meinel.com-20080306095333-ne8gnbxgtuc38aew
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_finish
timestamp: Fri 2008-03-14 11:52:07 +0000
message:
Clean up the new function variables.
Robert correctly doesn't like meaningless names, so refactor into
2 functions, and give them all nice long names.
modified:
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
------------------------------------------------------------
revno: 3224.1.22
revision-id:john at arbash-meinel.com-20080306095333-ne8gnbxgtuc38aew
parent: john at arbash-meinel.com-20080306094324-pekgxn1pup9oq23g
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Thu 2008-03-06 09:53:33 +0000
message:
Cleanup the extra debugging info, and some >80 char lines.
modified:
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3224.1.21
revision-id:john at arbash-meinel.com-20080306094324-pekgxn1pup9oq23g
parent: john at arbash-meinel.com-20080306092048-cgeay6ixt2sepk2w
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Thu 2008-03-06 09:43:24 +0000
message:
Update NEWS for memory consumption improvement.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3224.1.20
revision-id:john at arbash-meinel.com-20080306092048-cgeay6ixt2sepk2w
parent: john at arbash-meinel.com-20080305235303-glnaa7hedza0xcz1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Thu 2008-03-06 09:20:48 +0000
message:
Reduce the number of cache misses by caching known heads answers
(drops requests from 877 => ~600, though doesn't drop speed by a lot)
Also switch to a class that assumes you won't try to mess with the returned values.
modified:
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3224.1.19
revision-id:john at arbash-meinel.com-20080305235303-glnaa7hedza0xcz1
parent: john at arbash-meinel.com-20080305175657-idb7b5yyis2agiz2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Wed 2008-03-05 23:53:03 +0000
message:
Work on removing nodes from the working set once they aren't needed.
This decreases the amount of caching, and lowers memory pressure.
I measure a drop from 45MB for bzrlib/repository.py down to 30MB
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3224.1.18
revision-id:john at arbash-meinel.com-20080305175657-idb7b5yyis2agiz2
parent: john at arbash-meinel.com-20080305174846-mlcmszy3gbntuowj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Wed 2008-03-05 17:56:57 +0000
message:
Cleanup documentation
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3224.1.17
revision-id:john at arbash-meinel.com-20080305174846-mlcmszy3gbntuowj
parent: john at arbash-meinel.com-20080305173514-933wremo23r9doex
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Wed 2008-03-05 17:48:46 +0000
message:
Clean up some variable ordering to make more sense.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3224.1.16
revision-id:john at arbash-meinel.com-20080305173514-933wremo23r9doex
parent: john at arbash-meinel.com-20080305173058-l2x5d0qxpciuva1u
parent: pqm at pqm.ubuntu.com-20080304113936-4wrordr8lrxhvfdl
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Wed 2008-03-05 17:35:14 +0000
message:
[merge] bzr.dev 3250
removed:
index.txt index.txt-20071121073725-0corxykv5irjal00-1
added:
bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
tools/package_mf.py package_mf.py-20080206141953-323gd0qb2z3tn5pc-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/BSD-LICENSE.txt BSDLICENSE.txt-20051018184548-29b89ff3102657f5
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3224.1.15
revision-id:john at arbash-meinel.com-20080305173058-l2x5d0qxpciuva1u
parent: john at arbash-meinel.com-20080305163617-87y5f6xz7s3gjdm7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Wed 2008-03-05 17:30:58 +0000
message:
Finish removing method and noeol from general knowledge,
pushing them down into the Content and Factory objects.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3224.1.14
revision-id:john at arbash-meinel.com-20080305163617-87y5f6xz7s3gjdm7
parent: john at arbash-meinel.com-20080226222600-6wsja3pv4kelorug
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Wed 2008-03-05 16:36:17 +0000
message:
Switch to making content_details opaque, step 1
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3224.1.13
revision-id:john at arbash-meinel.com-20080226222600-6wsja3pv4kelorug
parent: john at arbash-meinel.com-20080220212710-7o35jtg6x1tfb887
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Tue 2008-02-26 16:26:00 -0600
message:
Revert the _get_component_positions api
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
------------------------------------------------------------
revno: 3224.1.12
revision-id:john at arbash-meinel.com-20080220212710-7o35jtg6x1tfb887
parent: john at arbash-meinel.com-20080220201715-anxn5yyk4r6tbzyq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Wed 2008-02-20 15:27:10 -0600
message:
NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3224.1.11
revision-id:john at arbash-meinel.com-20080220201715-anxn5yyk4r6tbzyq
parent: john at arbash-meinel.com-20080219231816-1uuv72o4jjj3psc6
parent: pqm at pqm.ubuntu.com-20080220014008-9appc9kw4rjg8v1k
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Wed 2008-02-20 14:17:15 -0600
message:
Merge bzr.dev 3228
added:
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3224.1.10
revision-id:john at arbash-meinel.com-20080219231816-1uuv72o4jjj3psc6
parent: john at arbash-meinel.com-20080219225347-jqkzgv0i1yakrh0a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Tue 2008-02-19 17:18:16 -0600
message:
Introduce the heads_provider for reannotate.
modified:
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3224.1.9
revision-id:john at arbash-meinel.com-20080219225347-jqkzgv0i1yakrh0a
parent: john at arbash-meinel.com-20080219221838-pjnuiilre9efpduh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Tue 2008-02-19 16:53:47 -0600
message:
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
modified:
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
------------------------------------------------------------
revno: 3224.1.8
revision-id:john at arbash-meinel.com-20080219221838-pjnuiilre9efpduh
parent: john at arbash-meinel.com-20080219191939-u0lxthvoziqpnnmm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Tue 2008-02-19 16:18:38 -0600
message:
Add noeol to the return signature of get_build_details.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
------------------------------------------------------------
revno: 3224.1.7
revision-id:john at arbash-meinel.com-20080219191939-u0lxthvoziqpnnmm
parent: john at arbash-meinel.com-20080219185128-isxp2u65v72znzyx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Tue 2008-02-19 13:19:39 -0600
message:
_StreamIndex also needs to return the proper values for get_build_details.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3224.1.6
revision-id:john at arbash-meinel.com-20080219185128-isxp2u65v72znzyx
parent: john at arbash-meinel.com-20080218222523-ibpzgl9jmcvatx80
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Tue 2008-02-19 12:51:28 -0600
message:
Refactor the annotation logic into a helper class.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3224.1.5
revision-id:john at arbash-meinel.com-20080218222523-ibpzgl9jmcvatx80
parent: john at arbash-meinel.com-20080218221941-emdy2iq5crf93w4i
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Mon 2008-02-18 16:25:23 -0600
message:
Start using a helper class for doing the knit-pack annotations.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3224.1.4
revision-id:john at arbash-meinel.com-20080218221941-emdy2iq5crf93w4i
parent: john at arbash-meinel.com-20080218221845-60svhnjt6a4fy4r2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Mon 2008-02-18 16:19:41 -0600
message:
Add a *failing* test to expose why we need better handling when a line is introduced on two sides of a merge.
modified:
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
------------------------------------------------------------
revno: 3224.1.3
revision-id:john at arbash-meinel.com-20080218221845-60svhnjt6a4fy4r2
parent: john at arbash-meinel.com-20080218221553-poekdfli017i89h5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Mon 2008-02-18 16:18:45 -0600
message:
Clarify the format of 'matching_blocks'
modified:
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
------------------------------------------------------------
revno: 3224.1.2
revision-id:john at arbash-meinel.com-20080218221553-poekdfli017i89h5
parent: john at arbash-meinel.com-20080218211742-fdd2sw2nvubl9cg8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_cleanup
timestamp: Mon 2008-02-18 16:15:53 -0600
message:
Updated the base Tree.annotate_iter() since all implemenations take an optional kwarg.
modified:
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
Diff too large for email (1278 lines, the limit is 1000).
More information about the bazaar-commits
mailing list