Rev 2855: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/repository
Robert Collins
robertc at robertcollins.net
Wed Oct 24 08:51:57 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/repository
------------------------------------------------------------
revno: 2855
revision-id:robertc at robertcollins.net-20071024075138-ga16uc9y30zbx7pv
parent: robertc at robertcollins.net-20071024061048-rb8hsmwonvfjc4nd
parent: pqm at pqm.ubuntu.com-20071024072800-p2qtv2632xrbrs02
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Wed 2007-10-24 17:51:38 +1000
message:
Merge bzr.dev.
added:
doc/developers/knitpack.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_unversion.py test_unversion.py-20060907074408-bygh2y28jz8u0cg7-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.5
revision-id:pqm at pqm.ubuntu.com-20071024072800-p2qtv2632xrbrs02
parent: pqm at pqm.ubuntu.com-20071024064813-wjcmv8ofabf6kdrb
parent: robertc at robertcollins.net-20071024055927-m6ce9f0g9i2eshmk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-10-24 08:28:00 +0100
message:
(robertc) Use a dictionary to obtain stat caches rather than digging into the dirstate on every path. (Robert Collins)
modified:
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.1.2
revision-id:robertc at robertcollins.net-20071024055927-m6ce9f0g9i2eshmk
parent: robertc at robertcollins.net-20071024002950-5gri1p7b9m8t821c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: workingtree
timestamp: Wed 2007-10-24 15:59:27 +1000
message:
Review feedback.
modified:
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.4
revision-id:pqm at pqm.ubuntu.com-20071024064813-wjcmv8ofabf6kdrb
parent: pqm at pqm.ubuntu.com-20071024044649-kbitd7qj38zvoc6t
parent: mbp at sourcefrog.net-20071024055951-6bmkfmgqh2188cij
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-10-24 07:48:13 +0100
message:
Pack repositories!
added:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
doc/developers/knitpack.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
modified:
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
------------------------------------------------------------
revno: 2849.1.18
revision-id:mbp at sourcefrog.net-20071024055951-6bmkfmgqh2188cij
parent: mbp at sourcefrog.net-20071024055221-sjtcpa4y3n2vei2n
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mbp-packrepo-as-knits
timestamp: Wed 2007-10-24 15:59:51 +1000
message:
Remove redundant set construction from InterPackRepo.missing_revisions
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 2849.1.17
revision-id:mbp at sourcefrog.net-20071024055221-sjtcpa4y3n2vei2n
parent: mbp at sourcefrog.net-20071024053357-f14dwhhkxq963srw
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mbp-packrepo-as-knits
timestamp: Wed 2007-10-24 15:52:21 +1000
message:
Rename RepositoryPackCollection.release_names to _unlock_names
modified:
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 2849.1.16
revision-id:mbp at sourcefrog.net-20071024053357-f14dwhhkxq963srw
parent: mbp at sourcefrog.net-20071024051739-9q5q18lqjxgdkqtk
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mbp-packrepo-as-knits
timestamp: Wed 2007-10-24 15:33:57 +1000
message:
doc
modified:
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
------------------------------------------------------------
revno: 2849.1.15
revision-id:mbp at sourcefrog.net-20071024051739-9q5q18lqjxgdkqtk
parent: mbp at sourcefrog.net-20071024051138-x6b3ff9n51ectin8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mbp-packrepo-as-knits
timestamp: Wed 2007-10-24 15:17:39 +1000
message:
Pack doc updates
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 2849.1.14
revision-id:mbp at sourcefrog.net-20071024051138-x6b3ff9n51ectin8
parent: mbp at sourcefrog.net-20071024050514-3upf39jw3sto5c4t
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mbp-packrepo-as-knits
timestamp: Wed 2007-10-24 15:11:38 +1000
message:
Rename RepositoryPackCollection.release_names to _unlock_names
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 2849.1.13
revision-id:mbp at sourcefrog.net-20071024050514-3upf39jw3sto5c4t
parent: mbp at sourcefrog.net-20071024045601-m2uui0mpepncnegz
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mbp-packrepo-as-knits
timestamp: Wed 2007-10-24 15:05:14 +1000
message:
Make RepositoryPackCollection.remove_pack_from_memory private
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 2849.1.12
revision-id:mbp at sourcefrog.net-20071024045601-m2uui0mpepncnegz
parent: mbp at sourcefrog.net-20071024041720-9q9fk7z182x358bu
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mbp-packrepo-as-knits
timestamp: Wed 2007-10-24 14:56:01 +1000
message:
Review cleanups
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 2849.1.11
revision-id:mbp at sourcefrog.net-20071024041720-9q9fk7z182x358bu
parent: mbp at sourcefrog.net-20071024024612-qp7h7ibrt7sgk1gj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mbp-packrepo-as-knits
timestamp: Wed 2007-10-24 14:17:20 +1000
message:
Use -Dpack not -Dfetch for pack traces
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 2849.1.10
revision-id:mbp at sourcefrog.net-20071024024612-qp7h7ibrt7sgk1gj
parent: mbp at sourcefrog.net-20071024023404-f0ek37fme5xnqggn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mbp-packrepo-as-knits
timestamp: Wed 2007-10-24 12:46:12 +1000
message:
Review cleanups
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 2849.1.9
revision-id:mbp at sourcefrog.net-20071024023404-f0ek37fme5xnqggn
parent: mbp at sourcefrog.net-20071024023314-l9mscm8wsb1bvj1f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mbp-packrepo-as-knits
timestamp: Wed 2007-10-24 12:34:04 +1000
message:
Disambiguate two member variables called _packs into _packs_by_name and _pack_collection
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 2849.1.8
revision-id:mbp at sourcefrog.net-20071024023314-l9mscm8wsb1bvj1f
parent: mbp at sourcefrog.net-20071024021411-nm686fr2koy4wao2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mbp-packrepo-as-knits
timestamp: Wed 2007-10-24 12:33:14 +1000
message:
typo
modified:
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
------------------------------------------------------------
revno: 2849.1.7
revision-id:mbp at sourcefrog.net-20071024021411-nm686fr2koy4wao2
parent: mbp at sourcefrog.net-20071024015212-3m7lguxlh48028a3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mbp-packrepo-as-knits
timestamp: Wed 2007-10-24 12:14:11 +1000
message:
Review comments on knitpack docs
modified:
doc/developers/knitpack.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
------------------------------------------------------------
revno: 2849.1.6
revision-id:mbp at sourcefrog.net-20071024015212-3m7lguxlh48028a3
parent: mbp at sourcefrog.net-20071023074231-33xzgjac8ujrniq9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mbp-packrepo-as-knits
timestamp: Wed 2007-10-24 11:52:12 +1000
message:
Initial pack format documentation
added:
doc/developers/knitpack.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
modified:
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
------------------------------------------------------------
revno: 2849.1.5
revision-id:mbp at sourcefrog.net-20071023074231-33xzgjac8ujrniq9
parent: mbp at sourcefrog.net-20071023072016-nwp92ry69jhza4de
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mbp-packrepo-as-knits
timestamp: Tue 2007-10-23 17:42:31 +1000
message:
docstrings and error messages from review
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 2849.1.4
revision-id:mbp at sourcefrog.net-20071023072016-nwp92ry69jhza4de
parent: mbp at sourcefrog.net-20071023071532-36ufqeq0o1gxnoui
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mbp-packrepo-as-knits
timestamp: Tue 2007-10-23 17:20:16 +1000
message:
Rename NewPack.indices to NewPack.index_definitions
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 2849.1.3
revision-id:mbp at sourcefrog.net-20071023071532-36ufqeq0o1gxnoui
parent: mbp at sourcefrog.net-20071023071118-wlx2okx4j2jzdowq
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: robertc-repo-as-knits
timestamp: Tue 2007-10-23 17:15:32 +1000
message:
formatting and docstrings
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 2849.1.2
revision-id:mbp at sourcefrog.net-20071023071118-wlx2okx4j2jzdowq
parent: mbp at sourcefrog.net-20071023065705-kwal0xaqws81ajxh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: robertc-repo-as-knits
timestamp: Tue 2007-10-23 17:11:18 +1000
message:
formatting
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 2849.1.1
revision-id:mbp at sourcefrog.net-20071023065705-kwal0xaqws81ajxh
parent: robertc at robertcollins.net-20071022012351-16lm27an2lbzk038
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: robertc-repo-as-knits
timestamp: Tue 2007-10-23 16:57:05 +1000
message:
Rename GraphKnitRepository etc to KnitPackRepository
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.3
revision-id:pqm at pqm.ubuntu.com-20071024044649-kbitd7qj38zvoc6t
parent: pqm at pqm.ubuntu.com-20071024010521-24bf7muf0r4r5bp9
parent: bialix at ukr.net-20071022141157-vk4rnjw355v86ioo
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-10-24 05:46:49 +0100
message:
bzr in 5 min: trivial fix for title
modified:
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.5.1
revision-id:bialix at ukr.net-20071022141157-vk4rnjw355v86ioo
parent: pqm at pqm.ubuntu.com-20071019201226-6z006xotgfe7zmu8
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: trivial
timestamp: Mon 2007-10-22 17:11:57 +0300
message:
bzr in 5 min: trivial fix for title
modified:
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.2
revision-id:pqm at pqm.ubuntu.com-20071024010521-24bf7muf0r4r5bp9
parent: pqm at pqm.ubuntu.com-20071023230126-g4h0l6g1dz8e3d57
parent: robertc at robertcollins.net-20071024001931-d080vqc683qdsvvp
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-10-24 02:05:21 +0100
message:
(robertc) Minor tweaks to commit to reduce the dependence on inventories. (Robert Collins)
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.4.7
revision-id:robertc at robertcollins.net-20071024001931-d080vqc683qdsvvp
parent: robertc at robertcollins.net-20071023071720-43qn6f048dvn95ew
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Wed 2007-10-24 10:19:31 +1000
message:
Correct the check_pointless change to pass all tests.
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.4.6
revision-id:robertc at robertcollins.net-20071023071720-43qn6f048dvn95ew
parent: robertc at robertcollins.net-20071022224454-mq7ff0qe7evdupb0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Tue 2007-10-23 17:17:20 +1000
message:
Typos found by Rob Weir.
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.4.5
revision-id:robertc at robertcollins.net-20071022224454-mq7ff0qe7evdupb0
parent: robertc at robertcollins.net-20071022214256-r19wm0qutqjezc21
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Tue 2007-10-23 08:44:54 +1000
message:
Remove an unnecessary assertion.
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.4.4
revision-id:robertc at robertcollins.net-20071022214256-r19wm0qutqjezc21
parent: robertc at robertcollins.net-20071022213824-guihq55zholcyqgj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Tue 2007-10-23 07:42:56 +1000
message:
Minor import cleanup in commit.py.
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.4.3
revision-id:robertc at robertcollins.net-20071022213824-guihq55zholcyqgj
parent: robertc at robertcollins.net-20071022212902-tpiqbukqzen5lsg4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Tue 2007-10-23 07:38:24 +1000
message:
Remove more basis inventory usage.
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.4.2
revision-id:robertc at robertcollins.net-20071022212902-tpiqbukqzen5lsg4
parent: robertc at robertcollins.net-20071022212521-wac62k68k3quy6om
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Tue 2007-10-23 07:29:02 +1000
message:
Remove unneeded shortcut in commit's check_pointless logic.
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.4.1
revision-id:robertc at robertcollins.net-20071022212521-wac62k68k3quy6om
parent: pqm at pqm.ubuntu.com-20071019201226-6z006xotgfe7zmu8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Tue 2007-10-23 07:25:21 +1000
message:
During commit check for the first commit by NULL_REVISION rather than a completely empty basis tree, removing one use of the basis inventory.
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.1
revision-id:pqm at pqm.ubuntu.com-20071023230126-g4h0l6g1dz8e3d57
parent: pqm at pqm.ubuntu.com-20071023082111-h6u34i4gvlb2nwch
parent: john at arbash-meinel.com-20071023214830-5mlzu2mjcmnx7znz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-10-24 00:01:26 +0100
message:
(John Arbash Meinel) Fix bug #114615 by telling WT4.unversion() to skip renamed entries.
modified:
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_unversion.py test_unversion.py-20060907074408-bygh2y28jz8u0cg7-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.1.2.6
revision-id:john at arbash-meinel.com-20071023214830-5mlzu2mjcmnx7znz
parent: john at arbash-meinel.com-20071023213503-xrvfwqsaah4jmfn2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bogus_removal_114615
timestamp: Tue 2007-10-23 16:48:30 -0500
message:
Add another direct test in unversion, because the other test
did not trigger the 'delete a file in another directory' bug.
modified:
bzrlib/tests/workingtree_implementations/test_unversion.py test_unversion.py-20060907074408-bygh2y28jz8u0cg7-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.1.2.5
revision-id:john at arbash-meinel.com-20071023213503-xrvfwqsaah4jmfn2
parent: john at arbash-meinel.com-20071023211052-ru4vxnhwb0vpemz4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bogus_removal_114615
timestamp: Tue 2007-10-23 16:35:03 -0500
message:
Add a direct test for WT.unversion()
modified:
bzrlib/tests/workingtree_implementations/test_unversion.py test_unversion.py-20060907074408-bygh2y28jz8u0cg7-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.1.2.4
revision-id:john at arbash-meinel.com-20071023211052-ru4vxnhwb0vpemz4
parent: john at arbash-meinel.com-20071023195147-echbf8brs44uifo4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bogus_removal_114615
timestamp: Tue 2007-10-23 16:10:52 -0500
message:
Fix bug #114615 by teaching unversion() to not touch renamed entries.
modified:
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.1.2.3
revision-id:john at arbash-meinel.com-20071023195147-echbf8brs44uifo4
parent: john at arbash-meinel.com-20071023194449-wb8fafx5unde63wq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bogus_removal_114615
timestamp: Tue 2007-10-23 14:51:47 -0500
message:
Add a test which shows why the previous fix is broken.
Basically, it causes files which are renamed *out* of that directory to
be considered deleted. So instead just remove the assertion that
the target should not be absent.
modified:
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.1.2.2
revision-id:john at arbash-meinel.com-20071023194449-wb8fafx5unde63wq
parent: john at arbash-meinel.com-20071023181218-in3x181fnemz3vfj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bogus_removal_114615
timestamp: Tue 2007-10-23 14:44:49 -0500
message:
If THIS is considered renamed, _make_absent needs to remove the renamed target.
modified:
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.1.2.1
revision-id:john at arbash-meinel.com-20071023181218-in3x181fnemz3vfj
parent: pqm at pqm.ubuntu.com-20071022014712-mpln8namgmsywr75
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bogus_removal_114615
timestamp: Tue 2007-10-23 13:12:18 -0500
message:
Add failing tests exposing part of bug #114615
modified:
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
Diff too large for email (1690 lines, the limit is 1000).
More information about the bazaar-commits
mailing list