Rev 3724: (robertc) Lookup content in the working tree when annotating. (Robert in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Sep 23 02:55:04 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3724
revision-id: pqm at pqm.ubuntu.com-20080923015500-7nb0mp3c7o2wh1zu
parent: pqm at pqm.ubuntu.com-20080922180718-n946121e40ql2bb3
parent: robertc at robertcollins.net-20080923012306-iucxo8t4l7lhry5y
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-09-23 02:55:00 +0100
message:
(robertc) Lookup content in the working tree when annotating. (Robert
Collins, #3439)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
------------------------------------------------------------
revno: 3603.4.5
revision-id: robertc at robertcollins.net-20080923012306-iucxo8t4l7lhry5y
parent: robertc at robertcollins.net-20080922232126-liu0qmrb1lacom17
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2008-09-23 11:23:06 +1000
message:
Fix test failure on PQM.
modified:
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
------------------------------------------------------------
revno: 3603.4.4
revision-id: robertc at robertcollins.net-20080922232126-liu0qmrb1lacom17
parent: robertc at robertcollins.net-20080902012652-4ha6zs6m1r21onx7
parent: pqm at pqm.ubuntu.com-20080922180718-n946121e40ql2bb3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 3439
timestamp: Tue 2008-09-23 09:21:26 +1000
message:
Resolve conflicts in NEWS.
added:
bzrlib/_readdir_py.py readdir.py-20060609152855-rm6v321vuaqyh9tu-3
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
bzrlib/readdir.h readdir.h-20060609152855-rm6v321vuaqyh9tu-2
bzrlib/tests/test_transport_log.py test_transport_log.p-20080902041816-vh8x5yt5nvdzvew3-3
bzrlib/transport/log.py log.py-20080902041816-vh8x5yt5nvdzvew3-5
doc/developers/overview.txt overview.txt-20080904022501-ww2ggomrs5elxfm0-1
renamed:
bzrlib/tests/repository_implementations => bzrlib/tests/per_repository repository_implementations-20060131092037-ec97814745cc6128
doc/en/developer-guide/testing.txt => doc/developers/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzr.ico bzr.ico-20060629083000-q18ip0hk7lq55i4y-1
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/atomicfile.py atomicfile.py-20050509044450-dbd24e6c564f7c66
bzrlib/benchmarks/bench_osutils.py bench_osutils.py-20060608153714-apso8cyz1bu2z1ig-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/message.py message.py-20080222013625-ncqmh3nrxjkxab87-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-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_cat_revision.py test_cat_revision.py-20070410204634-fq8mnld5l5aza9e2-1
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
bzrlib/tests/per_repository/test__generate_text_key_index.py test__generate_text_-20071114232121-00h9fd8qg8kjfa5k-1
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_break_lock.py test_break_lock.py-20060504111704-ee09a107f9f42e43
bzrlib/tests/per_repository/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/per_repository/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/per_repository/test_find_text_key_references.py test_find_text_key_r-20071114033605-v73bakal8x77qlfi-1
bzrlib/tests/per_repository/test_get_parent_map.py test_get_parent_map.-20080421172708-x1z6ot341osr0jq1-1
bzrlib/tests/per_repository/test_has_revisions.py test_has_revisions.p-20080111035443-xaupgdsx5fw1q54b-1
bzrlib/tests/per_repository/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
bzrlib/tests/per_repository/test_is_write_locked.py test_is_write_locked-20071012063748-vk062lmu683qgbc3-1
bzrlib/tests/per_repository/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
bzrlib/tests/per_repository/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-2
bzrlib/tests/per_repository/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
bzrlib/tests/per_repository/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/trace.py trace.py-20070828055009-7kt0bbc4t4b92apz-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
profile_imports.py profile_imports.py-20060618020306-k5uw80achysrokj9-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
------------------------------------------------------------
revno: 3603.4.3
revision-id: robertc at robertcollins.net-20080902012652-4ha6zs6m1r21onx7
parent: robertc at robertcollins.net-20080902000134-qz8r6v1mltygeg6t
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 3439
timestamp: Tue 2008-09-02 11:26:52 +1000
message:
Review feedback.
modified:
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
------------------------------------------------------------
revno: 3603.4.2
revision-id: robertc at robertcollins.net-20080902000134-qz8r6v1mltygeg6t
parent: robertc at robertcollins.net-20080805054110-9prc026f7yq5iom8
parent: pqm at pqm.ubuntu.com-20080901090124-w1cxlizdk4g3mstv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 3439
timestamp: Tue 2008-09-02 10:01:34 +1000
message:
Merge bzr.dev.
removed:
tools/win32/survey.txt survey.txt-20070809075950-sf265mgu9oog8jjb-1
added:
bzrlib/_btree_serializer_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
bzrlib/_btree_serializer_py.py _parse_btree_py.py-20080703034413-3q25bklkenti3p8p-3
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_chunk_writer.py test_chunk_writer.py-20080630234519-6ggn4id17nipovny-2
bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
bzrlib/transport/ftp/ ftp-20080611185801-3vm145h8dmnfgh25-1
bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
doc/en/developer-guide/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
tools/packaging/ packaging-20080825202834-3j433iaawnt72wqa-1
tools/packaging/build-packages.sh buildpackages.sh-20080821102059-fzlodktas65qmo1k-1
tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
renamed:
bzrlib/transport/ftp.py => bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/export/__init__.py __init__.py-20051114235828-1ba62cb4062304e6
bzrlib/export/dir_exporter.py dir_exporter.py-20051114235828-b51397f56bc7b117
bzrlib/export/tar_exporter.py tar_exporter.py-20051114235828-1f6349a2f090a5d0
bzrlib/export/zip_exporter.py zip_exporter.py-20051114235828-8f57f954fba6497e
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
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/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_setup.py test_setup.py-20051208073730-4a59a6368c4efa04
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
bzrlib/tests/tree_implementations/test_walkdirs.py test_walkdirs.py-20060729160421-gmjnkotqgxdh98ce-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3603.4.1
revision-id: robertc at robertcollins.net-20080805054110-9prc026f7yq5iom8
parent: pqm at pqm.ubuntu.com-20080805011407-wmq7130znc0e6c4x
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 3429
timestamp: Tue 2008-08-05 15:41:10 +1000
message:
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
=== modified file 'NEWS'
--- a/NEWS 2008-09-22 16:12:36 +0000
+++ b/NEWS 2008-09-22 23:21:26 +0000
@@ -13,6 +13,11 @@
IMPROVEMENTS:
+ * ``bzr annotate`` will now include uncommitted changes from the local
+ working tree by default. Such uncommitted changes are given the
+ revision number they would get if a commit was done, followed with a
+ ? to indicate that its not actually known. (Robert Collins, #3439)
+
* ``bzr branch`` now accepts a ``--standalone`` option, which creates a
standalone branch regardless of the presence of shared repositories.
(Daniel Watkins)
=== modified file 'bzrlib/annotate.py'
--- a/bzrlib/annotate.py 2008-07-29 16:50:43 +0000
+++ b/bzrlib/annotate.py 2008-09-02 01:26:52 +0000
@@ -35,6 +35,8 @@
tsort,
)
from bzrlib.config import extract_email_address
+from bzrlib.repository import _strip_NULL_ghosts
+from bzrlib.revision import CURRENT_REVISION, Revision
def annotate_file(branch, rev_id, file_id, verbose=False, full=False,
@@ -57,21 +59,59 @@
to_file = sys.stdout
# Handle the show_ids case
- last_rev_id = None
+ annotations = _annotations(branch.repository, file_id, rev_id)
if show_ids:
- annotations = _annotations(branch.repository, file_id, rev_id)
- max_origin_len = max(len(origin) for origin, text in annotations)
- for origin, text in annotations:
- if full or last_rev_id != origin:
- this = origin
- else:
- this = ''
- to_file.write('%*s | %s' % (max_origin_len, this, text))
- last_rev_id = origin
- return
+ return _show_id_annotations(annotations, to_file, full)
# Calculate the lengths of the various columns
- annotation = list(_annotate_file(branch, rev_id, file_id))
+ annotation = list(_expand_annotations(annotations, branch))
+ _print_annotations(annotation, verbose, to_file, full)
+
+
+def annotate_file_tree(tree, file_id, to_file, verbose=False, full=False,
+ show_ids=False):
+ """Annotate file_id in a tree.
+
+ The tree should already be read_locked() when annotate_file_tree is called.
+
+ :param tree: The tree to look for revision numbers and history from.
+ :param file_id: The file_id to annotate.
+ :param to_file: The file to output the annotation to.
+ :param verbose: Show all details rather than truncating to ensure
+ reasonable text width.
+ :param full: XXXX Not sure what this does.
+ :param show_ids: Show revision ids in the annotation output.
+ """
+ rev_id = tree.last_revision()
+ branch = tree.branch
+
+ # Handle the show_ids case
+ annotations = list(tree.annotate_iter(file_id))
+ if show_ids:
+ return _show_id_annotations(annotations, to_file, full)
+
+ # Create a virtual revision to represent the current tree state.
+ # Should get some more pending commit attributes, like pending tags,
+ # bugfixes etc.
+ current_rev = Revision(CURRENT_REVISION)
+ current_rev.parent_ids = tree.get_parent_ids()
+ current_rev.committer = tree.branch.get_config().username()
+ current_rev.message = "?"
+ current_rev.timestamp = round(time.time(), 3)
+ current_rev.timezone = osutils.local_time_offset()
+ annotation = list(_expand_annotations(annotations, tree.branch,
+ current_rev))
+ _print_annotations(annotation, verbose, to_file, full)
+
+
+def _print_annotations(annotation, verbose, to_file, full):
+ """Print annotations to to_file.
+
+ :param to_file: The file to output the annotation to.
+ :param verbose: Show all details rather than truncating to ensure
+ reasonable text width.
+ :param full: XXXX Not sure what this does.
+ """
if len(annotation) == 0:
max_origin_len = max_revno_len = max_revid_len = 0
else:
@@ -110,6 +150,19 @@
prevanno = anno
+def _show_id_annotations(annotations, to_file, full):
+ last_rev_id = None
+ max_origin_len = max(len(origin) for origin, text in annotations)
+ for origin, text in annotations:
+ if full or last_rev_id != origin:
+ this = origin
+ else:
+ this = ''
+ to_file.write('%*s | %s' % (max_origin_len, this, text))
+ last_rev_id = origin
+ return
+
+
def _annotations(repo, file_id, rev_id):
"""Return the list of (origin_revision_id, line_text) for a revision of a file in a repository."""
annotations = repo.texts.annotate((file_id, rev_id))
@@ -117,20 +170,48 @@
return [(key[-1], line) for (key, line) in annotations]
-def _annotate_file(branch, rev_id, file_id):
- """Yield the origins for each line of a file.
-
- This includes detailed information, such as the author name, and
- date string for the commit, rather than just the revision id.
+def _expand_annotations(annotations, branch, current_rev=None):
+ """Expand a a files annotations into command line UI ready tuples.
+
+ Each tuple includes detailed information, such as the author name, and date
+ string for the commit, rather than just the revision id.
+
+ :param annotations: The annotations to expand.
+ :param revision_id_to_revno: A map from id to revision numbers.
+ :param branch: A locked branch to query for revision details.
"""
- revision_id_to_revno = branch.get_revision_id_to_revno_map()
- annotations = _annotations(branch.repository, file_id, rev_id)
+ repository = branch.repository
+ if current_rev is not None:
+ # This can probably become a function on MutableTree, get_revno_map there,
+ # or something.
+ last_revision = current_rev.revision_id
+ # XXX: Partially Cloned from branch, uses the old_get_graph, eep.
+ graph = repository.get_graph()
+ revision_graph = dict(((key, value) for key, value in
+ graph.iter_ancestry(current_rev.parent_ids) if value is not None))
+ revision_graph = _strip_NULL_ghosts(revision_graph)
+ revision_graph[last_revision] = current_rev.parent_ids
+ merge_sorted_revisions = tsort.merge_sort(
+ revision_graph,
+ last_revision,
+ None,
+ generate_revno=True)
+ revision_id_to_revno = dict((rev_id, revno)
+ for seq_num, rev_id, depth, revno, end_of_merge in
+ merge_sorted_revisions)
+ else:
+ revision_id_to_revno = branch.get_revision_id_to_revno_map()
last_origin = None
revision_ids = set(o for o, t in annotations)
+ revisions = {}
+ if CURRENT_REVISION in revision_ids:
+ revision_id_to_revno[CURRENT_REVISION] = (
+ "%d?" % (branch.revno() + 1),)
+ revisions[CURRENT_REVISION] = current_rev
revision_ids = [o for o in revision_ids if
- branch.repository.has_revision(o)]
- revisions = dict((r.revision_id, r) for r in
- branch.repository.get_revisions(revision_ids))
+ repository.has_revision(o)]
+ revisions.update((r.revision_id, r) for r in
+ repository.get_revisions(revision_ids))
for origin, text in annotations:
text = text.rstrip('\r\n')
if origin == last_origin:
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2008-09-21 01:21:05 +0000
+++ b/bzrlib/builtins.py 2008-09-22 23:21:26 +0000
@@ -3553,7 +3553,7 @@
@display_command
def run(self, filename, all=False, long=False, revision=None,
show_ids=False):
- from bzrlib.annotate import annotate_file
+ from bzrlib.annotate import annotate_file, annotate_file_tree
wt, branch, relpath = \
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
if wt is not None:
@@ -3575,8 +3575,14 @@
if file_id is None:
raise errors.NotVersionedError(filename)
file_version = tree.inventory[file_id].revision
- annotate_file(branch, file_version, file_id, long, all, self.outf,
- show_ids=show_ids)
+ if wt is not None and revision is None:
+ # If there is a tree and we're not annotating historical
+ # versions, annotate the working tree's content.
+ annotate_file_tree(wt, file_id, self.outf, long, all,
+ show_ids=show_ids)
+ else:
+ annotate_file(branch, file_version, file_id, long, all, self.outf,
+ show_ids=show_ids)
finally:
if wt is not None:
wt.unlock()
=== modified file 'bzrlib/tests/blackbox/test_annotate.py'
--- a/bzrlib/tests/blackbox/test_annotate.py 2007-12-29 18:55:20 +0000
+++ b/bzrlib/tests/blackbox/test_annotate.py 2008-09-23 01:23:06 +0000
@@ -26,6 +26,8 @@
import os
+from bzrlib.branch import Branch
+from bzrlib.config import extract_email_address
from bzrlib.tests import TestCaseWithTransport
@@ -147,6 +149,78 @@
' exactly 1 argument\n',
err)
+
+class TestSimpleAnnotate(TestCaseWithTransport):
+ """Annotate tests with no complex setup."""
+
+ def _setup_edited_file(self):
+ """Create a tree with a locally edited file."""
+ tree = self.make_branch_and_tree('.')
+ self.build_tree_contents([('file', 'foo\ngam\n')])
+ tree.add('file')
+ tree.commit('add file', committer="test at host", rev_id="rev1")
+ self.build_tree_contents([('file', 'foo\nbar\ngam\n')])
+ tree.branch.get_config().set_user_option('email', 'current at host2')
+
+ def test_annotate_edited_file(self):
+ tree = self._setup_edited_file()
+ out, err = self.run_bzr('annotate file')
+ self.assertEqual(
+ '1 test at ho | foo\n'
+ '2? current | bar\n'
+ '1 test at ho | gam\n',
+ out)
+
+ def test_annotate_edited_file_show_ids(self):
+ tree = self._setup_edited_file()
+ out, err = self.run_bzr('annotate file --show-ids')
+ self.assertEqual(
+ ' rev1 | foo\n'
+ 'current: | bar\n'
+ ' rev1 | gam\n',
+ out)
+
+ def _create_merged_file(self):
+ """Create a file with a pending merge and local edit."""
+ tree = self.make_branch_and_tree('.')
+ self.build_tree_contents([('file', 'foo\ngam\n')])
+ tree.add('file')
+ tree.commit('add file', rev_id="rev1", committer="test at host")
+ # right side
+ self.build_tree_contents([('file', 'foo\nbar\ngam\n')])
+ tree.commit("right", rev_id="rev1.1.1", committer="test at host")
+ tree.pull(tree.branch, True, "rev1")
+ # left side
+ self.build_tree_contents([('file', 'foo\nbaz\ngam\n')])
+ tree.commit("left", rev_id="rev2", committer="test at host")
+ # merge
+ tree.merge_from_branch(tree.branch, "rev1.1.1")
+ # edit the file to be 'resolved' and have a further local edit
+ self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])
+
+ def test_annotated_edited_merged_file_revnos(self):
+ self._create_merged_file()
+ out, err = self.run_bzr('annotate file')
+ email = extract_email_address(Branch.open('.').get_config().username())
+ self.assertEqual(
+ '3? %-7s | local\n'
+ '1 test at ho | foo\n'
+ '1.1.1 test at ho | bar\n'
+ '2 test at ho | baz\n'
+ '1 test at ho | gam\n' % email[:7],
+ out)
+
+ def test_annotated_edited_merged_file_ids(self):
+ self._create_merged_file()
+ out, err = self.run_bzr('annotate file --show-ids')
+ self.assertEqual(
+ 'current: | local\n'
+ ' rev1 | foo\n'
+ 'rev1.1.1 | bar\n'
+ ' rev2 | baz\n'
+ ' rev1 | gam\n',
+ out)
+
def test_annotate_empty_file(self):
tree = self.make_branch_and_tree('tree')
self.build_tree_contents([('tree/empty', '')])
More information about the bazaar-commits
mailing list