Rev 3885: Merge refactor-delta-show into delta-show-with-path-filter in file:///net/bigmamac/Volumes/home/vila/src/bzr/cases/3232-spurious-conflict/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Thu Dec 11 11:14:37 GMT 2008
At file:///net/bigmamac/Volumes/home/vila/src/bzr/cases/3232-spurious-conflict/
------------------------------------------------------------
revno: 3885
revision-id: v.ladeuil+lp at free.fr-20081211111411-x98b692zu3ubjw7r
parent: v.ladeuil+lp at free.fr-20081210093306-j4l1wiesc76519fy
parent: v.ladeuil+lp at free.fr-20081211111344-lfkqv17p8a7n3bzu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: delta-show-with-path-filter
timestamp: Thu 2008-12-11 12:14:11 +0100
message:
Merge refactor-delta-show into delta-show-with-path-filter
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/log.py log.py-20050505065812-c40ce11702fe5fb1
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_log.py test_log.py-20060112090212-78f6ea560c868e24
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: 3881.1.2
revision-id: v.ladeuil+lp at free.fr-20081211111344-lfkqv17p8a7n3bzu
parent: v.ladeuil+lp at free.fr-20081209085750-2zwesxx1hostym0s
parent: v.ladeuil+lp at free.fr-20081211071228-21705lekcnoam79u
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: refactor-delta-show
timestamp: Thu 2008-12-11 12:13:44 +0100
message:
Merge log-s-v into refactor-delta-show
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/log.py log.py-20050505065812-c40ce11702fe5fb1
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_log.py test_log.py-20060112090212-78f6ea560c868e24
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: 3878.1.3
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: 3878.1.2
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.1.5
revision-id: v.ladeuil+lp at free.fr-20081210172011-hqo0uup8a7aq785f
parent: v.ladeuil+lp at free.fr-20081209085621-l1qyr2psspm72519
parent: pqm at pqm.ubuntu.com-20081210082822-li6ku9s3k63kjrpr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanups
timestamp: Wed 2008-12-10 18:20:11 +0100
message:
Merge bzr.dev into cleanups
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.2.16
revision-id: pqm at pqm.ubuntu.com-20081210082822-li6ku9s3k63kjrpr
parent: pqm at pqm.ubuntu.com-20081210051250-2czm9b99a7e7y0xi
parent: ian.clatworthy at canonical.com-20081210064720-33gd8jy3l6p45xgc
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-12-10 08:28:22 +0000
message:
support -d in revision-info (Michael Hudson)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
------------------------------------------------------------
revno: 3874.15.1
revision-id: ian.clatworthy at canonical.com-20081210064720-33gd8jy3l6p45xgc
parent: pqm at pqm.ubuntu.com-20081210051250-2czm9b99a7e7y0xi
parent: michael.hudson at canonical.com-20081210020530-7lrsz78ln4d08m8l
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Wed 2008-12-10 16:47:20 +1000
message:
support -d in revision-info (Michael Hudson)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
------------------------------------------------------------
revno: 3874.14.1
revision-id: michael.hudson at canonical.com-20081210020530-7lrsz78ln4d08m8l
parent: pqm at pqm.ubuntu.com-20081209205258-uop2lclksyc9whj8
committer: Michael Hudson <michael.hudson at canonical.com>
branch nick: revision-info-takes--d
timestamp: Wed 2008-12-10 15:05:30 +1300
message:
support -d in the revision-info command
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
------------------------------------------------------------
revno: 3874.2.15
revision-id: pqm at pqm.ubuntu.com-20081210051250-2czm9b99a7e7y0xi
parent: pqm at pqm.ubuntu.com-20081210011933-axdrxiq306imj2ty
parent: john at arbash-meinel.com-20081210043421-2uaz4mfuzw3ca5jz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-12-10 05:12:50 +0000
message:
(robertc, jam) Add Repository.add_inventory_by_delta,
and use it in the InterDifferingSerializer code.
added:
bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
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
------------------------------------------------------------
revno: 3874.12.13
revision-id: john at arbash-meinel.com-20081210043421-2uaz4mfuzw3ca5jz
parent: john at arbash-meinel.com-20081210032133-2mxcpa2p81kbpi5c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: differ_serializer
timestamp: Tue 2008-12-09 22:34:21 -0600
message:
There was a test that asserted we called pb.update() with the last revision.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3874.12.12
revision-id: john at arbash-meinel.com-20081210032133-2mxcpa2p81kbpi5c
parent: john at arbash-meinel.com-20081210001000-xsgsn2kt5ce6dfl2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: differ_serializer
timestamp: Tue 2008-12-09 21:21:33 -0600
message:
Missed an add_inventory_delta => add_inventory_by_delta.
modified:
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3874.12.11
revision-id: john at arbash-meinel.com-20081210001000-xsgsn2kt5ce6dfl2
parent: john at arbash-meinel.com-20081207173303-ydamo2rxs3ngjhw0
parent: pqm at pqm.ubuntu.com-20081209163533-fj6hx9l65sretbai
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: differ_serializer
timestamp: Tue 2008-12-09 18:10:00 -0600
message:
Merge bzr.dev, resolve NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
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/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
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
------------------------------------------------------------
revno: 3874.12.10
revision-id: john at arbash-meinel.com-20081207173303-ydamo2rxs3ngjhw0
parent: john at arbash-meinel.com-20081205222549-lri0j1a3wv37wtax
parent: john at arbash-meinel.com-20081207172622-r3hrmb872nwmezeu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: differ_serializer
timestamp: Sun 2008-12-07 11:33:03 -0600
message:
Merge in the new add_inventory_by_delta and handle the new return values.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
------------------------------------------------------------
revno: 3874.13.1
revision-id: john at arbash-meinel.com-20081207172622-r3hrmb872nwmezeu
parent: john at arbash-meinel.com-20081205172501-a0g7ho4sl29q6dz9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: add_inventory_by_delta
timestamp: Sun 2008-12-07 11:26:22 -0600
message:
Change the return of add_inventory_by_delta to also return the Inventory.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3874.12.9
revision-id: john at arbash-meinel.com-20081205222549-lri0j1a3wv37wtax
parent: john at arbash-meinel.com-20081205221928-kzstz04ngqrxpb12
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: differ_serializer
timestamp: Fri 2008-12-05 16:25:49 -0600
message:
Use a last-modified-revision test.
This avoids copying the same text revisions multiple times.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3874.12.8
revision-id: john at arbash-meinel.com-20081205221928-kzstz04ngqrxpb12
parent: john at arbash-meinel.com-20081205221847-hs9mh3yuinxq7w29
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: differ_serializer
timestamp: Fri 2008-12-05 16:19:28 -0600
message:
Bring in the CHK inter-differing-serializer fetch code.
Refactor it into several helper functions which makes the flow a bit
clearer and reduces the indentation.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3874.12.7
revision-id: john at arbash-meinel.com-20081205221847-hs9mh3yuinxq7w29
parent: john at arbash-meinel.com-20081205221809-d3c4cz1jyv9p1y1h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: differ_serializer
timestamp: Fri 2008-12-05 16:18:47 -0600
message:
Add an Inter test that actually uses InterDifferingSerializer
modified:
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
------------------------------------------------------------
revno: 3874.12.6
revision-id: john at arbash-meinel.com-20081205221809-d3c4cz1jyv9p1y1h
parent: john at arbash-meinel.com-20081205172501-a0g7ho4sl29q6dz9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: differ_serializer
timestamp: Fri 2008-12-05 16:18:09 -0600
message:
Bring in Inventory._make_delta
modified:
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
------------------------------------------------------------
revno: 3874.12.5
revision-id: john at arbash-meinel.com-20081205172501-a0g7ho4sl29q6dz9
parent: john at arbash-meinel.com-20081205164010-05sx88jxi50q819a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: add_inventory_by_delta
timestamp: Fri 2008-12-05 11:25:01 -0600
message:
Change record_delete() to return the delta.
Add direct tests for CB.get_basis_delta(), to ensure that it returns a
valid delta, and that it errors if the client hasn't called will_record_deletes.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
------------------------------------------------------------
revno: 3874.12.4
revision-id: john at arbash-meinel.com-20081205164010-05sx88jxi50q819a
parent: john at arbash-meinel.com-20081205162905-12c9k3esfetyes4a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: add_inventory_by_delta
timestamp: Fri 2008-12-05 10:40:10 -0600
message:
This didn't land in 1.9 or 1.10, so make the minimum version 1.11
modified:
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3874.12.3
revision-id: john at arbash-meinel.com-20081205162905-12c9k3esfetyes4a
parent: john at arbash-meinel.com-20081205160704-ti2a80z9tvqehwws
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: differ_serializer
timestamp: Fri 2008-12-05 10:29:05 -0600
message:
Hide the .basis_delta variable, and require callers to use .get_basis_delta()
This allows us to check that the callers were sure they would be
generating a proper delta, by using CommitBuilder.record_delete() correctly.
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3874.12.2
revision-id: john at arbash-meinel.com-20081205160704-ti2a80z9tvqehwws
parent: john at arbash-meinel.com-20081205160233-f4c61by1u3kf5sqj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: differ_serializer
timestamp: Fri 2008-12-05 10:07:04 -0600
message:
Rename add_inventory_delta to add_inventory_by_delta.
renamed:
bzrlib/tests/per_repository/test_add_inventory_delta.py => bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
------------------------------------------------------------
revno: 3874.12.1
revision-id: john at arbash-meinel.com-20081205160233-f4c61by1u3kf5sqj
parent: pqm at pqm.ubuntu.com-20081205135154-uwqcpl3lruah9fo3
parent: robertc at robertcollins.net-20081013044331-ibghe8j4no7uhb55
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: differ_serializer
timestamp: Fri 2008-12-05 10:02:33 -0600
message:
Merge in the add_inventory_delta code.
added:
bzrlib/tests/per_repository/test_add_inventory_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
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
------------------------------------------------------------
revno: 3775.2.3
revision-id: robertc at robertcollins.net-20081013044331-ibghe8j4no7uhb55
parent: robertc at robertcollins.net-20081013043229-dn4s7hfg6h6zcobm
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-delta
timestamp: Mon 2008-10-13 15:43:31 +1100
message:
Delegate basis inventory calculation during commit to the CommitBuilder object.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
------------------------------------------------------------
revno: 3775.2.2
revision-id: robertc at robertcollins.net-20081013043229-dn4s7hfg6h6zcobm
parent: robertc at robertcollins.net-20081013002817-xxxsr37afvuhbzdx
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-delta
timestamp: Mon 2008-10-13 15:32:29 +1100
message:
Teach CommitBuilder to accumulate inventory deltas.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
------------------------------------------------------------
revno: 3775.2.1
revision-id: robertc at robertcollins.net-20081013002817-xxxsr37afvuhbzdx
parent: pqm at pqm.ubuntu.com-20081012204951-j2dgh06nuzrak1ri
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-delta
timestamp: Mon 2008-10-13 11:28:17 +1100
message:
Create bzrlib.repository.Repository.add_inventory_delta for adding inventories via deltas.
added:
bzrlib/tests/per_repository/test_add_inventory_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3874.2.14
revision-id: pqm at pqm.ubuntu.com-20081210011933-axdrxiq306imj2ty
parent: pqm at pqm.ubuntu.com-20081210004116-qqips4wfg800p4ku
parent: john at arbash-meinel.com-20081210000733-5h1j6enwe37ymnuj
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-12-10 01:19:33 +0000
message:
(jam) Add a FIFOCache class, to allow max-size with less overhead,
though lower hit rate.
added:
bzrlib/fifo_cache.py fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3874.11.8
revision-id: john at arbash-meinel.com-20081210000733-5h1j6enwe37ymnuj
parent: john at arbash-meinel.com-20081209222640-u3iece2ixcd0q7lj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fifo_cache
timestamp: Tue 2008-12-09 18:07:33 -0600
message:
Handle that Python2.4 doesn't have collections.deque.remove
modified:
bzrlib/fifo_cache.py fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
------------------------------------------------------------
revno: 3874.11.7
revision-id: john at arbash-meinel.com-20081209222640-u3iece2ixcd0q7lj
parent: john at arbash-meinel.com-20081209220341-9d70gll0szipelao
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fifo_cache
timestamp: Tue 2008-12-09 16:26:40 -0600
message:
Add a FIFOSizeCache which is constrained based on the size of the values.
modified:
bzrlib/fifo_cache.py fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
------------------------------------------------------------
revno: 3874.11.6
revision-id: john at arbash-meinel.com-20081209220341-9d70gll0szipelao
parent: john at arbash-meinel.com-20081209220003-05o6ymacid6io8mn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fifo_cache
timestamp: Tue 2008-12-09 16:03:41 -0600
message:
Test that del x[foo] also triggers a cleanup.
modified:
bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
------------------------------------------------------------
revno: 3874.11.5
revision-id: john at arbash-meinel.com-20081209220003-05o6ymacid6io8mn
parent: john at arbash-meinel.com-20081209215736-6rvlqtzobqbwqn2m
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fifo_cache
timestamp: Tue 2008-12-09 16:00:03 -0600
message:
Add tests that *adding* an entry also triggers the cleanup code.
modified:
bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
------------------------------------------------------------
revno: 3874.11.4
revision-id: john at arbash-meinel.com-20081209215736-6rvlqtzobqbwqn2m
parent: john at arbash-meinel.com-20081209215038-uevgqhtrnlgnkecj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fifo_cache
timestamp: Tue 2008-12-09 15:57:36 -0600
message:
Implement setdefault.
modified:
bzrlib/fifo_cache.py fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
------------------------------------------------------------
revno: 3874.11.3
revision-id: john at arbash-meinel.com-20081209215038-uevgqhtrnlgnkecj
parent: john at arbash-meinel.com-20081209213917-c5ko2gvw831txpt8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fifo_cache
timestamp: Tue 2008-12-09 15:50:38 -0600
message:
Implement update
modified:
bzrlib/fifo_cache.py fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
------------------------------------------------------------
revno: 3874.11.2
revision-id: john at arbash-meinel.com-20081209213917-c5ko2gvw831txpt8
parent: john at arbash-meinel.com-20081209213549-yc1mqv3l5gun9c63
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fifo_cache
timestamp: Tue 2008-12-09 15:39:17 -0600
message:
Add a test which fails because we don't call cleanup funcs during deconstruction.
modified:
bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
------------------------------------------------------------
revno: 3874.11.1
revision-id: john at arbash-meinel.com-20081209213549-yc1mqv3l5gun9c63
parent: pqm at pqm.ubuntu.com-20081209163533-fj6hx9l65sretbai
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fifo_cache
timestamp: Tue 2008-12-09 15:35:49 -0600
message:
Start working on a FIFOCache.
This is designed to have less runtime cost than the LRUCache.
Mostly because we don't have to do any recording work on *access*
only on update or delete.
As such, we subclass dict directly, because experiments show that
it performed the best. Unfortunately, even though we don't have
a custom __getitem__ implementation, it is still approx 2x slower
than using a raw dict.
added:
bzrlib/fifo_cache.py fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3874.2.13
revision-id: pqm at pqm.ubuntu.com-20081210004116-qqips4wfg800p4ku
parent: pqm at pqm.ubuntu.com-20081209205258-uop2lclksyc9whj8
parent: john at arbash-meinel.com-20081209223156-8usxe0ihbbg4cpjq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-12-10 00:41:16 +0000
message:
(jam) Tweaks to the LRUCache code, butter memory use,
mostly code cleanup.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
------------------------------------------------------------
revno: 3874.10.2
revision-id: john at arbash-meinel.com-20081209223156-8usxe0ihbbg4cpjq
parent: john at arbash-meinel.com-20081208182300-u1qmnxafwt2rr5dz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lru_cache
timestamp: Tue 2008-12-09 16:31:56 -0600
message:
Only cache cleanup functions if they aren't None.
modified:
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
------------------------------------------------------------
revno: 3874.10.1
revision-id: john at arbash-meinel.com-20081208182300-u1qmnxafwt2rr5dz
parent: pqm at pqm.ubuntu.com-20081205181554-ofrdnafloc43bxkh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lru_cache
timestamp: Mon 2008-12-08 12:23:00 -0600
message:
Add LRUCache.resize(), and change the init arguments for LRUCache.
The old name was a bit confusing, and caused LRUSizeCache to re-use variables in
a confusing way with LRUCache.
Also, this changes the default cleanup size to be 80% of max_size. This should
be better, as it means we get a little bit of room when adding keys,
rather than having to cleanup after every add, we can instead do it in
batches.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
------------------------------------------------------------
revno: 3874.2.12
revision-id: pqm at pqm.ubuntu.com-20081209205258-uop2lclksyc9whj8
parent: pqm at pqm.ubuntu.com-20081209163533-fj6hx9l65sretbai
parent: gphemsley at gmail.com-20081209194959-qk6a4ho0v6qbcvrs
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-12-09 20:52:58 +0000
message:
(Gordon P. Hemsley) Add a trailing slash to directories for 'bzr ls'
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3874.9.6
revision-id: gphemsley at gmail.com-20081209194959-qk6a4ho0v6qbcvrs
parent: gphemsley at gmail.com-20081209092211-t41qyggtpohyxz3p
committer: Gordon P. Hemsley <gphemsley at gmail.com>
branch nick: bug-306424-ls-trailing-slash
timestamp: Tue 2008-12-09 14:49:59 -0500
message:
Revert added slash for null-separated output of 'bzr ls'.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
------------------------------------------------------------
revno: 3874.9.5
revision-id: gphemsley at gmail.com-20081209092211-t41qyggtpohyxz3p
parent: gphemsley at gmail.com-20081209091818-03c3z0cyty2jn2gv
committer: Gordon P. Hemsley <gphemsley at gmail.com>
branch nick: bug-306424-ls-trailing-slash
timestamp: Tue 2008-12-09 04:22:11 -0500
message:
Fixed I-before-E typo in passing.
modified:
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3874.9.4
revision-id: gphemsley at gmail.com-20081209091818-03c3z0cyty2jn2gv
parent: gphemsley at gmail.com-20081209091359-t9j2isw8vhrpxk85
committer: Gordon P. Hemsley <gphemsley at gmail.com>
branch nick: bug-306424-ls-trailing-slash
timestamp: Tue 2008-12-09 04:18:18 -0500
message:
Add note to NEWS.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3874.9.3
revision-id: gphemsley at gmail.com-20081209091359-t9j2isw8vhrpxk85
parent: gphemsley at gmail.com-20081209090945-dj6nxd0vdsqlc2bh
committer: Gordon P. Hemsley <gphemsley at gmail.com>
branch nick: bug-306424-ls-trailing-slash
timestamp: Tue 2008-12-09 04:13:59 -0500
message:
Small optimization.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3874.9.2
revision-id: gphemsley at gmail.com-20081209090945-dj6nxd0vdsqlc2bh
parent: gphemsley at gmail.com-20081209090003-jp2tf9268mfum2j3
committer: Gordon P. Hemsley <gphemsley at gmail.com>
branch nick: bug-306424-ls-trailing-slash
timestamp: Tue 2008-12-09 04:09:45 -0500
message:
Change unittests to conform to new output.
modified:
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
------------------------------------------------------------
revno: 3874.9.1
revision-id: gphemsley at gmail.com-20081209090003-jp2tf9268mfum2j3
parent: pqm at pqm.ubuntu.com-20081209023452-12dbzcwzxrt1xee3
committer: Gordon P. Hemsley <gphemsley at gmail.com>
branch nick: bug-306424-ls-trailing-slash
timestamp: Tue 2008-12-09 04:00:03 -0500
message:
Add trailing slash after directories.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3874.2.11
revision-id: pqm at pqm.ubuntu.com-20081209163533-fj6hx9l65sretbai
parent: pqm at pqm.ubuntu.com-20081209155126-st6whj38jx3nl0ft
parent: john at arbash-meinel.com-20081208194402-v50vbmybtyiojlk5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-12-09 16:35:33 +0000
message:
(jam) Default to urllib for http and pycurl for https
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 3874.8.1
revision-id: john at arbash-meinel.com-20081208194402-v50vbmybtyiojlk5
parent: pqm at pqm.ubuntu.com-20081205181554-ofrdnafloc43bxkh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: default_urllib
timestamp: Mon 2008-12-08 13:44:02 -0600
message:
Use urllib for http connections, pycurl for https connections.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 3874.2.10
revision-id: pqm at pqm.ubuntu.com-20081209155126-st6whj38jx3nl0ft
parent: pqm at pqm.ubuntu.com-20081209023452-12dbzcwzxrt1xee3
parent: aaron at aaronbentley.com-20081209151508-nd1jb1vv2z22llwm
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-12-09 15:51:26 +0000
message:
Pull -v respects log_format config var (abentley)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
------------------------------------------------------------
revno: 3848.1.5
revision-id: aaron at aaronbentley.com-20081209151508-nd1jb1vv2z22llwm
parent: aaron at aaronbentley.com-20081209033614-3zjvk6v47u039uzd
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: pull-log
timestamp: Tue 2008-12-09 07:15:08 -0800
message:
Updates from review
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
------------------------------------------------------------
revno: 3848.1.4
revision-id: aaron at aaronbentley.com-20081209033614-3zjvk6v47u039uzd
parent: aaron at aaronbentley.com-20081209033407-zrrszq9wddwln1y2
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: pull-log
timestamp: Mon 2008-12-08 19:36:14 -0800
message:
Add NEWS entry
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3848.1.3
revision-id: aaron at aaronbentley.com-20081209033407-zrrszq9wddwln1y2
parent: aaron at aaronbentley.com-20081209014107-w3v6jg9302mewvd0
parent: pqm at pqm.ubuntu.com-20081209023452-12dbzcwzxrt1xee3
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: pull-log
timestamp: Mon 2008-12-08 19:34:07 -0800
message:
Merge bzr.dev into pull-log.
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/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/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/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
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/__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/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/commands/test_commit.py test_commit.py-20070913161801-ydrx2k5gmv7k7eiu-1
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/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_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
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/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
------------------------------------------------------------
revno: 3848.1.2
revision-id: aaron at aaronbentley.com-20081209014107-w3v6jg9302mewvd0
parent: aaron at aaronbentley.com-20081209013728-43v0yz6mo2jfexqv
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: pull-log
timestamp: Mon 2008-12-08 17:41:07 -0800
message:
Make test stricter
modified:
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
------------------------------------------------------------
revno: 3848.1.1
revision-id: aaron at aaronbentley.com-20081209013728-43v0yz6mo2jfexqv
parent: pqm at pqm.ubuntu.com-20081125021810-2dhu9lqkn6nh5bhn
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: pull-log
timestamp: Mon 2008-12-08 17:37:28 -0800
message:
Use default log format in pull -v
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
-------------- next part --------------
Diff too large for email (1904 lines, the limit is 1000).
More information about the bazaar-commits
mailing list