Rev 3035: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/integration
Robert Collins
robertc at robertcollins.net
Tue Nov 27 01:20:19 GMT 2007
At http://people.ubuntu.com/~robertc/baz2.0/integration
------------------------------------------------------------
revno: 3035
revision-id:robertc at robertcollins.net-20071127012001-sb2v181c9f6vmku4
parent: robertc at robertcollins.net-20071126223325-wua9x81prpxueom3
parent: pqm at pqm.ubuntu.com-20071127010418-gbuxg943nyu8vefz
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-11-27 12:20:01 +1100
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
doc/en/user-reference/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
------------------------------------------------------------
revno: 3015.1.17
revision-id:pqm at pqm.ubuntu.com-20071127010418-gbuxg943nyu8vefz
parent: pqm at pqm.ubuntu.com-20071126224137-gnhd7r5hx7f0064k
parent: bialix at ukr.net-20071127000416-4ruwdemf42kqbzm4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-11-27 01:04:18 +0000
message:
Mark .bzr directories as "hidden" on Windows (#71147)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 3015.1.8.2.4
revision-id:bialix at ukr.net-20071127000416-4ruwdemf42kqbzm4
parent: bialix at ukr.net-20071126234215-dwyxq2ww5sg3xzua
parent: pqm at pqm.ubuntu.com-20071126224137-gnhd7r5hx7f0064k
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: hidden.dot.bzr
timestamp: Tue 2007-11-27 02:04:16 +0200
message:
merge bzr.dev
renamed:
doc/developers/knitpack.txt => doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-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/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/ftp_server.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/workingtree_implementations/test_break_lock.py test_break_lock.py-20060504115740-233e245df546fd42
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
doc/en/user-reference/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
------------------------------------------------------------
revno: 3015.1.8.2.3
revision-id:bialix at ukr.net-20071126234215-dwyxq2ww5sg3xzua
parent: bialix at ukr.net-20071126085441-lx9pwr0gcahikyp4
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: hidden.dot.bzr
timestamp: Tue 2007-11-27 01:42:15 +0200
message:
John's review
modified:
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3015.1.8.2.2
revision-id:bialix at ukr.net-20071126085441-lx9pwr0gcahikyp4
parent: bialix at ukr.net-20071126080822-iel61wjqbkju9s0v
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: hidden.dot.bzr
timestamp: Mon 2007-11-26 10:54:41 +0200
message:
Martin's review.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 3015.1.8.2.1
revision-id:bialix at ukr.net-20071126080822-iel61wjqbkju9s0v
parent: pqm at pqm.ubuntu.com-20071125173141-g89p6qnnh90tk5zi
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: hidden.dot.bzr
timestamp: Mon 2007-11-26 10:08:22 +0200
message:
Mark .bzr directories as "hidden" on Windows (#71147)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3015.1.16
revision-id:pqm at pqm.ubuntu.com-20071126224137-gnhd7r5hx7f0064k
parent: pqm at pqm.ubuntu.com-20071126220540-8eco84avp18lelr8
parent: john at arbash-meinel.com-20071126184333-6yq2kjjrrige0th4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-11-26 22:41:37 +0000
message:
(John Arbash Meinel) doc update for post-push hook.
modified:
doc/en/user-reference/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
------------------------------------------------------------
revno: 3015.1.11.2.1
revision-id:john at arbash-meinel.com-20071126184333-6yq2kjjrrige0th4
parent: pqm at pqm.ubuntu.com-20071126151329-pnmm49obwettpwcd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr.dev
timestamp: Mon 2007-11-26 12:43:33 -0600
message:
Updated post-push hook to have the correct info
modified:
doc/en/user-reference/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
------------------------------------------------------------
revno: 3015.1.15
revision-id:pqm at pqm.ubuntu.com-20071126220540-8eco84avp18lelr8
parent: pqm at pqm.ubuntu.com-20071126213320-adxxra3gsie5inhw
parent: nick.allen at onlinehome.de-20071126195002-dww3pl41b83er5i5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-11-26 22:05:40 +0000
message:
Fix small typo in command description for the revert command.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3015.1.11.1.1
revision-id:nick.allen at onlinehome.de-20071126195002-dww3pl41b83er5i5
parent: pqm at pqm.ubuntu.com-20071126151329-pnmm49obwettpwcd
committer: Nicholas Allen <nick.allen at onlinehome.de>
branch nick: bzr.dev
timestamp: Mon 2007-11-26 20:50:02 +0100
message:
Fix small typo in command description for the revert command.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3015.1.14
revision-id:pqm at pqm.ubuntu.com-20071126213320-adxxra3gsie5inhw
parent: pqm at pqm.ubuntu.com-20071126205533-5vehpxjf6uk2n8fy
parent: robertc at robertcollins.net-20071126203008-hst9k6pxrbzoci6w
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-11-26 21:33:20 +0000
message:
(robertc) Many fixes to support packs on the smart server and as the
default format. (Robert Collins)
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/workingtree_implementations/test_break_lock.py test_break_lock.py-20060504115740-233e245df546fd42
------------------------------------------------------------
revno: 3015.1.13
revision-id:pqm at pqm.ubuntu.com-20071126205533-5vehpxjf6uk2n8fy
parent: pqm at pqm.ubuntu.com-20071126201850-7bugi709x0jjfqpg
parent: abentley at panoramicfeedback.com-20071126200031-bf33kxb528sokzsl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-11-26 20:55:33 +0000
message:
Revert of single files in deleted directories works
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.3.1.20.1.9
revision-id:abentley at panoramicfeedback.com-20071126200031-bf33kxb528sokzsl
parent: abentley at panoramicfeedback.com-20071126195409-joxaj1oc8vkxbhcv
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-11-26 15:00:31 -0500
message:
Update from review
modified:
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.3.1.20.1.8
revision-id:abentley at panoramicfeedback.com-20071126195409-joxaj1oc8vkxbhcv
parent: abentley at panoramicfeedback.com-20071123145054-s505aar7vfacxi4q
parent: pqm at pqm.ubuntu.com-20071126151329-pnmm49obwettpwcd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-11-26 14:54:09 -0500
message:
Merge bzr.dev
renamed:
doc/developers/knitpack.txt => doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/ftp_server.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/BSD-LICENSE.txt BSDLICENSE.txt-20051018184548-29b89ff3102657f5
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.3.1.20.1.7
revision-id:abentley at panoramicfeedback.com-20071123145054-s505aar7vfacxi4q
parent: abentley at panoramicfeedback.com-20071123144718-ax42ydiszzmfgjp4
parent: pqm at pqm.ubuntu.com-20071123053719-gxfu09uacv4heh6w
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-11-23 09:50:54 -0500
message:
Merge bzr.dev
modified:
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.3.1.20.1.6
revision-id:abentley at panoramicfeedback.com-20071123144718-ax42ydiszzmfgjp4
parent: abentley at panoramicfeedback.com-20071123142218-23kpodwqohb9oabv
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-11-23 09:47:18 -0500
message:
Revert doesn't crash restoring a file from a deleted directory
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.3.1.20.1.5
revision-id:abentley at panoramicfeedback.com-20071123142218-23kpodwqohb9oabv
parent: aaron.bentley at utoronto.ca-20071123140933-qwrs22s00rpeqmt7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-11-23 09:22:18 -0500
message:
Fix revert when parent dir is missing
modified:
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.3.1.20.1.4
revision-id:aaron.bentley at utoronto.ca-20071123140933-qwrs22s00rpeqmt7
parent: aaron.bentley at utoronto.ca-20071123051912-d7uajj7tdxsqkx4y
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-11-23 09:09:33 -0500
message:
Add failing test case
modified:
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.3.1.20.1.3
revision-id:aaron.bentley at utoronto.ca-20071123051912-d7uajj7tdxsqkx4y
parent: abentley at panoramicfeedback.com-20071121222444-l8qropwv3vcedv1j
parent: pqm at pqm.ubuntu.com-20071123043953-lv68pawzrpa4s9t9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-11-23 00:19:12 -0500
message:
Merge bzr.dev
added:
bzrlib/switch.py switch.py-20071116011000-v5lnw7d2wkng9eux-1
bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
bzrlib/tests/repository_implementations/test__generate_text_key_index.py test__generate_text_-20071114232121-00h9fd8qg8kjfa5k-1
bzrlib/tests/repository_implementations/test_find_text_key_references.py test_find_text_key_r-20071114033605-v73bakal8x77qlfi-1
bzrlib/tests/test_switch.py test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
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/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_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
=== modified file 'NEWS'
--- a/NEWS 2007-11-26 21:01:29 +0000
+++ b/NEWS 2007-11-27 01:20:01 +0000
@@ -111,6 +111,9 @@
* Make sure Repository.fetch(self) is properly a no-op for all
Repository implementations. (John Arbash Meinel, #158333)
+ * Mark .bzr directories as "hidden" on Windows.
+ (Alexander Belchenko, #71147)
+
* ``merge --uncommitted`` can now operate on a single file.
(Aaron Bentley, Lukáš Lalinský, #136890)
@@ -135,6 +138,9 @@
symlink on some platforms (e.g. on Windows).
(Alexander Belchenko, workaround for #81689)
+ * Revert doesn't crash when restoring a single file from a deleted
+ directory. (Aaron Bentley)
+
* Stderr output via logging mechanism now goes through encoded wrapper
and no more uses utf-8, but terminal encoding instead. So all unicode
strings now should be readable in non-utf-8 terminal.
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2007-11-25 16:56:33 +0000
+++ b/bzrlib/builtins.py 2007-11-26 19:50:02 +0000
@@ -3088,9 +3088,9 @@
last committed revision is used.
To remove only some changes, without reverting to a prior version, use
- merge instead. For example, "merge . --r-2..-3" will remove the changes
- introduced by -2, without affecting the changes introduced by -1. Or
- to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
+ merge instead. For example, "merge . --revision -2..-3" will remove the
+ changes introduced by -2, without affecting the changes introduced by -1.
+ Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
By default, any files that have been manually changed will be backed up
first. (Files changed only by merge are not backed up.) Backup files have
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2007-11-26 20:49:30 +0000
+++ b/bzrlib/bzrdir.py 2007-11-27 01:20:01 +0000
@@ -29,6 +29,7 @@
from cStringIO import StringIO
import os
+import sys
from bzrlib.lazy_import import lazy_import
lazy_import(globals(), """
@@ -48,10 +49,11 @@
symbol_versioning,
ui,
urlutils,
+ win32utils,
+ workingtree,
+ workingtree_4,
xml4,
xml5,
- workingtree,
- workingtree_4,
)
from bzrlib.osutils import (
sha_strings,
@@ -1355,6 +1357,8 @@
# FIXME: RBC 20060121 don't peek under
# the covers
mode=temp_control._dir_mode)
+ if sys.platform == 'win32' and isinstance(transport, LocalTransport):
+ win32utils.set_file_attr_hidden(transport._abspath('.bzr'))
file_mode = temp_control._file_mode
del temp_control
mutter('created control directory in ' + transport.base)
=== modified file 'bzrlib/tests/test_bzrdir.py'
--- a/bzrlib/tests/test_bzrdir.py 2007-10-25 02:06:19 +0000
+++ b/bzrlib/tests/test_bzrdir.py 2007-11-26 23:42:15 +0000
@@ -21,6 +21,8 @@
import os.path
from StringIO import StringIO
+import subprocess
+import sys
from bzrlib import (
bzrdir,
@@ -29,6 +31,7 @@
repository,
symbol_versioning,
urlutils,
+ win32utils,
workingtree,
)
import bzrlib.branch
@@ -42,6 +45,7 @@
from bzrlib.tests import (
TestCase,
TestCaseWithTransport,
+ TestSkipped,
test_sftp_transport
)
from bzrlib.tests.HttpServer import HttpServer
@@ -870,3 +874,32 @@
"""Tests redirections for pycurl implementation"""
_qualifier = 'pycurl'
+
+
+class TestDotBzrHidden(TestCaseWithTransport):
+
+ ls = ['ls']
+ if sys.platform == 'win32':
+ ls = [os.environ['COMSPEC'], '/C', 'dir', '/B']
+
+ def get_ls(self):
+ f = subprocess.Popen(self.ls, stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
+ out, err = f.communicate()
+ self.assertEqual(0, f.returncode, 'Calling %s failed: %s'
+ % (self.ls, err))
+ return out.splitlines()
+
+ def test_dot_bzr_hidden(self):
+ if sys.platform == 'win32' and not win32utils.has_win32file:
+ raise TestSkipped('unable to make file hidden without pywin32 library')
+ b = bzrdir.BzrDir.create('.')
+ self.build_tree('a')
+ self.assertEquals(['a'], self.get_ls())
+
+ def test_dot_bzr_hidden_with_url(self):
+ if sys.platform == 'win32' and not win32utils.has_win32file:
+ raise TestSkipped('unable to make file hidden without pywin32 library')
+ b = bzrdir.BzrDir.create(urlutils.local_path_to_url('.'))
+ self.build_tree('a')
+ self.assertEquals(['a'], self.get_ls())
=== modified file 'bzrlib/tests/test_revert.py'
--- a/bzrlib/tests/test_revert.py 2007-08-29 20:41:28 +0000
+++ b/bzrlib/tests/test_revert.py 2007-11-26 20:00:31 +0000
@@ -132,3 +132,18 @@
' as of bzr 0.91. Please use None (the default) instead.'],
tree.revert, [])
self.assertIs(None, tree.path2id('file'))
+
+ def test_revert_file_in_deleted_dir(self):
+ tree = self.make_branch_and_tree('.')
+ self.build_tree(['dir/', 'dir/file1', 'dir/file2'])
+ tree.add(['dir', 'dir/file1', 'dir/file2'],
+ ['dir-id', 'file1-id', 'file2-id'])
+ tree.commit("Added files")
+ os.unlink('dir/file1')
+ os.unlink('dir/file2')
+ os.rmdir('dir')
+ tree.remove(['dir/', 'dir/file1', 'dir/file2'])
+ tree.revert(['dir/file1'])
+ self.failUnlessExists('dir/file1')
+ self.failIfExists('dir/file2')
+ self.assertEqual('dir-id', tree.path2id('dir'))
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py 2007-11-23 08:31:24 +0000
+++ b/bzrlib/tests/test_transform.py 2007-11-26 19:54:09 +0000
@@ -1489,3 +1489,11 @@
_mover=self.ExceptionFileMover(bad_target='d'))
self.failUnlessExists('a')
self.failUnlessExists('a/b')
+
+ def test_resolve_no_parent(self):
+ wt = self.make_branch_and_tree('.')
+ tt = TreeTransform(wt)
+ self.addCleanup(tt.finalize)
+ parent = tt.trans_id_file_id('parent-id')
+ tt.new_file('file', parent, 'Contents')
+ resolve_conflicts(tt)
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py 2007-11-25 16:42:55 +0000
+++ b/bzrlib/transform.py 2007-11-26 19:54:09 +0000
@@ -1641,7 +1641,8 @@
pp.next_phase()
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
try:
- raw_conflicts = resolve_conflicts(tt, child_pb)
+ raw_conflicts = resolve_conflicts(tt, child_pb,
+ lambda t, c: conflict_pass(t, c, target_tree))
finally:
child_pb.finished()
conflicts = cook_conflicts(raw_conflicts, tt)
@@ -1817,10 +1818,11 @@
try:
tt.final_name(trans_id)
except NoFinalPath:
- file_id = tt.final_file_id(trans_id)
- entry = path_tree.inventory[file_id]
- parent_trans_id = tt.trans_id_file_id(entry.parent_id)
- tt.adjust_path(entry.name, parent_trans_id, trans_id)
+ if path_tree is not None:
+ file_id = tt.final_file_id(trans_id)
+ entry = path_tree.inventory[file_id]
+ parent_trans_id = tt.trans_id_file_id(entry.parent_id)
+ tt.adjust_path(entry.name, parent_trans_id, trans_id)
elif c_type == 'unversioned parent':
tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1])
new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
=== modified file 'bzrlib/win32utils.py'
--- a/bzrlib/win32utils.py 2007-08-11 05:44:04 +0000
+++ b/bzrlib/win32utils.py 2007-11-26 08:54:41 +0000
@@ -64,6 +64,11 @@
else:
create_buffer = ctypes.create_unicode_buffer
suffix = 'W'
+try:
+ import win32file
+ has_win32file = True
+except ImportError:
+ has_win32file = False
# Special Win32 API constants
@@ -319,3 +324,9 @@
_winreg.CloseKey(hkey)
return fullpath
+
+
+def set_file_attr_hidden(path):
+ """Set file attributes to hidden if possible"""
+ if has_win32file:
+ win32file.SetFileAttributes(path, win32file.FILE_ATTRIBUTE_HIDDEN)
=== modified file 'doc/en/user-reference/hooks.txt'
--- a/doc/en/user-reference/hooks.txt 2007-09-02 05:37:08 +0000
+++ b/doc/en/user-reference/hooks.txt 2007-11-26 18:43:33 +0000
@@ -8,12 +8,33 @@
Run after ``push`` has completed.
The hook signature is (push_result), containing the members
-(source, local, master, old_revno, old_revid, new_revno, new_revid)
-where local is the local target branch or None, master is the target
-master branch, and the rest should be self-explanatory. The source
-is read-locked and the target branches are write-locked. Source will
-be the local low-latency branch.
-
+
+ source_branch
+ Where the data is being pushed from (read locked).
+ This should be the lowest latency branch.
+
+ target_branch
+ The direct location where data is being sent (write locked).
+
+ master_branch
+ Either target_branch, or if the target is a bound branch, it
+ will be the master location (write locked).
+
+ local_branch
+ If the target is a bound branch, this will be the target
+ branch, else it will be None.
+
+ old_revno
+ The revision number (eg 10) of the branch before the push.
+
+ old_revid
+ The revision id (eg joe at foo.com-1234234-aoeua34) before the push.
+
+ new_revno
+ The revision number (eg 12) of the branch after the push.
+
+ new_revid
+ The revision id (eg joe at foo.com-5676566-boa234a) after the push.
post_pull
#########
More information about the bazaar-commits
mailing list