Rev 2684: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/repository
Robert Collins
robertc at robertcollins.net
Mon Jul 30 06:05:11 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/repository
------------------------------------------------------------
revno: 2684
revision-id: robertc at robertcollins.net-20070730050459-2z2s5wpwmbf5ls2n
parent: robertc at robertcollins.net-20070730041513-62a5rq9dkulhwj3w
parent: pqm at pqm.ubuntu.com-20070728030946-tfjmxwe9y2eq1gzo
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2007-07-30 15:04:59 +1000
message:
Merge bzr.dev.
added:
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6
revision-id: pqm at pqm.ubuntu.com-20070728030946-tfjmxwe9y2eq1gzo
parent: pqm at pqm.ubuntu.com-20070728013305-u91kdx3px9ytdyok
parent: robertc at robertcollins.net-20070728013353-qk7394wehmg2iiph
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-07-28 04:09:46 +0100
message:
(robertc) Update bzrlib.index to support composite keys. (Robert Collins)
modified:
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.5
revision-id: pqm at pqm.ubuntu.com-20070728013305-u91kdx3px9ytdyok
parent: pqm at pqm.ubuntu.com-20070728003632-bxnvc9xfmvv9zeol
parent: abentley at panoramicfeedback.com-20070727164804-2lpkqqquk4f9u9b5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-07-28 02:33:05 +0100
message:
Add Graph.is_ancestor, update code to use it
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.1.2.7
revision-id: abentley at panoramicfeedback.com-20070727164804-2lpkqqquk4f9u9b5
parent: abentley at panoramicfeedback.com-20070727164655-6x29h59b2w5gca4h
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: kill-ancestry
timestamp: Fri 2007-07-27 12:48:04 -0400
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.1.2.6
revision-id: abentley at panoramicfeedback.com-20070727164655-6x29h59b2w5gca4h
parent: abentley at panoramicfeedback.com-20070727164406-ijy40b32kse5mb02
parent: pqm at pqm.ubuntu.com-20070727061532-14ly852y2g2dbcb8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: kill-ancestry
timestamp: Fri 2007-07-27 12:46:55 -0400
message:
Merge bzr.dev
added:
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.1.2.5
revision-id: abentley at panoramicfeedback.com-20070727164406-ijy40b32kse5mb02
parent: abentley at panoramicfeedback.com-20070727130200-cfi43ooto0r53xru
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: kill-ancestry
timestamp: Fri 2007-07-27 12:44:06 -0400
message:
Update to clarify algorithm
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.1.2.4
revision-id: abentley at panoramicfeedback.com-20070727130200-cfi43ooto0r53xru
parent: abentley at panoramicfeedback.com-20070726195604-707eq8fs9px91yjc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: kill-ancestry
timestamp: Fri 2007-07-27 09:02:00 -0400
message:
Remove get_ancestry usage from branch
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.1.2.3
revision-id: abentley at panoramicfeedback.com-20070726195604-707eq8fs9px91yjc
parent: abentley at panoramicfeedback.com-20070726195156-9zi1ke2v6tq274f3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: kill-ancestry
timestamp: Thu 2007-07-26 15:56:04 -0400
message:
correctly handle Graph.is_ancestor(x, x)
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.1.2.2
revision-id: abentley at panoramicfeedback.com-20070726195156-9zi1ke2v6tq274f3
parent: abentley at panoramicfeedback.com-20070726194625-cxg2ocrvfsyolw16
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: kill-ancestry
timestamp: Thu 2007-07-26 15:51:56 -0400
message:
Replace get_ancestry with is_ancestor
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.1.2.1
revision-id: abentley at panoramicfeedback.com-20070726194625-cxg2ocrvfsyolw16
parent: pqm at pqm.ubuntu.com-20070726134355-tlidmsn3eux09idz
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: kill-ancestry
timestamp: Thu 2007-07-26 15:46:25 -0400
message:
Implement Graph.is_ancestor
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.4
revision-id: pqm at pqm.ubuntu.com-20070728003632-bxnvc9xfmvv9zeol
parent: pqm at pqm.ubuntu.com-20070727061532-14ly852y2g2dbcb8
parent: aaron.bentley at utoronto.ca-20070727054924-9352760504k84zhe
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-07-28 01:36:32 +0100
message:
Revise text about voting to match current system
modified:
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.2.1.1
revision-id: aaron.bentley at utoronto.ca-20070727054924-9352760504k84zhe
parent: pqm at pqm.ubuntu.com-20070726223348-t2howycr63c04q7r
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.docs
timestamp: Fri 2007-07-27 01:49:24 -0400
message:
Revise text about voting to match current system
modified:
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.3
revision-id: pqm at pqm.ubuntu.com-20070727061532-14ly852y2g2dbcb8
parent: pqm at pqm.ubuntu.com-20070726223348-t2howycr63c04q7r
parent: bialix at ukr.net-20070727043624-yu52vk3823cq5idv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-07-27 07:15:32 +0100
message:
(Kuno Meyer) Tests for glob expansions on win32 + bugfix for `bzr
add *` when non-ascii filenames are in working tree (#127361) (r=aaron,r=bialix)
added:
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 2592.1.25.6.10
revision-id: bialix at ukr.net-20070727043624-yu52vk3823cq5idv
parent: bialix at ukr.net-20070727042926-mtf1gaddq2gj8bso
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32_glob
timestamp: Fri 2007-07-27 07:36:24 +0300
message:
NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2592.1.25.6.9
revision-id: bialix at ukr.net-20070727042926-mtf1gaddq2gj8bso
parent: kuno.meyer at gmx.ch-20070724194040-ocyjulqhy31xe3j1
parent: pqm at pqm.ubuntu.com-20070726134355-tlidmsn3eux09idz
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32_glob
timestamp: Fri 2007-07-27 07:29:26 +0300
message:
merge bzr.dev
removed:
bzrlib/bundle/common.py common.py-20050619223838-f25048f6638f04c6
bzrlib/bundle/old/ old-20051119041827-8f2417a9cc3b67f2
bzrlib/bundle/old/send_changeset.py send_changeset.py-20050628200204-9478d383946f1871
added:
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/email_message.py email_message.py-20070718143823-660zfcl54xi1v65u-1
bzrlib/file_names.py file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
bzrlib/tests/commands/ commands-20070518182516-v16lhwkl07jbj1k2-1
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/commands/test_branch.py test_branch.py-20070520173042-ou3a796w3xn1y8ps-1
bzrlib/tests/commands/test_cat.py test_cat.py-20070525170351-vg2apsfb5j413913-1
bzrlib/tests/commands/test_checkout.py test_checkout.py-20070525151718-vm7ligd5px5dtmda-1
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
bzrlib/tests/commands/test_merge.py test_merge.py-20070525163813-v8yfs5wu77hjsx0o-1
bzrlib/tests/commands/test_missing.py test_missing.py-20070525171057-qr1z4sleurlp9b5v-1
bzrlib/tests/commands/test_pull.py test_pull.py-20070525144918-cgmunk4ici2krjnd-1
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test_email_message.py test_email_message.p-20070718143823-660zfcl54xi1v65u-2
bzrlib/tests/test_file_names.py test_file_collection-20070714093417-5gc9d821to85zo4t-1
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
bzrlib/transport/unlistable.py unlistable.py-20070714093417-5gc9d821to85zo4t-2
bzrlib/util/tests/ bzrlibutiltests-20070713054332-wmm62qs3xvyfzwup-1
bzrlib/util/tests/__init__.py __init__.py-20070713054446-oliu3oth0gy08y0t-1
bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
doc/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
doc/developers/diff.txt diff.txt-20070716233605-2q6jzorua7mr42jk-1
doc/developers/indices.txt indices.txt-20070713142939-m5cdnp31u8ape0td-1
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
renamed:
bzrlib/tests/blackbox/test_bundle.py => bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/benchmarks/bench_bundle.py bench_bundle.py-20060719055338-o1c6ieybbwt6c3zv-1
bzrlib/benchmarks/bench_checkout.py bench_checkout.py-20060521233052-b52eba18ee46046b
bzrlib/benchmarks/bench_commit.py bench_commit.py-20060522031508-4ea2551904e4becb
bzrlib/benchmarks/bench_log.py bench_log.py-20060611214524-mr18tk29h8v0qb4x-1
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bundle/serializer/v09.py v09.py-20060921014829-2l5elu11mu2ubvek-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/smtp_connection.py smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
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_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
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_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/README.1st README.1st-20060314161707-b943d5d4cce669b6
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/capture_tree.py capture_tree.py-20051004100938-c7ff053182f5ae51
tools/rst2prettyhtml.py rst2prettyhtml.py-20060929181914-t7dh62f2wxi0i5aj-1
tools/trace-revisions tracerevisions-20051107162041-9dfee0a7324d206d
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2592.1.25.6.8
revision-id: kuno.meyer at gmx.ch-20070724194040-ocyjulqhy31xe3j1
parent: kuno.meyer at gmx.ch-20070722215816-c6lrm9ayg2emrtb0
committer: Kuno Meyer <kuno.meyer at gmx.ch>
branch nick: win32tests
timestamp: Tue 2007-07-24 21:40:40 +0200
message:
Extended tests for unicode chars outside of the iso-8859-* range
Two workarounds for incorrect glob.glob() implementation
modified:
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 2592.1.25.6.7
revision-id: kuno.meyer at gmx.ch-20070722215816-c6lrm9ayg2emrtb0
parent: kuno.meyer at gmx.ch-20070722202110-l7pvj1z3a741ha9s
committer: Kuno Meyer <kuno.meyer at gmx.ch>
branch nick: win32tests
timestamp: Sun 2007-07-22 23:58:16 +0200
message:
Fix for non-ASCII filenames
modified:
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 2592.1.25.6.6
revision-id: kuno.meyer at gmx.ch-20070722202110-l7pvj1z3a741ha9s
parent: kuno.meyer at gmx.ch-20070718215235-nb6fmud5yuv3q9am
committer: Kuno Meyer <kuno.meyer at gmx.ch>
branch nick: win32tests
timestamp: Sun 2007-07-22 22:21:10 +0200
message:
Incorporated feedback from the mailinglist.
modified:
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 2592.1.25.6.5
revision-id: kuno.meyer at gmx.ch-20070718215235-nb6fmud5yuv3q9am
parent: kuno.meyer at gmx.ch-20070718201527-rn6j933vii35b6gm
committer: Kuno Meyer <kuno.meyer at gmx.ch>
branch nick: win32tests
timestamp: Wed 2007-07-18 23:52:35 +0200
message:
Just a typo remained from testing.
modified:
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
------------------------------------------------------------
revno: 2592.1.25.6.4
revision-id: kuno.meyer at gmx.ch-20070718201527-rn6j933vii35b6gm
parent: kuno.meyer at gmx.ch-20070713223733-ns6gvwhe4ef8wjru
committer: Kuno Meyer <kuno.meyer at gmx.ch>
branch nick: win32tests
timestamp: Wed 2007-07-18 22:15:27 +0200
message:
Included feedback on initial patch.
modified:
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 2592.1.25.6.3
revision-id: kuno.meyer at gmx.ch-20070713223733-ns6gvwhe4ef8wjru
parent: kuno.meyer at gmx.ch-20070713220117-vwei142086q2ophm
committer: Kuno Meyer <kuno.meyer at gmx.ch>
branch nick: win32tests
timestamp: Sat 2007-07-14 00:37:33 +0200
message:
Blackbox test for adding with wildcards (Win32).
modified:
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
------------------------------------------------------------
revno: 2592.1.25.6.2
revision-id: kuno.meyer at gmx.ch-20070713220117-vwei142086q2ophm
parent: kuno.meyer at gmx.ch-20070713184301-aqd22mud85c4gz1x
committer: Kuno Meyer <kuno.meyer at gmx.ch>
branch nick: win32tests
timestamp: Sat 2007-07-14 00:01:17 +0200
message:
just reformatting
modified:
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
------------------------------------------------------------
revno: 2592.1.25.6.1
revision-id: kuno.meyer at gmx.ch-20070713184301-aqd22mud85c4gz1x
parent: pqm at pqm.ubuntu.com-20070713074627-93zxs9uh528y0fki
committer: Kuno Meyer <kuno.meyer at gmx.ch>
branch nick: win32tests
timestamp: Fri 2007-07-13 20:43:01 +0200
message:
Added direct unit tests for win32utils.glob_expand().
added:
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.2
revision-id: pqm at pqm.ubuntu.com-20070726223348-t2howycr63c04q7r
parent: pqm at pqm.ubuntu.com-20070726134355-tlidmsn3eux09idz
parent: john at arbash-meinel.com-20070726211835-z5v8xam1hk2omnq1
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-26 23:33:48 +0100
message:
(Jonathan Lange) Fix bug #110092, when displaying a diff that includes a binary file, make sure the binary filenames are encoded
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.1.1.1
revision-id: john at arbash-meinel.com-20070726211835-z5v8xam1hk2omnq1
parent: pqm at pqm.ubuntu.com-20070726134355-tlidmsn3eux09idz
parent: jml at mumak.net-20070726074333-73de3l9k6hufjwbs
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-07-26 16:18:35 -0500
message:
(Jonathan Lange) Fix bug #110092, when displaying a diff that includes a binary file, make sure the binary filenames are encoded
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 2592.2.5
revision-id: jml at mumak.net-20070726074333-73de3l9k6hufjwbs
parent: jml at mumak.net-20070718015656-nksl6vzrgwsglg32
committer: Jonathan Lange <jml at mumak.net>
branch nick: show-diff-trees-110092
timestamp: Thu 2007-07-26 17:43:33 +1000
message:
Make UnicodeFilename feature less insane. Add a simple test for it too.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 2592.2.4
revision-id: jml at mumak.net-20070718015656-nksl6vzrgwsglg32
parent: jml at mumak.net-20070717041850-v448ywifdsck5mxl
committer: Jonathan Lange <jml at mumak.net>
branch nick: show-diff-trees-110092
timestamp: Wed 2007-07-18 11:56:56 +1000
message:
Skip the unicode filename test if the platform doesn't support unicode
filenames.
modified:
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 2592.2.3
revision-id: jml at mumak.net-20070717041850-v448ywifdsck5mxl
parent: jml at mumak.net-20070709073803-i1mxhzhlhs85u32j
parent: pqm at pqm.ubuntu.com-20070716205413-42lqws7bkld2gbju
committer: Jonathan Lange <jml at mumak.net>
branch nick: show-diff-trees-110092
timestamp: Tue 2007-07-17 14:18:50 +1000
message:
Merge bzr.dev.
added:
bzrlib/_knit_load_data_c.pyx knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
bzrlib/_knit_load_data_py.py _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-1
bzrlib/benchmarks/bench_knit.py bench_knit.py-20070509145850-pan5jnd3hl7mfdya-1
bzrlib/tests/blackbox/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-1
bzrlib/tests/repository_implementations/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-2
bzrlib/tests/workingtree_implementations/test_uncommit.py test_uncommit.py-20070712063057-8zaprw7t7lcqxeje-1
bzrlib/util/tests/ bzrlibutiltests-20070713054332-wmm62qs3xvyfzwup-1
bzrlib/util/tests/__init__.py __init__.py-20070713054446-oliu3oth0gy08y0t-1
bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
doc/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/branch_implementations/test_revision_id_to_revno.py test_revision_id_to_-20070417200738-lo776wkqikhe5goo-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
doc/README.1st README.1st-20060314161707-b943d5d4cce669b6
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/scratch.txt scratch.txt-20070618020404-cdhv0ecgrukomemg-3
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2592.2.2
revision-id: jml at mumak.net-20070709073803-i1mxhzhlhs85u32j
parent: jml at mumak.net-20070706122938-w2lpadadsd3do9cu
committer: Jonathan Lange <jml at mumak.net>
branch nick: show-diff-trees-110092
timestamp: Mon 2007-07-09 17:38:03 +1000
message:
Apply jam's comments to test_binary_unicode_filenames. Change the
'=== added' etc lines to print out the str() of the filename, rather than
the repr(). This means that unicode symbols are displayed.
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 2592.2.1
revision-id: jml at mumak.net-20070706122938-w2lpadadsd3do9cu
parent: pqm at pqm.ubuntu.com-20070705224207-7pslqt12ofh4vnzx
committer: Jonathan Lange <jml at mumak.net>
branch nick: show-diff-trees-110092
timestamp: Fri 2007-07-06 22:29:38 +1000
message:
Reproduce and fix bug 110092.
When displaying a diff that includes a binary file, make sure the
binary file names are encoded.
modified:
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.1
revision-id: pqm at pqm.ubuntu.com-20070726134355-tlidmsn3eux09idz
parent: pqm at pqm.ubuntu.com-20070725140043-22lenkarm0oc3tvx
parent: john at arbash-meinel.com-20070725212922-a72okcvs6nahrz5t
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-26 14:43:55 +0100
message:
(John Arbash Meinel) Make get_revision_graph() ask the versioned file, fix a performance bug in VF.get_graph([revision_id])
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
=== added file 'bzrlib/tests/test_win32utils.py'
--- a/bzrlib/tests/test_win32utils.py 1970-01-01 00:00:00 +0000
+++ b/bzrlib/tests/test_win32utils.py 2007-07-24 19:40:40 +0000
@@ -0,0 +1,130 @@
+# Copyright (C) 2007 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+import sys
+
+from bzrlib import osutils
+from bzrlib.tests import TestCase, TestCaseInTempDir, Feature
+from bzrlib.win32utils import glob_expand
+
+
+# Features
+# --------
+
+class _NeedsGlobExpansionFeature(Feature):
+
+ def _probe(self):
+ return sys.platform == 'win32'
+
+ def feature_name(self):
+ return 'Internally performed glob expansion'
+
+NeedsGlobExpansionFeature = _NeedsGlobExpansionFeature()
+
+
+# Tests
+# -----
+
+class TestNeedsGlobExpansionFeature(TestCase):
+
+ def test_available(self):
+ self.assertEqual(sys.platform == 'win32',
+ NeedsGlobExpansionFeature.available())
+
+ def test_str(self):
+ self.assertTrue("performed" in str(NeedsGlobExpansionFeature))
+
+
+class TestWin32UtilsGlobExpand(TestCaseInTempDir):
+
+ _test_needs_features = [NeedsGlobExpansionFeature]
+
+ def test_empty_tree(self):
+ self.build_tree([])
+ self._run_testset([
+ [['a'], ['a']],
+ [['?'], ['?']],
+ [['*'], ['*']],
+ [['a', 'a'], ['a', 'a']]])
+
+ def test_tree_ascii(self):
+ """Checks the glob expansion and path separation char
+ normalization"""
+ self.build_tree(['a', 'a1', 'a2', 'a11', 'a.1',
+ 'b', 'b1', 'b2', 'b3',
+ 'c/', 'c/c1', 'c/c2',
+ 'd/', 'd/d1', 'd/d2', 'd/e/', 'd/e/e1'])
+ self._run_testset([
+ # no wildcards
+ [[u'a'], [u'a']],
+ [[u'a', u'a' ], [u'a', u'a']],
+ [[u'A'], [u'A']],
+
+ [[u'd'], [u'd']],
+ [[u'd/'], [u'd/']],
+ [[u'd\\'], [u'd/']],
+
+ # wildcards
+ [[u'a*'], [u'a', u'a1', u'a2', u'a11', u'a.1']],
+ [[u'?'], [u'a', u'b', u'c', u'd']],
+ [[u'a?'], [u'a1', u'a2']],
+ [[u'a??'], [u'a11', u'a.1']],
+ [[u'b[1-2]'], [u'b1', u'b2']],
+ [[u'A?'], [u'a1', u'a2']],
+
+ [[u'd/*'], [u'd/d1', u'd/d2', u'd/e']],
+ [[u'd\\*'], [u'd/d1', u'd/d2', u'd/e']],
+ [[u'?\\*'], [u'c/c1', u'c/c2', u'd/d1', u'd/d2', u'd/e']],
+ [[u'*\\*'], [u'c/c1', u'c/c2', u'd/d1', u'd/d2', u'd/e']],
+ [[u'*/'], [u'c/', u'd/']],
+ [[u'*\\'], [u'c/', u'd/']]])
+
+ def test_tree_unicode(self):
+ """Checks behaviour with non-ascii filenames"""
+ self.build_tree([u'\u1234', u'\u1234\u1234', u'\u1235/', u'\u1235/\u1235'])
+ self._run_testset([
+ # no wildcards
+ [[u'\u1234'], [u'\u1234']],
+ [[u'\u1235'], [u'\u1235']],
+
+ [[u'\u1235/'], [u'\u1235/']],
+ [[u'\u1235/\u1235'], [u'\u1235/\u1235']],
+
+ # wildcards
+ [[u'?'], [u'\u1234', u'\u1235']],
+ [[u'*'], [u'\u1234', u'\u1234\u1234', u'\u1235']],
+ [[u'\u1234*'], [u'\u1234', u'\u1234\u1234']],
+
+ [[u'\u1235/?'], [u'\u1235/\u1235']],
+ [[u'\u1235/*'], [u'\u1235/\u1235']],
+ [[u'\u1235\\?'], [u'\u1235/\u1235']],
+ [[u'\u1235\\*'], [u'\u1235/\u1235']],
+ [[u'?/'], [u'\u1235/']],
+ [[u'*/'], [u'\u1235/']],
+ [[u'?\\'], [u'\u1235/']],
+ [[u'*\\'], [u'\u1235/']],
+ [[u'?/?'], [u'\u1235/\u1235']],
+ [[u'*/*'], [u'\u1235/\u1235']],
+ [[u'?\\?'], [u'\u1235/\u1235']],
+ [[u'*\\*'], [u'\u1235/\u1235']]])
+
+ def _run_testset(self, testset):
+ for pattern, expected in testset:
+ result = glob_expand(pattern)
+ expected.sort()
+ result.sort()
+ self.assertEqual(expected, result, 'pattern %s' % pattern)
+
=== modified file 'NEWS'
--- a/NEWS 2007-07-26 04:18:05 +0000
+++ b/NEWS 2007-07-30 05:04:59 +0000
@@ -32,6 +32,9 @@
* ``bzr checkout`` now honours -r when reconstituting a working tree.
It also honours -r 0. (Aaron Bentley, #127708)
+ * ``bzr add *`` no more fails on Windows if working tree contains
+ non-ascii file names. (Kuno Meyer, #127361)
+
IMPROVEMENTS:
* Don't show "dots" progress indicators when run non-interactively, such
@@ -162,6 +165,9 @@
the parents of many knit nodes at once, reducing round trips to the
underlying index. (Robert Collins)
+ * Graph now has an is_ancestor method, various bits use it.
+ (Aaron Bentley)
+
* New methods on Repository - ``start_write_group``,
``commit_write_group``, ``abort_write_group`` and ``is_in_write_group`` -
which provide a clean hook point for transactional Repositories - ones
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py 2007-07-15 11:24:18 +0000
+++ b/bzrlib/branch.py 2007-07-27 13:02:00 +0000
@@ -1463,10 +1463,8 @@
# we fetch here regardless of whether we need to so that we pickup
# filled in ghosts.
self.fetch(other, stop_revision)
- my_ancestry = self.repository.get_ancestry(last_rev,
- topo_sorted=False)
- if stop_revision in my_ancestry:
- # last_revision is a descendant of stop_revision
+ if self.repository.get_graph().is_ancestor(stop_revision,
+ last_rev):
return
self.generate_revision_history(stop_revision, last_rev=last_rev,
other_branch=other)
@@ -1821,11 +1819,10 @@
"""
master = self.get_master_branch()
if master is not None:
- old_tip = self.last_revision()
+ old_tip = _mod_revision.ensure_null(self.last_revision())
self.pull(master, overwrite=True)
- if old_tip in self.repository.get_ancestry(
- _mod_revision.ensure_null(self.last_revision()),
- topo_sorted=False):
+ if self.repository.get_graph().is_ancestor(old_tip,
+ _mod_revision.ensure_null(self.last_revision())):
return None
return old_tip
return None
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2007-07-23 19:37:15 +0000
+++ b/bzrlib/builtins.py 2007-07-26 19:51:56 +0000
@@ -2669,8 +2669,9 @@
mergeable.install_revisions(tree.branch.repository)
base_revision_id, other_revision_id, verified =\
mergeable.get_merge_request(tree.branch.repository)
- if base_revision_id in tree.branch.repository.get_ancestry(
- tree.branch.last_revision(), topo_sorted=False):
+ if (base_revision_id != _mod_revision.NULL_REVISION and
+ tree.branch.repository.get_graph().is_ancestor(
+ base_revision_id, tree.branch.last_revision())):
base_revision_id = None
other_branch = None
path = ''
=== modified file 'bzrlib/diff.py'
--- a/bzrlib/diff.py 2007-04-11 22:05:16 +0000
+++ b/bzrlib/diff.py 2007-07-09 07:38:03 +0000
@@ -436,7 +436,7 @@
has_changes = 0
for path, file_id, kind in delta.removed:
has_changes = 1
- print >>to_file, '=== removed %s %r' % (kind, path.encode('utf8'))
+ print >>to_file, "=== removed %s '%s'" % (kind, path.encode('utf8'))
old_name = '%s%s\t%s' % (old_label, path,
_patch_header_date(old_tree, file_id, path))
new_name = '%s%s\t%s' % (new_label, path, EPOCH_DATE)
@@ -444,7 +444,7 @@
new_name, None, None, to_file)
for path, file_id, kind in delta.added:
has_changes = 1
- print >>to_file, '=== added %s %r' % (kind, path.encode('utf8'))
+ print >>to_file, "=== added %s '%s'" % (kind, path.encode('utf8'))
old_name = '%s%s\t%s' % (old_label, path, EPOCH_DATE)
new_name = '%s%s\t%s' % (new_label, path,
_patch_header_date(new_tree, file_id, path))
@@ -455,7 +455,7 @@
text_modified, meta_modified) in delta.renamed:
has_changes = 1
prop_str = get_prop_change(meta_modified)
- print >>to_file, '=== renamed %s %r => %r%s' % (
+ print >>to_file, "=== renamed %s '%s' => %r%s" % (
kind, old_path.encode('utf8'),
new_path.encode('utf8'), prop_str)
old_name = '%s%s\t%s' % (old_label, old_path,
@@ -470,7 +470,8 @@
for path, file_id, kind, text_modified, meta_modified in delta.modified:
has_changes = 1
prop_str = get_prop_change(meta_modified)
- print >>to_file, '=== modified %s %r%s' % (kind, path.encode('utf8'), prop_str)
+ print >>to_file, "=== modified %s '%s'%s" % (kind, path.encode('utf8'),
+ prop_str)
# The file may be in a different location in the old tree (because
# the containing dir was renamed, but the file itself was not)
old_path = old_tree.id2path(file_id)
=== modified file 'bzrlib/graph.py'
--- a/bzrlib/graph.py 2007-06-27 15:12:32 +0000
+++ b/bzrlib/graph.py 2007-07-27 16:44:06 +0000
@@ -290,6 +290,73 @@
sorter = tsort.TopoSorter(zip(revisions, self.get_parents(revisions)))
return sorter.iter_topo_order()
+ def is_ancestor(self, candidate_ancestor, candidate_descendant):
+ """Determine whether a revision is an ancestor of another.
+
+ There are two possible outcomes: True and False, but there are three
+ possible relationships:
+
+ a) candidate_ancestor is an ancestor of candidate_descendant
+ b) candidate_ancestor is an descendant of candidate_descendant
+ c) candidate_ancestor is an sibling of candidate_descendant
+
+ To check for a, we walk from candidate_descendant, looking for
+ candidate_ancestor.
+
+ To check for b, we walk from candidate_ancestor, looking for
+ candidate_descendant.
+
+ To make a and b more efficient, we can stop any searches that hit
+ common ancestors.
+
+ If we exhaust our searches, but neither a or b is true, then c is true.
+
+ In order to find c efficiently, we must avoid searching from
+ candidate_descendant or candidate_ancestor into common ancestors. But
+ if we don't search common ancestors at all, we won't know if we hit
+ common ancestors. So we have a walker for common ancestors. Note that
+ its searches are not required to terminate in order to determine c to
+ be true.
+ """
+ ancestor_walker = self._make_breadth_first_searcher(
+ [candidate_ancestor])
+ descendant_walker = self._make_breadth_first_searcher(
+ [candidate_descendant])
+ common_walker = self._make_breadth_first_searcher([])
+ active_ancestor = True
+ active_descendant = True
+ while (active_ancestor or active_descendant):
+ new_common = set()
+ if active_descendant:
+ try:
+ nodes = descendant_walker.next()
+ except StopIteration:
+ active_descendant = False
+ else:
+ if candidate_ancestor in nodes:
+ return True
+ new_common.update(nodes.intersection(ancestor_walker.seen))
+ if active_ancestor:
+ try:
+ nodes = ancestor_walker.next()
+ except StopIteration:
+ active_ancestor = False
+ else:
+ if candidate_descendant in nodes:
+ return False
+ new_common.update(nodes.intersection(
+ descendant_walker.seen))
+ try:
+ new_common.update(common_walker.next())
+ except StopIteration:
+ pass
+ for walker in (ancestor_walker, descendant_walker):
+ for node in new_common:
+ c_ancestors = walker.find_seen_ancestors(node)
+ walker.stop_searching_any(c_ancestors)
+ common_walker.start_searching(new_common)
+ return False
+
class _BreadthFirstSearcher(object):
"""Parallel search the breadth-first the ancestry of revisions.
=== modified file 'bzrlib/inventory.py'
--- a/bzrlib/inventory.py 2007-07-17 20:04:13 +0000
+++ b/bzrlib/inventory.py 2007-07-26 21:18:35 +0000
@@ -665,7 +665,8 @@
label_pair = (to_label, from_label)
else:
label_pair = (from_label, to_label)
- print >> output_to, "Binary files %s and %s differ" % label_pair
+ print >> output_to, \
+ ("Binary files %s and %s differ" % label_pair).encode('utf8')
def has_text(self):
"""See InventoryEntry.has_text."""
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2007-07-25 00:50:15 +0000
+++ b/bzrlib/tests/__init__.py 2007-07-30 05:04:59 +0000
@@ -1640,7 +1640,7 @@
"""Return a writeable transport.
This transport is for the test scratch space relative to
- "self._test_root""
+ "self._test_root"
:param relpath: a path relative to the base url.
"""
@@ -2372,6 +2372,7 @@
'bzrlib.tests.test_version_info',
'bzrlib.tests.test_weave',
'bzrlib.tests.test_whitebox',
+ 'bzrlib.tests.test_win32utils',
'bzrlib.tests.test_workingtree',
'bzrlib.tests.test_workingtree_4',
'bzrlib.tests.test_wsgi',
=== modified file 'bzrlib/tests/blackbox/test_add.py'
--- a/bzrlib/tests/blackbox/test_add.py 2007-07-04 08:49:15 +0000
+++ b/bzrlib/tests/blackbox/test_add.py 2007-07-24 19:40:40 +0000
@@ -20,6 +20,7 @@
import os
from bzrlib.tests.blackbox import ExternalBase
+from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
class TestAdd(ExternalBase):
@@ -192,3 +193,17 @@
self.build_tree(['.bzr/crescent'])
err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
+
+ def test_add_with_wildcards(self):
+ self.requireFeature(NeedsGlobExpansionFeature)
+ self.make_branch_and_tree('.')
+ self.build_tree(['a1', 'a2', 'b', 'c33'])
+ self.run_bzr(['add', 'a?', 'c*'])
+ self.assertEquals(self.run_bzr('unknowns')[0], 'b\n')
+
+ def test_add_with_wildcards_unicode(self):
+ self.requireFeature(NeedsGlobExpansionFeature)
+ self.make_branch_and_tree('.')
+ self.build_tree([u'\u1234A', u'\u1235A', u'\u1235AA', 'cc'])
+ self.run_bzr(['add', u'\u1234?', u'\u1235*'])
+ self.assertEquals(self.run_bzr('unknowns')[0], 'cc\n')
=== modified file 'bzrlib/tests/test_diff.py'
--- a/bzrlib/tests/test_diff.py 2007-04-11 22:05:16 +0000
+++ b/bzrlib/tests/test_diff.py 2007-07-26 21:18:35 +0000
@@ -24,10 +24,39 @@
from bzrlib.errors import BinaryFile, NoDiff
import bzrlib.osutils as osutils
import bzrlib.patiencediff
-from bzrlib.tests import (TestCase, TestCaseWithTransport,
+from bzrlib.tests import (Feature, TestCase, TestCaseWithTransport,
TestCaseInTempDir, TestSkipped)
+class _UnicodeFilename(Feature):
+ """Does the filesystem support Unicode filenames?"""
+
+ def _probe(self):
+ try:
+ os.stat(u'\u03b1')
+ except UnicodeEncodeError:
+ return False
+ except (IOError, OSError):
+ # The filesystem allows the Unicode filename but the file doesn't
+ # exist.
+ return True
+ else:
+ # The filesystem allows the Unicode filename and the file exists,
+ # for some reason.
+ return True
+
+UnicodeFilename = _UnicodeFilename()
+
+
+class TestUnicodeFilename(TestCase):
+
+ def test_probe_passes(self):
+ """UnicodeFilename._probe passes."""
+ # We can't test much more than that because the behaviour depends
+ # on the platform.
+ UnicodeFilename._probe()
+
+
def udiff_lines(old, new, allow_binary=False):
output = StringIO()
internal_diff('old', old, 'new', new, output, allow_binary)
@@ -441,6 +470,34 @@
self.assertContainsRe(diff, '-contents\n'
'\\+new contents\n')
+ def test_binary_unicode_filenames(self):
+ """Test that contents of files are *not* encoded in UTF-8 when there
+ is a binary file in the diff.
+ """
+ # See https://bugs.launchpad.net/bugs/110092.
+ self.requireFeature(UnicodeFilename)
+
+ # This bug isn't triggered with cStringIO.
+ from StringIO import StringIO
+ tree = self.make_branch_and_tree('tree')
+ alpha, omega = u'\u03b1', u'\u03c9'
+ alpha_utf8, omega_utf8 = alpha.encode('utf8'), omega.encode('utf8')
+ self.build_tree_contents(
+ [('tree/' + alpha, chr(0)),
+ ('tree/' + omega,
+ ('The %s and the %s\n' % (alpha_utf8, omega_utf8)))])
+ tree.add([alpha], ['file-id'])
+ tree.add([omega], ['file-id-2'])
+ diff_content = StringIO()
+ show_diff_trees(tree.basis_tree(), tree, diff_content)
+ diff = diff_content.getvalue()
+ self.assertContainsRe(diff, r"=== added file '%s'" % alpha_utf8)
+ self.assertContainsRe(
+ diff, "Binary files a/%s.*and b/%s.* differ\n" % (alpha_utf8, alpha_utf8))
+ self.assertContainsRe(diff, r"=== added file '%s'" % omega_utf8)
+ self.assertContainsRe(diff, r"--- a/%s" % (omega_utf8,))
+ self.assertContainsRe(diff, r"\+\+\+ b/%s" % (omega_utf8,))
+
class TestPatienceDiffLib(TestCase):
=== modified file 'bzrlib/tests/test_graph.py'
--- a/bzrlib/tests/test_graph.py 2007-06-27 15:12:32 +0000
+++ b/bzrlib/tests/test_graph.py 2007-07-26 19:56:04 +0000
@@ -16,7 +16,7 @@
from bzrlib import (
errors,
- graph,
+ graph as _mod_graph,
)
from bzrlib.revision import NULL_REVISION
from bzrlib.tests import TestCaseWithMemoryTransport
@@ -120,6 +120,30 @@
'rev2b': ['rev1'], 'rev2c': ['rev1'],
'rev3a': ['rev2a', 'rev2b'], 'rev3b': ['rev2b', 'rev2c']}
+# NULL_REVISION
+# |
+# f
+# |
+# e
+# / \
+# b d
+# | \ |
+# a c
+
+boundary = {'a': ['b'], 'c': ['b', 'd'], 'b':['e'], 'd':['e'], 'e': ['f'],
+ 'f':[NULL_REVISION]}
+
+
+class InstrumentedParentsProvider(object):
+
+ def __init__(self, parents_provider):
+ self.calls = []
+ self._real_parents_provider = parents_provider
+
+ def get_parents(self, nodes):
+ self.calls.extend(nodes)
+ return self._real_parents_provider.get_parents(nodes)
+
class TestGraph(TestCaseWithMemoryTransport):
@@ -277,7 +301,7 @@
parents1 = ParentsProvider({'rev2': ['rev3']})
parents2 = ParentsProvider({'rev1': ['rev4']})
- stacked = graph._StackedParentsProvider([parents1, parents2])
+ stacked = _mod_graph._StackedParentsProvider([parents1, parents2])
self.assertEqual([['rev4',], ['rev3']],
stacked.get_parents(['rev1', 'rev2']))
self.assertEqual([['rev3',], ['rev4']],
@@ -294,3 +318,31 @@
self.assertEqual(set(args), set(topo_args))
self.assertTrue(topo_args.index('rev2a') > topo_args.index('rev1'))
self.assertTrue(topo_args.index('rev2a') < topo_args.index('rev3'))
+
+ def test_is_ancestor(self):
+ graph = self.make_graph(ancestry_1)
+ self.assertEqual(True, graph.is_ancestor('null:', 'null:'))
+ self.assertEqual(True, graph.is_ancestor('null:', 'rev1'))
+ self.assertEqual(False, graph.is_ancestor('rev1', 'null:'))
+ self.assertEqual(True, graph.is_ancestor('null:', 'rev4'))
+ self.assertEqual(False, graph.is_ancestor('rev4', 'null:'))
+ self.assertEqual(False, graph.is_ancestor('rev4', 'rev2b'))
+ self.assertEqual(True, graph.is_ancestor('rev2b', 'rev4'))
+ self.assertEqual(False, graph.is_ancestor('rev2b', 'rev3'))
+ self.assertEqual(False, graph.is_ancestor('rev3', 'rev2b'))
+ instrumented_provider = InstrumentedParentsProvider(graph)
+ instrumented_graph = _mod_graph.Graph(instrumented_provider)
+ instrumented_graph.is_ancestor('rev2a', 'rev2b')
+ self.assertTrue('null:' not in instrumented_provider.calls)
+
+ def test_is_ancestor_boundary(self):
+ """Ensure that we avoid searching the whole graph.
+
+ This requires searching through b as a common ancestor, so we
+ can identify that e is common.
+ """
+ graph = self.make_graph(boundary)
+ instrumented_provider = InstrumentedParentsProvider(graph)
+ graph = _mod_graph.Graph(instrumented_provider)
+ self.assertFalse(graph.is_ancestor('a', 'c'))
+ self.assertTrue('null:' not in instrumented_provider.calls)
=== modified file 'bzrlib/win32utils.py'
--- a/bzrlib/win32utils.py 2007-07-12 23:42:01 +0000
+++ b/bzrlib/win32utils.py 2007-07-24 19:40:40 +0000
@@ -240,6 +240,20 @@
return _ensure_unicode(get_host_name())
+def _ensure_with_dir(path):
+ if not os.path.split(path)[0] or path.startswith(u'*') or path.startswith(u'?'):
+ return u'./' + path, True
+ else:
+ return path, False
+
+def _undo_ensure_with_dir(path, corrected):
+ if corrected:
+ return path[2:]
+ else:
+ return path
+
+
+
def glob_expand(file_list):
"""Replacement for glob expansion by the shell.
@@ -256,14 +270,20 @@
import glob
expanded_file_list = []
for possible_glob in file_list:
+
+ # work around bugs in glob.glob()
+ # - Python bug #1001604 ("glob doesn't return unicode with ...")
+ # - failing expansion for */* with non-iso-8859-* chars
+ possible_glob, corrected = _ensure_with_dir(possible_glob)
glob_files = glob.glob(possible_glob)
if glob_files == []:
# special case to let the normal code path handle
# files that do not exists
- expanded_file_list.append(possible_glob)
+ expanded_file_list.append(
+ _undo_ensure_with_dir(possible_glob, corrected))
else:
+ glob_files = [_undo_ensure_with_dir(elem, corrected) for elem in glob_files]
expanded_file_list += glob_files
- return expanded_file_list
-
-
+
+ return [elem.replace(u'\\', u'/') for elem in expanded_file_list]
=== modified file 'doc/developers/HACKING'
--- a/doc/developers/HACKING 2007-07-20 17:25:20 +0000
+++ b/doc/developers/HACKING 2007-07-27 05:49:24 +0000
@@ -149,19 +149,18 @@
Anyone can "vote" on the mailing list. Core developers can also vote using
Bundle Buggy. Here are the voting codes and their explanations.
- -1 really don't want it in current form
- -0 somewhat uncomfortable
- +0 comfortable but resubmission after changes requested
- +1 conditional good to go after some minor changes
- +1 good to go
-
-+1 conditional is used as a way to avoid another submit/review cycle for
-patches that need small changes.
-
-If a change gets two +1 votes from core reviewers, and no
-vetos, then it's OK to come in. Any of the core developers can bring it
-into the bzr.dev trunk and backport it to maintenance branches if required.
-The Release Manager will merge the change into the branch for a pending
+:approve: Reviewer wants this submission merged.
+:tweak: Reviewer wants this submission merged with small changes. (No
+ re-review required.)
+:abstain: Reviewer does not intend to vote on this patch.
+:resubmit: Please make changes and resubmit for review.
+:reject: Reviewer doesn't want this kind of change merged.
+:comment: Not really a vote. Reviewer just wants to comment, for now.
+
+If a change gets two approvals from core reviewers, and no rejections,
+then it's OK to come in. Any of the core developers can bring it into the
+bzr.dev trunk and backport it to maintenance branches if required. The
+Release Manager will merge the change into the branch for a pending
release, if any. As a guideline, core developers usually merge their own
changes and volunteer to merge other contributions if they were the second
reviewer to agree to a change.
More information about the bazaar-commits
mailing list