Rev 3880: Merge bzr.dev into cleanups in file:///net/bigmamac/Volumes/home/vila/src/bzr/cases/3232-spurious-conflict/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Fri Dec 12 13:02:07 GMT 2008
At file:///net/bigmamac/Volumes/home/vila/src/bzr/cases/3232-spurious-conflict/
------------------------------------------------------------
revno: 3880
revision-id: v.ladeuil+lp at free.fr-20081212130152-5ey2yeelvo2tyoss
parent: v.ladeuil+lp at free.fr-20081210172011-hqo0uup8a7aq785f
parent: pqm at pqm.ubuntu.com-20081212125032-wboskm0umuvt44ft
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanups
timestamp: Fri 2008-12-12 14:01:52 +0100
message:
Merge bzr.dev into cleanups
added:
bzrlib/_chunks_to_lines_py.py _chunks_to_lines_py.-20081211024848-6uc3mtuje8j14l60-1
bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_dirstate_helpers_c.h _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3874.1.28
revision-id: pqm at pqm.ubuntu.com-20081212125032-wboskm0umuvt44ft
parent: pqm at pqm.ubuntu.com-20081212070030-93xnzs7f14962hti
parent: v.ladeuil+lp at free.fr-20081212121401-fx3zk2ixgjz843k0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-12-12 12:50:32 +0000
message:
(vila) Use the short status format when the short format is used for
log
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
------------------------------------------------------------
revno: 3874.24.1
revision-id: v.ladeuil+lp at free.fr-20081212121401-fx3zk2ixgjz843k0
parent: pqm at pqm.ubuntu.com-20081212070030-93xnzs7f14962hti
parent: v.ladeuil+lp at free.fr-20081212120801-p1up3amo9ff3rghy
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.integration
timestamp: Fri 2008-12-12 13:14:01 +0100
message:
(vila) Use the short status format when the short format is used for log
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
------------------------------------------------------------
revno: 3874.23.8
revision-id: v.ladeuil+lp at free.fr-20081212120801-p1up3amo9ff3rghy
parent: v.ladeuil+lp at free.fr-20081211071228-21705lekcnoam79u
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: log-s-v
timestamp: Fri 2008-12-12 13:08:01 +0100
message:
Fixed as ber Robert's review.
* bzrlib/tests/blackbox/test_log.py:
(TestLogVerbose): Refactor 'lob -v' delta format tests.
modified:
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
------------------------------------------------------------
revno: 3874.23.7
revision-id: v.ladeuil+lp at free.fr-20081211071228-21705lekcnoam79u
parent: v.ladeuil+lp at free.fr-20081210172141-tcdhvd9o14ingf1n
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: log-s-v
timestamp: Thu 2008-12-11 08:12:28 +0100
message:
Restrict '-v' change to log --short only.
* bzrlib/tests/blackbox/test_log.py:
(TestLog.test_log_long_verbose,
TestLog.test_log_long_verbose_verbose): Update tests to reflect
--long ignoring verbosity level.
* bzrlib/log.py:
(LongLogFormatter.log_revision): Ignore verbosity level to
preserve compatibility.
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
------------------------------------------------------------
revno: 3874.23.6
revision-id: v.ladeuil+lp at free.fr-20081210172141-tcdhvd9o14ingf1n
parent: v.ladeuil+lp at free.fr-20081209085733-x9ubc9uj33tddlhp
parent: v.ladeuil+lp at free.fr-20081210172011-hqo0uup8a7aq785f
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: log-s-v
timestamp: Wed 2008-12-10 18:21:41 +0100
message:
merge bzr.dev at 3890
added:
bzrlib/fifo_cache.py fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3874.23.5
revision-id: v.ladeuil+lp at free.fr-20081209085733-x9ubc9uj33tddlhp
parent: v.ladeuil+lp at free.fr-20081205123515-q8d82ivuv6x36y7w
parent: v.ladeuil+lp at free.fr-20081209085621-l1qyr2psspm72519
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: log-s-v
timestamp: Tue 2008-12-09 09:57:33 +0100
message:
merge cleanups fixing conflicts
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-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/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 3874.23.4
revision-id: v.ladeuil+lp at free.fr-20081205123515-q8d82ivuv6x36y7w
parent: v.ladeuil+lp at free.fr-20081205095210-um1v5wvo0pib6mmj
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: log-s-v
timestamp: Fri 2008-12-05 13:35:15 +0100
message:
Fixed as per Aarons' comment.
* bzrlib/tests/blackbox/test_log.py:
(TestLog): Add more tests for 'delta_format'.
* bzrlib/log.py:
(LogFormatter): Document the 'delta_format' attribute.
(LogFormatter.__init__): Initialize 'delta_format' respecting
bzckward compatibility.
(LongLogFormatter.log_revision): Takes 'delta_format' into account.
(ShortLogFormatter.log_revision): Takes 'delta_format' into account.
* bzrlib/builtins.py:
(cmd_log.run): Use get_verbosity_level() to distinguish between -v
and -vv.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
------------------------------------------------------------
revno: 3874.23.3
revision-id: v.ladeuil+lp at free.fr-20081205095210-um1v5wvo0pib6mmj
parent: v.ladeuil+lp at free.fr-20081201165324-w1go7lxnckpknk3k
parent: v.ladeuil+lp at free.fr-20081205095113-u39p9ormkmt1w4v1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: log-s-v
timestamp: Fri 2008-12-05 10:52:10 +0100
message:
Merge cleanups into log-s-v
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3874.23.2
revision-id: v.ladeuil+lp at free.fr-20081201165324-w1go7lxnckpknk3k
parent: v.ladeuil+lp at free.fr-20081201154814-9ukqbu07oj70booe
parent: v.ladeuil+lp at free.fr-20081201165155-awy16we83y95gahp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: log-s-v
timestamp: Mon 2008-12-01 17:53:24 +0100
message:
Merge cleanups into log-s-v
modified:
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
------------------------------------------------------------
revno: 3874.23.1
revision-id: v.ladeuil+lp at free.fr-20081201154814-9ukqbu07oj70booe
parent: pqm at pqm.ubuntu.com-20081201071425-al48chdg4wlkbm31
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: log-s-v
timestamp: Mon 2008-12-01 16:48:14 +0100
message:
Fix #87179 by using the short status format when the short format is used for log.
* bzrlib/tests/blackbox/test_log.py:
(TestLog.test_log_short_verbose): Test that we use the right
status format.
* bzrlib/log.py:
(ShortLogFormatter.log_revision): Set short_status to True.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
------------------------------------------------------------
revno: 3874.1.27
revision-id: pqm at pqm.ubuntu.com-20081212070030-93xnzs7f14962hti
parent: pqm at pqm.ubuntu.com-20081212043027-n6zyyf2q7usjiyid
parent: amanic at gmail.com-20081204195934-0jrq24ttncqpl9is
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-12-12 07:00:30 +0000
message:
Add more tests for dotted revnos. (Marius Kruger)
modified:
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
------------------------------------------------------------
revno: 3874.22.3
revision-id: amanic at gmail.com-20081204195934-0jrq24ttncqpl9is
parent: amanic at gmail.com-20081204195329-bygs4wrol90ridjr
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.diff_dotted_revno_exception
timestamp: Thu 2008-12-04 21:59:34 +0200
message:
Add tests for log -r with non-exising revno's
(the doted case now gives correct error message)
modified:
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
------------------------------------------------------------
revno: 3874.22.2
revision-id: amanic at gmail.com-20081204195329-bygs4wrol90ridjr
parent: amanic at gmail.com-20081204190952-9eed0xghn96koab1
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.diff_dotted_revno_exception
timestamp: Thu 2008-12-04 21:53:29 +0200
message:
Add tests for log -c with non-exising revno's
(the doted case now gives correct error message)
modified:
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
------------------------------------------------------------
revno: 3874.22.1
revision-id: amanic at gmail.com-20081204190952-9eed0xghn96koab1
parent: pqm at pqm.ubuntu.com-20081202015700-3mc9dola31w7h5h4
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.diff_dotted_revno_exception
timestamp: Thu 2008-12-04 21:09:52 +0200
message:
Test invalid dotted revion number directly in TestRevisionSpec_revno
modified:
bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
------------------------------------------------------------
revno: 3874.1.26
revision-id: pqm at pqm.ubuntu.com-20081212043027-n6zyyf2q7usjiyid
parent: pqm at pqm.ubuntu.com-20081212025611-838ms79rnxjl7yr2
parent: andrew.bennetts at canonical.com-20081212035356-uqcu89gy4nqf017x
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-12-12 04:30:27 +0000
message:
Fix compilation error in _dirstate_helpers_c on SunOS/Solaris. (Jari
Aalto)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_dirstate_helpers_c.h _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
------------------------------------------------------------
revno: 3874.21.1
revision-id: andrew.bennetts at canonical.com-20081212035356-uqcu89gy4nqf017x
parent: pqm at pqm.ubuntu.com-20081212025611-838ms79rnxjl7yr2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: solaris-ifdef
timestamp: Fri 2008-12-12 14:53:56 +1100
message:
Fix compilation error in _dirstate_helpers_c on SunOS/Solaris. (Jari Aalto)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_dirstate_helpers_c.h _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
------------------------------------------------------------
revno: 3874.1.25
revision-id: pqm at pqm.ubuntu.com-20081212025611-838ms79rnxjl7yr2
parent: pqm at pqm.ubuntu.com-20081212015925-98alcrs1vpf9kjdu
parent: andrew.bennetts at canonical.com-20081212014730-7mvzvi3vzvd1goj5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-12-12 02:56:11 +0000
message:
Remove broken debug mutter in graph.py that was triggered by -Dhpss.
(Andrew Bennetts)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3874.20.2
revision-id: andrew.bennetts at canonical.com-20081212014730-7mvzvi3vzvd1goj5
parent: andrew.bennetts at canonical.com-20081212011704-m5208objzpfsjar7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: mutter-bug-307327
timestamp: Fri 2008-12-12 12:47:30 +1100
message:
Mention in NEWS the removal of node_distances and select_farthest from bzrlib.graph.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3874.20.1
revision-id: andrew.bennetts at canonical.com-20081212011704-m5208objzpfsjar7
parent: pqm at pqm.ubuntu.com-20081211215721-7er55v3goevwfz9w
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: mutter-bug-307327
timestamp: Fri 2008-12-12 12:17:04 +1100
message:
Remove broken debugging cruft, and some unused imports.
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3874.1.24
revision-id: pqm at pqm.ubuntu.com-20081212015925-98alcrs1vpf9kjdu
parent: pqm at pqm.ubuntu.com-20081212012450-3gw576prpztxziib
parent: aaron at aaronbentley.com-20081212003726-331kkjc5050ofbag
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-12-12 01:59:25 +0000
message:
Add make check-nodocs target (abentley).
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
------------------------------------------------------------
revno: 3874.19.1
revision-id: aaron at aaronbentley.com-20081212003726-331kkjc5050ofbag
parent: pqm at pqm.ubuntu.com-20081211075753-m1ktaz1at8oxlp00
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: check-nodocs
timestamp: Thu 2008-12-11 16:37:26 -0800
message:
Add check-nodocs target
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
------------------------------------------------------------
revno: 3874.1.23
revision-id: pqm at pqm.ubuntu.com-20081212012450-3gw576prpztxziib
parent: pqm at pqm.ubuntu.com-20081211215721-7er55v3goevwfz9w
parent: mbp at sourcefrog.net-20081212004341-1s5soiy7itgnif7w
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-12-12 01:24:50 +0000
message:
(mbp) Developer documentation about when to add new exception classes
modified:
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3874.18.2
revision-id: mbp at sourcefrog.net-20081212004341-1s5soiy7itgnif7w
parent: mbp at sourcefrog.net-20081212002306-oyljdsw9is6zkqf0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc-hacking
timestamp: Thu 2008-12-11 16:43:41 -0800
message:
Tweak documentation of exception classes
modified:
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3874.18.1
revision-id: mbp at sourcefrog.net-20081212002306-oyljdsw9is6zkqf0
parent: pqm at pqm.ubuntu.com-20081205181554-ofrdnafloc43bxkh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc-hacking
timestamp: Thu 2008-12-11 16:23:06 -0800
message:
Developer documentation about when to add new exception classes
modified:
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3874.1.22
revision-id: pqm at pqm.ubuntu.com-20081211215721-7er55v3goevwfz9w
parent: pqm at pqm.ubuntu.com-20081211202300-6dz1vo3phfsc23pj
parent: robertc at robertcollins.net-20081205154530-lvrdo30eslvvhxwl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-12-11 21:57:21 +0000
message:
Remove dead code in Repository.iter_files_bytes. (Robert Collins)
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3874.17.1
revision-id: robertc at robertcollins.net-20081205154530-lvrdo30eslvvhxwl
parent: pqm at pqm.ubuntu.com-20081202015700-3mc9dola31w7h5h4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: iter_files_bytes
timestamp: Sat 2008-12-06 02:45:30 +1100
message:
Remove dead code in Repository.iter_files_bytes.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3874.1.21
revision-id: pqm at pqm.ubuntu.com-20081211202300-6dz1vo3phfsc23pj
parent: pqm at pqm.ubuntu.com-20081211174647-l45s6xsw669ovgsa
parent: john at arbash-meinel.com-20081211193706-7qz4e5f9a8c5w4b1
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-12-11 20:23:00 +0000
message:
(jam) Add ContentFactory.get_bytes_as('chunked') and
osutils.chunks_to_lines()
added:
bzrlib/_chunks_to_lines_py.py _chunks_to_lines_py.-20081211024848-6uc3mtuje8j14l60-1
bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3874.16.18
revision-id: john at arbash-meinel.com-20081211193706-7qz4e5f9a8c5w4b1
parent: john at arbash-meinel.com-20081211193101-q0utq7jeh79vpmgr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_record_stream_chunked
timestamp: Thu 2008-12-11 13:37:06 -0600
message:
Implement osutils.split_lines() in terms of chunks_to_lines if possible.
chunks_to_lines([fulltext]) is about 2x faster than the original split_lines implementation.
modified:
bzrlib/_chunks_to_lines_py.py _chunks_to_lines_py.-20081211024848-6uc3mtuje8j14l60-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
------------------------------------------------------------
revno: 3874.16.17
revision-id: john at arbash-meinel.com-20081211193101-q0utq7jeh79vpmgr
parent: john at arbash-meinel.com-20081211182616-l9m9rjnea3bebaor
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_record_stream_chunked
timestamp: Thu 2008-12-11 13:31:01 -0600
message:
Add a few more corner cases, some suggested by Robert.
modified:
bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
------------------------------------------------------------
revno: 3874.16.16
revision-id: john at arbash-meinel.com-20081211182616-l9m9rjnea3bebaor
parent: john at arbash-meinel.com-20081211182023-sr6hi6owbbzozhkn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_record_stream_chunked
timestamp: Thu 2008-12-11 12:26:16 -0600
message:
If we split into 2 loops, we get 440us for already lines, and the
same time when it is not.
The only downside is that it requires looping over the same data twice.
modified:
bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
------------------------------------------------------------
revno: 3874.16.15
revision-id: john at arbash-meinel.com-20081211182023-sr6hi6owbbzozhkn
parent: john at arbash-meinel.com-20081211175903-gtuvyewwr1eehauq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_record_stream_chunked
timestamp: Thu 2008-12-11 12:20:23 -0600
message:
Update to do a single iteration over the chunks.
This costs 600us versus 430us for the case where the object is
already a list of lines. However it is only 1.2ms rather than 3ms
when everything is in a single buffer.
The biggest advantage is that 'chunks' *could* be an iterator,
rather than requiring it to already have all the results.
modified:
bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
------------------------------------------------------------
revno: 3874.16.14
revision-id: john at arbash-meinel.com-20081211175903-gtuvyewwr1eehauq
parent: john at arbash-meinel.com-20081211175431-s89ujzp4w4l51x34
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_record_stream_chunked
timestamp: Thu 2008-12-11 11:59:03 -0600
message:
Restore correctness.
modified:
bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
------------------------------------------------------------
revno: 3874.16.13
revision-id: john at arbash-meinel.com-20081211175431-s89ujzp4w4l51x34
parent: john at arbash-meinel.com-20081211174407-6sz5ooqz40m30xc2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_record_stream_chunked
timestamp: Thu 2008-12-11 11:54:31 -0600
message:
Add a NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3874.16.12
revision-id: john at arbash-meinel.com-20081211174407-6sz5ooqz40m30xc2
parent: john at arbash-meinel.com-20081211174330-31to8tzq6k4ewii4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_record_stream_chunked
timestamp: Thu 2008-12-11 11:44:07 -0600
message:
Remove the extra comment, it probably isn't useful to most people.
modified:
bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
------------------------------------------------------------
revno: 3874.16.11
revision-id: john at arbash-meinel.com-20081211174330-31to8tzq6k4ewii4
parent: john at arbash-meinel.com-20081211170336-70oi6rnsgkyh3z2o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_record_stream_chunked
timestamp: Thu 2008-12-11 11:43:30 -0600
message:
A bit more tweaking of the pyrex version. Shave off another 10% by
using PyString_CheckExact.
modified:
bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
------------------------------------------------------------
revno: 3874.16.10
revision-id: john at arbash-meinel.com-20081211170336-70oi6rnsgkyh3z2o
parent: john at arbash-meinel.com-20081211031852-cmjpdf2ufno0okui
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_record_stream_chunked
timestamp: Thu 2008-12-11 11:03:36 -0600
message:
Change the python implementation to a friendlier implementation.
It is only a little bit slower, because we still avoid function calls.
Redo the Pyrex version for clarity as well. May need to revisit as it might be
a little bit slower.
modified:
bzrlib/_chunks_to_lines_py.py _chunks_to_lines_py.-20081211024848-6uc3mtuje8j14l60-1
bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
------------------------------------------------------------
revno: 3874.16.9
revision-id: john at arbash-meinel.com-20081211031852-cmjpdf2ufno0okui
parent: john at arbash-meinel.com-20081211030803-gctunob7zsten3qg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_record_stream_chunked
timestamp: Wed 2008-12-10 21:18:52 -0600
message:
Start using osutils.chunks_as_lines rather than osutils.split_lines.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
revno: 3874.16.8
revision-id: john at arbash-meinel.com-20081211030803-gctunob7zsten3qg
parent: john at arbash-meinel.com-20081211021859-3ds8cwdqiq387t83
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_record_stream_chunked
timestamp: Wed 2008-12-10 21:08:03 -0600
message:
Move everything into properly parameterized tests.
Also add tests that we preserve the object when it is already lines.
The compiled form takes 450us on a 7.6k line file (NEWS).
So for common cases, we should have virtually no overhead.
added:
bzrlib/_chunks_to_lines_py.py _chunks_to_lines_py.-20081211024848-6uc3mtuje8j14l60-1
bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
modified:
bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
------------------------------------------------------------
revno: 3874.16.7
revision-id: john at arbash-meinel.com-20081211021859-3ds8cwdqiq387t83
parent: john at arbash-meinel.com-20081211020207-rrgdcyqc344zo5q1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_record_stream_chunked
timestamp: Wed 2008-12-10 20:18:59 -0600
message:
A Pyrex extension is about 5x faster than the fastest python code I could write.
Seems worth having after all.
added:
bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3874.16.6
revision-id: john at arbash-meinel.com-20081211020207-rrgdcyqc344zo5q1
parent: john at arbash-meinel.com-20081211011419-vqtdjgpa04woqvm4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_record_stream_chunked
timestamp: Wed 2008-12-10 20:02:07 -0600
message:
Change name to 'chunks_to_lines', and find an optimized form.
It is a little bit ugly, but it is faster than join & split, and means
we get to leave the strings untouched.
modified:
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
------------------------------------------------------------
revno: 3874.16.5
revision-id: john at arbash-meinel.com-20081211011419-vqtdjgpa04woqvm4
parent: john at arbash-meinel.com-20081211011038-osioaxd7moquxxmy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_record_stream_chunked
timestamp: Wed 2008-12-10 19:14:19 -0600
message:
More tests for edge cases.
modified:
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
------------------------------------------------------------
revno: 3874.16.4
revision-id: john at arbash-meinel.com-20081211011038-osioaxd7moquxxmy
parent: john at arbash-meinel.com-20081211010104-3tcii2strejk5252
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_record_stream_chunked
timestamp: Wed 2008-12-10 19:10:38 -0600
message:
Add a new function that can convert 'chunks' format to a 'lines' format.
modified:
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
------------------------------------------------------------
revno: 3874.16.3
revision-id: john at arbash-meinel.com-20081211010104-3tcii2strejk5252
parent: john at arbash-meinel.com-20081211005616-szoqqeabcyahy39u
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_record_stream_chunked
timestamp: Wed 2008-12-10 19:01:04 -0600
message:
Use the 'chunked' interface to keep memory consumption minimal during revision_trees()
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3874.16.2
revision-id: john at arbash-meinel.com-20081211005616-szoqqeabcyahy39u
parent: john at arbash-meinel.com-20081211005436-a8bn72zw43b1vd9r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_record_stream_chunked
timestamp: Wed 2008-12-10 18:56:16 -0600
message:
Change the signature to report the storage kind as 'chunked'
modified:
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 3874.16.1
revision-id: john at arbash-meinel.com-20081211005436-a8bn72zw43b1vd9r
parent: pqm at pqm.ubuntu.com-20081210082822-li6ku9s3k63kjrpr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_record_stream_chunked
timestamp: Wed 2008-12-10 18:54:36 -0600
message:
Start working on a ChunkedContentFactory.
This allows get_bytes_as('chunked') for both FulltextContentFactory,
and for ChunkedContentFactory, as it is a trivial conversion to
go between the two styles.
We will also want to special case when converting 'chunked' into
'lines'. But that is for future work.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
revno: 3874.1.20
revision-id: pqm at pqm.ubuntu.com-20081211174647-l45s6xsw669ovgsa
parent: pqm at pqm.ubuntu.com-20081211075753-m1ktaz1at8oxlp00
parent: aaron at aaronbentley.com-20081211162546-a1zte4t2ststz6th
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-12-11 17:46:47 +0000
message:
Raise if CachingParentsProvider.enable_cache used wrongly (abentley)
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 3835.1.20
revision-id: aaron at aaronbentley.com-20081211162546-a1zte4t2ststz6th
parent: aaron at aaronbentley.com-20081211032844-m23vj0emra6btb6i
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Thu 2008-12-11 08:25:46 -0800
message:
Change custom error to an AssertionError.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 3835.1.19
revision-id: aaron at aaronbentley.com-20081211032844-m23vj0emra6btb6i
parent: aaron at aaronbentley.com-20081210203113-ooeh6z6uavoysoc9
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Wed 2008-12-10 19:28:44 -0800
message:
Raise exception when caching is enabled twice.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 3874.1.19
revision-id: pqm at pqm.ubuntu.com-20081211075753-m1ktaz1at8oxlp00
parent: pqm at pqm.ubuntu.com-20081210210638-e569azc2bomqq5qx
parent: aaron at aaronbentley.com-20081211060357-c03e8qj0oaiw3g6t
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-12-11 07:57:53 +0000
message:
Add --list option to shelve (abentley)
added:
bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
------------------------------------------------------------
revno: 0.16.119
revision-id: aaron at aaronbentley.com-20081211060357-c03e8qj0oaiw3g6t
parent: aaron at aaronbentley.com-20081211043815-txr61gyz174x41c1
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: ls-shelf
timestamp: Wed 2008-12-10 22:03:57 -0800
message:
Fix option help style.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 0.16.118
revision-id: aaron at aaronbentley.com-20081211043815-txr61gyz174x41c1
parent: aaron at aaronbentley.com-20081211042826-0zgon0hquuau0rse
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: ls-shelf
timestamp: Wed 2008-12-10 20:38:15 -0800
message:
Fix open_containing
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 0.16.117
revision-id: aaron at aaronbentley.com-20081211042826-0zgon0hquuau0rse
parent: aaron at aaronbentley.com-20081211030727-1e95kx8mixx0spru
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: ls-shelf
timestamp: Wed 2008-12-10 20:28:26 -0800
message:
Remove references to ls-shelf
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 0.16.116
revision-id: aaron at aaronbentley.com-20081211030727-1e95kx8mixx0spru
parent: aaron at aaronbentley.com-20081211030610-mw6v6v7dxwseyyhm
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: ls-shelf
timestamp: Wed 2008-12-10 19:07:27 -0800
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 0.16.115
revision-id: aaron at aaronbentley.com-20081211030610-mw6v6v7dxwseyyhm
parent: aaron at aaronbentley.com-20081211030500-sl63oogmfwy3tjd3
parent: pqm at pqm.ubuntu.com-20081210210638-e569azc2bomqq5qx
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: ls-shelf
timestamp: Wed 2008-12-10 19:06:10 -0800
message:
Merge bzr.dev into shelf2
added:
bzrlib/fifo_cache.py fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 0.16.114
revision-id: aaron at aaronbentley.com-20081211030500-sl63oogmfwy3tjd3
parent: aaron at aaronbentley.com-20081203053127-vozu5rmsixaadw0v
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: ls-shelf
timestamp: Wed 2008-12-10 19:05:00 -0800
message:
Use open_containing when listing shelves
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 0.16.113
revision-id: aaron at aaronbentley.com-20081203053127-vozu5rmsixaadw0v
parent: aaron at aaronbentley.com-20081202055411-89w3mu0uu6wrstoh
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: ls-shelf
timestamp: Wed 2008-12-03 00:31:27 -0500
message:
Change ls-shelf to shelve --list
renamed:
bzrlib/tests/blackbox/test_ls_shelf.py => bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
------------------------------------------------------------
revno: 0.16.112
revision-id: aaron at aaronbentley.com-20081202055411-89w3mu0uu6wrstoh
parent: aaron at aaronbentley.com-20081202054417-24d9o48m6l55ln8w
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: ls-shelf
timestamp: Tue 2008-12-02 00:54:11 -0500
message:
Add tests
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
------------------------------------------------------------
revno: 0.16.111
revision-id: aaron at aaronbentley.com-20081202054417-24d9o48m6l55ln8w
parent: aaron at aaronbentley.com-20081202053551-1f8ifkqem116sudi
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: ls-shelf
timestamp: Tue 2008-12-02 00:44:17 -0500
message:
Return metadata as a dict.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
------------------------------------------------------------
revno: 0.16.110
revision-id: aaron at aaronbentley.com-20081202053551-1f8ifkqem116sudi
parent: aaron at aaronbentley.com-20081202042459-y0y1n73u7jwqpgeq
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: ls-shelf
timestamp: Tue 2008-12-02 00:35:51 -0500
message:
Implement ls-shelf command
added:
bzrlib/tests/blackbox/test_ls_shelf.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
------------------------------------------------------------
revno: 0.16.109
revision-id: aaron at aaronbentley.com-20081202042459-y0y1n73u7jwqpgeq
parent: aaron at aaronbentley.com-20081115203736-6ikutv274y59s0jo
parent: pqm at pqm.ubuntu.com-20081202015700-3mc9dola31w7h5h4
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: ls-shelf
timestamp: Mon 2008-12-01 23:24:59 -0500
message:
Merge bzr.dev into ls-shelf
added:
bzrlib/foreign.py foreign.py-20081112170002-olsxmandkk8qyfuq-1
bzrlib/tests/test_foreign.py test_foreign.py-20081125004048-ywb901edgp9lluxo-1
contrib/convert_to_1.9.py convert_to_dev2.py-20081014130524-z1ydl3mq9b4ehlvv-1
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
modified:
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/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
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/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/python-compat.h pythoncompat.h-20080924041409-9kvi0fgtuuqp743j-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-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/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/commands/test_commit.py test_commit.py-20070913161801-ydrx2k5gmv7k7eiu-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
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/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
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_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
------------------------------------------------------------
revno: 3874.1.18
revision-id: pqm at pqm.ubuntu.com-20081210210638-e569azc2bomqq5qx
parent: pqm at pqm.ubuntu.com-20081210180716-sg0oipqppsgmn15t
parent: aaron at aaronbentley.com-20081210203113-ooeh6z6uavoysoc9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-12-10 21:06:38 +0000
message:
(abentley) Move RemoteRepository caching to CachingParentsProvider
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3835.1.18
revision-id: aaron at aaronbentley.com-20081210203113-ooeh6z6uavoysoc9
parent: aaron at aaronbentley.com-20081210195642-3y1d2azpt2tccgsh
parent: pqm at pqm.ubuntu.com-20081210180716-sg0oipqppsgmn15t
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Wed 2008-12-10 12:31:13 -0800
message:
Merge with trunk
added:
bzrlib/fifo_cache.py fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3835.1.17
revision-id: aaron at aaronbentley.com-20081210195642-3y1d2azpt2tccgsh
parent: aaron at aaronbentley.com-20081210194042-3x07buw2h4g8x9hs
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Wed 2008-12-10 11:56:42 -0800
message:
Fix stacking bug
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
------------------------------------------------------------
revno: 3835.1.16
revision-id: aaron at aaronbentley.com-20081210194042-3x07buw2h4g8x9hs
parent: aaron at aaronbentley.com-20081203050944-biuf61wbttr0wrzv
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Wed 2008-12-10 11:40:42 -0800
message:
Updates from review
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 3835.1.15
revision-id: aaron at aaronbentley.com-20081203050944-biuf61wbttr0wrzv
parent: aaron at aaronbentley.com-20081203042321-kr5k4mdhmdvl3553
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Wed 2008-12-03 00:09:44 -0500
message:
Allow miss caching to be disabled.
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3835.1.14
revision-id: aaron at aaronbentley.com-20081203042321-kr5k4mdhmdvl3553
parent: aaron at aaronbentley.com-20081123163839-ew27m17130fz85v6
parent: pqm at pqm.ubuntu.com-20081202015700-3mc9dola31w7h5h4
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Tue 2008-12-02 23:23:21 -0500
message:
Merge with trunk
added:
bzrlib/foreign.py foreign.py-20081112170002-olsxmandkk8qyfuq-1
bzrlib/tests/test_foreign.py test_foreign.py-20081125004048-ywb901edgp9lluxo-1
contrib/convert_to_1.9.py convert_to_dev2.py-20081014130524-z1ydl3mq9b4ehlvv-1
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
modified:
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/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
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/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/python-compat.h pythoncompat.h-20080924041409-9kvi0fgtuuqp743j-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-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/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/commands/test_commit.py test_commit.py-20070913161801-ydrx2k5gmv7k7eiu-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
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/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
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_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
------------------------------------------------------------
revno: 3835.1.13
revision-id: aaron at aaronbentley.com-20081123163839-ew27m17130fz85v6
parent: aaron at aaronbentley.com-20081123162708-17093o7m3obv7czs
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Sun 2008-11-23 11:38:39 -0500
message:
Update documentation
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
------------------------------------------------------------
revno: 3835.1.12
revision-id: aaron at aaronbentley.com-20081123162708-17093o7m3obv7czs
parent: aaron at aaronbentley.com-20081122162637-p21ab628pasd3ruf
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Sun 2008-11-23 11:27:08 -0500
message:
Unify CachingExtraParentsProvider and CachingParentsProvider.
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 3835.1.11
revision-id: aaron at aaronbentley.com-20081122162637-p21ab628pasd3ruf
parent: aaron at aaronbentley.com-20081122162428-o9vik1937s3p8fmy
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Sat 2008-11-22 11:26:37 -0500
message:
Rename FakeParentsProvider to ExtraParentsProvider
modified:
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 3835.1.10
revision-id: aaron at aaronbentley.com-20081122162428-o9vik1937s3p8fmy
parent: aaron at aaronbentley.com-20081122053311-lyn8yvy36i89smyg
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Sat 2008-11-22 11:24:28 -0500
message:
Move CachingExtraParentsProvider to Graph
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3835.1.9
revision-id: aaron at aaronbentley.com-20081122053311-lyn8yvy36i89smyg
parent: aaron at aaronbentley.com-20081122052057-id7ffzq9lyl9c4fk
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Sat 2008-11-22 00:33:11 -0500
message:
Handle _requested_parents, take a callable
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3835.1.8
revision-id: aaron at aaronbentley.com-20081122052057-id7ffzq9lyl9c4fk
parent: aaron at aaronbentley.com-20081118214336-53wku2p6og6kvl5r
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Sat 2008-11-22 00:20:57 -0500
message:
Make UnstackedParentsProvider manage the cache
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3874.1.17
revision-id: pqm at pqm.ubuntu.com-20081210180716-sg0oipqppsgmn15t
parent: pqm at pqm.ubuntu.com-20081210082822-li6ku9s3k63kjrpr
parent: john at arbash-meinel.com-20081210172640-064zf1x91jgrarbj
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-12-10 18:07:16 +0000
message:
Update an old NEWS entry to reference bug #106117
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3874.15.1
revision-id: john at arbash-meinel.com-20081210172640-064zf1x91jgrarbj
parent: pqm at pqm.ubuntu.com-20081210082822-li6ku9s3k63kjrpr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2008-12-10 11:26:40 -0600
message:
Update an old NEWS entry to discuss bug #106117
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
-------------- next part --------------
Diff too large for email (1756 lines, the limit is 1000).
More information about the bazaar-commits
mailing list