Rev 3516: Rule-based preferences (Ian Clatworthy) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Jul 2 03:04:31 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3516
revision-id:pqm at pqm.ubuntu.com-20080702020417-2gnc111mzyl1xusr
parent: pqm at pqm.ubuntu.com-20080701042123-zcmqzb7o6znwjx34
parent: ian.clatworthy at canonical.com-20080702014002-2g5pg30ua32z8hrc
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-07-02 03:04:17 +0100
message:
Rule-based preferences (Ian Clatworthy)
added:
bzrlib/help_topics/en/patterns.txt patterns.txt-20080625070357-wx8qm46a19ejwfns-1
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/globbing.py glob.py-20061113075651-q63o2v35fm2ydk9x-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_globbing.py test_glob.py-20061113075651-q63o2v35fm2ydk9x-2
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
------------------------------------------------------------
revno: 3515.1.1
revision-id:ian.clatworthy at canonical.com-20080702014002-2g5pg30ua32z8hrc
parent: pqm at pqm.ubuntu.com-20080701042123-zcmqzb7o6znwjx34
parent: ian.clatworthy at canonical.com-20080630004730-mbd1jiwipzdg15hc
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Wed 2008-07-02 11:40:02 +1000
message:
Rule-based preferences (Ian Clatworthy)
added:
bzrlib/help_topics/en/patterns.txt patterns.txt-20080625070357-wx8qm46a19ejwfns-1
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/globbing.py glob.py-20061113075651-q63o2v35fm2ydk9x-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_globbing.py test_glob.py-20061113075651-q63o2v35fm2ydk9x-2
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
------------------------------------------------------------
revno: 3398.1.34
revision-id:ian.clatworthy at canonical.com-20080630004730-mbd1jiwipzdg15hc
parent: ian.clatworthy at canonical.com-20080626065318-lpqe4ieqi0qib75x
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Mon 2008-06-30 10:47:30 +1000
message:
changed API design as requested by jam during review
modified:
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3398.1.33
revision-id:ian.clatworthy at canonical.com-20080626065318-lpqe4ieqi0qib75x
parent: ian.clatworthy at canonical.com-20080626012905-mani248eym8c2kqy
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Thu 2008-06-26 16:53:18 +1000
message:
use a string, not lists, for test data
modified:
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
------------------------------------------------------------
revno: 3398.1.32
revision-id:ian.clatworthy at canonical.com-20080626012905-mani248eym8c2kqy
parent: ian.clatworthy at canonical.com-20080625115834-t60cnmsju58kvz5q
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Thu 2008-06-26 11:29:05 +1000
message:
namespace keyword changed to name
modified:
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
------------------------------------------------------------
revno: 3398.1.31
revision-id:ian.clatworthy at canonical.com-20080625115834-t60cnmsju58kvz5q
parent: ian.clatworthy at canonical.com-20080625114355-k8k023ktb4m5e00e
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Wed 2008-06-25 21:58:34 +1000
message:
change preferences namespace to 'for'
modified:
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
------------------------------------------------------------
revno: 3398.1.30
revision-id:ian.clatworthy at canonical.com-20080625114355-k8k023ktb4m5e00e
parent: ian.clatworthy at canonical.com-20080625113734-n4cko5tclbnx9wgp
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Wed 2008-06-25 21:43:55 +1000
message:
test unknown rules detection
modified:
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
------------------------------------------------------------
revno: 3398.1.29
revision-id:ian.clatworthy at canonical.com-20080625113734-n4cko5tclbnx9wgp
parent: ian.clatworthy at canonical.com-20080625112203-4gu1q0lqmxobmfzw
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Wed 2008-06-25 21:37:34 +1000
message:
add UnknownRules class & test
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
------------------------------------------------------------
revno: 3398.1.28
revision-id:ian.clatworthy at canonical.com-20080625112203-4gu1q0lqmxobmfzw
parent: ian.clatworthy at canonical.com-20080625073246-31i1yr2yvwlwvkdb
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Wed 2008-06-25 21:22:03 +1000
message:
add namespace for rules
modified:
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
------------------------------------------------------------
revno: 3398.1.27
revision-id:ian.clatworthy at canonical.com-20080625073246-31i1yr2yvwlwvkdb
parent: ian.clatworthy at canonical.com-20080625071714-am1ya6mgo54ikrgv
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Wed 2008-06-25 17:32:46 +1000
message:
remove references to eol plugin
modified:
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
------------------------------------------------------------
revno: 3398.1.26
revision-id:ian.clatworthy at canonical.com-20080625071714-am1ya6mgo54ikrgv
parent: ian.clatworthy at canonical.com-20080625010653-i4wb1jqo8mzjj39m
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Wed 2008-06-25 17:17:14 +1000
message:
jam feedback - make patterns a separate help topic
added:
bzrlib/help_topics/en/patterns.txt patterns.txt-20080625070357-wx8qm46a19ejwfns-1
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
------------------------------------------------------------
revno: 3398.1.25
revision-id:ian.clatworthy at canonical.com-20080625010653-i4wb1jqo8mzjj39m
parent: ian.clatworthy at canonical.com-20080528070106-6w0oc8zat4bs29g1
parent: pqm at pqm.ubuntu.com-20080624011313-cq85foncf9mozmen
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Wed 2008-06-25 11:06:53 +1000
message:
merge bzr.dev r3508
added:
bzrlib/smart/message.py message.py-20080222013625-ncqmh3nrxjkxab87-1
bzrlib/tests/blackbox/test_alias.py test_alias.py-20080425112253-fbt0yz1c1834jriz-1
bzrlib/tests/blackbox/test_modified.py test_modified.py-20080424085848-nwqjenan4dq2vq3w-1
bzrlib/tests/file_utils.py file_utils.py-20080506145406-a1h3ydg2lsh2iriy-1
bzrlib/tests/per_repository_reference/ repository_external_-20080220025549-nnm2s80it1lvcwnc-1
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
bzrlib/tests/per_repository_reference/test_add_revision.py test_add_revision.py-20080220034108-ao1u8qgakqbo5a08-1
bzrlib/tests/per_repository_reference/test_add_signature_text.py test_add_signature_t-20080220041905-1j2g4lyz3c6h34v4-1
bzrlib/tests/per_repository_reference/test_all_revision_ids.py test_all_revision_id-20080220041905-1j2g4lyz3c6h34v4-2
bzrlib/tests/per_repository_reference/test_break_lock.py test_break_lock.py-20080220042825-1f48qmpnuqqp5wg2-1
bzrlib/tests/per_repository_reference/test_check.py test_check.py-20080220044229-sxxe747gzi6q8fyv-1
bzrlib/tests/repository_implementations/test_get_parent_map.py test_get_parent_map.-20080421172708-x1z6ot341osr0jq1-1
doc/es/ es-20080504181154-x2fm3oprvjohiz7n-1
doc/es/guia-desarrollador/ guiadesarrollador-20080504181514-qlh50dq1mj769bic-1
doc/es/guia-usuario/ guiausuario-20080504181514-qlh50dq1mj769bic-2
doc/es/guia-usuario/index.txt index.txt-20080512005856-hgdxkh9xo58n7zdp-2
doc/es/guia-usuario/resolving_conflicts.txt conflicts.txt-20080504181626-aqnzjwfhpju5ypfe-1
doc/es/guia-usuario/version_info.txt version_info.txt-20080504181730-u24nugzokrcrk1bf-1
doc/es/mini-tutorial/ minitutorial-20080504181514-qlh50dq1mj769bic-3
doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
doc/es/notas-version/ notasversion-20080504181514-qlh50dq1mj769bic-4
doc/es/referencia/ referencia-20080504181514-qlh50dq1mj769bic-5
doc/es/referencia-rapida/ referenciarapida-20080504181514-qlh50dq1mj769bic-6
doc/es/referencia-rapida/Makefile makefile-20080506002609-y60mr4avuqwzlf4s-1
doc/es/referencia-rapida/referencia-rapida.svg referenciarapida.svg-20080506002609-y60mr4avuqwzlf4s-2
doc/index.es.txt index.es.txt-20080506002113-aunzdhptcoc0h6hm-1
renamed:
doc/en/user-guide/revnos.txt => doc/en/user-guide/zen.txt revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/counted_lock.py counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
bzrlib/decorators.py decorators.py-20060112082512-6bfc2d882df1698d
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/export/tar_exporter.py tar_exporter.py-20051114235828-1f6349a2f090a5d0
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
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/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
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/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/blackbox/test_unknowns.py test_unknowns.py-20070905015344-74tg6s1synijo2oe-1
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_check.py test_check.py-20080429151303-1sbfclxhddpz0tnj-1
bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/branch_implementations/test_reconcile.py test_reconcile.py-20080429161555-qlmccuyeyt6pvho7-1
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_counted_lock.py test_counted_lock.py-20070502135927-7dk86io3ok7ctx6k-2
bzrlib/tests/test_decorators.py test_decorators.py-20060113063037-0e7bd4566758f4fa
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
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_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
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_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_switch.py test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
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_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/fakenfs.py fakenfs.py-20060402223312-0e29c7275aa384dd
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/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/transport/http/wsgi.py wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/developers/tortoise-strategy.txt tortoisestrategy.txt-20080403024510-2ahdqrvnwqrb5p5t-1
doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/en/user-guide/bzrtools_plugin.txt bzrtools_plugin.txt-20080509065016-cjc90f46407vi9a0-1
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/distributed_intro.txt distributed_intro.tx-20071123154453-dk2mjhrg1vpjm5w2-2
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/part2_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
doc/en/user-guide/releasing_a_project.txt releasing_a_project.-20071121073725-0corxykv5irjal00-5
doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/en/user-guide/web_browsing.txt web_browsing.txt-20080509065016-cjc90f46407vi9a0-3
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
doc/en/user-guide/zen.txt revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
------------------------------------------------------------
revno: 3398.1.24
revision-id:ian.clatworthy at canonical.com-20080528070106-6w0oc8zat4bs29g1
parent: ian.clatworthy at canonical.com-20080528024455-qrlsbxdpjvru39t3
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Wed 2008-05-28 17:01:06 +1000
message:
make iter_search_rules a tree method
added:
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
modified:
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3398.1.23
revision-id:ian.clatworthy at canonical.com-20080528024455-qrlsbxdpjvru39t3
parent: ian.clatworthy at canonical.com-20080516072342-mask6fiqzepounjt
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Wed 2008-05-28 12:44:55 +1000
message:
update doc to reflect file naming per poolie's review
modified:
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
------------------------------------------------------------
revno: 3398.1.22
revision-id:ian.clatworthy at canonical.com-20080516072342-mask6fiqzepounjt
parent: ian.clatworthy at canonical.com-20080516071809-xwuptticx302yb80
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Fri 2008-05-16 17:23:42 +1000
message:
minor tweaks
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
------------------------------------------------------------
revno: 3398.1.21
revision-id:ian.clatworthy at canonical.com-20080516071809-xwuptticx302yb80
parent: ian.clatworthy at canonical.com-20080516063938-remqvraflckd9a5k
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Fri 2008-05-16 17:18:09 +1000
message:
add 'Rule-based references' section to the User Guide
modified:
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
------------------------------------------------------------
revno: 3398.1.20
revision-id:ian.clatworthy at canonical.com-20080516063938-remqvraflckd9a5k
parent: ian.clatworthy at canonical.com-20080516043429-pwi2zi5r1krf0dus
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Fri 2008-05-16 16:39:38 +1000
message:
add rules help topic
added:
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 3398.1.19
revision-id:ian.clatworthy at canonical.com-20080516043429-pwi2zi5r1krf0dus
parent: ian.clatworthy at canonical.com-20080515143919-16pf8dgra3s6uab4
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Fri 2008-05-16 14:34:29 +1000
message:
add tests for iter_search_rules
modified:
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
------------------------------------------------------------
revno: 3398.1.18
revision-id:ian.clatworthy at canonical.com-20080515143919-16pf8dgra3s6uab4
parent: ian.clatworthy at canonical.com-20080515142813-q1tjsoth3k5h00og
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Fri 2008-05-16 00:39:19 +1000
message:
add tests for _StackedRulesSearcher
modified:
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
------------------------------------------------------------
revno: 3398.1.17
revision-id:ian.clatworthy at canonical.com-20080515142813-q1tjsoth3k5h00og
parent: ian.clatworthy at canonical.com-20080515141154-nf89qt4xeisdfi4z
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Fri 2008-05-16 00:28:13 +1000
message:
search less when files not present
modified:
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
------------------------------------------------------------
revno: 3398.1.16
revision-id:ian.clatworthy at canonical.com-20080515141154-nf89qt4xeisdfi4z
parent: ian.clatworthy at canonical.com-20080515135759-6o8teyvlmt0lhyu4
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Fri 2008-05-16 00:11:54 +1000
message:
remove api on tree to get preferences
removed:
bzrlib/tests/tree_implementations/test_get_attributes.py test_get_attributes.-20080514023519-4gtm7gmpjh2jl5cf-1
modified:
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3398.1.15
revision-id:ian.clatworthy at canonical.com-20080515135759-6o8teyvlmt0lhyu4
parent: ian.clatworthy at canonical.com-20080514023538-gvumjp4et6v6qfx8
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Thu 2008-05-15 23:57:59 +1000
message:
search branch.rules and bazaar.rules for preferences
renamed:
bzrlib/attributes.py => bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_attributes.py => bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
------------------------------------------------------------
revno: 3398.1.14
revision-id:ian.clatworthy at canonical.com-20080514023538-gvumjp4et6v6qfx8
parent: ian.clatworthy at canonical.com-20080513065219-uqfkrcr1iooh33je
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Wed 2008-05-14 12:35:38 +1000
message:
add test_get_attributes
added:
bzrlib/tests/tree_implementations/test_get_attributes.py test_get_attributes.-20080514023519-4gtm7gmpjh2jl5cf-1
------------------------------------------------------------
revno: 3398.1.13
revision-id:ian.clatworthy at canonical.com-20080513065219-uqfkrcr1iooh33je
parent: ian.clatworthy at canonical.com-20080513062538-a6g3zuw1ii1ut2rt
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Tue 2008-05-13 16:52:19 +1000
message:
rename properties to attributes
renamed:
bzrlib/properties.py => bzrlib/attributes.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_properties.py => bzrlib/tests/test_attributes.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/attributes.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_attributes.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
------------------------------------------------------------
revno: 3398.1.12
revision-id:ian.clatworthy at canonical.com-20080513062538-a6g3zuw1ii1ut2rt
parent: ian.clatworthy at canonical.com-20080513054255-76nwz6stnzt2ueao
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Tue 2008-05-13 16:25:38 +1000
message:
add tests for Tree.get_attributes
modified:
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3398.1.11
revision-id:ian.clatworthy at canonical.com-20080513054255-76nwz6stnzt2ueao
parent: ian.clatworthy at canonical.com-20080513014322-f1fwqv03wer13ss5
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Tue 2008-05-13 15:42:55 +1000
message:
add api to Tree
modified:
bzrlib/properties.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_properties.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3398.1.10
revision-id:ian.clatworthy at canonical.com-20080513014322-f1fwqv03wer13ss5
parent: ian.clatworthy at canonical.com-20080513013751-ql8h1dt4x1cms805
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Tue 2008-05-13 11:43:22 +1000
message:
rename .bzrproperties to fileproperties
modified:
bzrlib/properties.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_properties.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
------------------------------------------------------------
revno: 3398.1.9
revision-id:ian.clatworthy at canonical.com-20080513013751-ql8h1dt4x1cms805
parent: ian.clatworthy at canonical.com-20080506060944-c6dxxh7ms8sfslci
parent: pqm at pqm.ubuntu.com-20080512115743-6uz3lnmrrbhmoiqe
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Tue 2008-05-13 11:37:51 +1000
message:
merge bzr.dev
added:
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/developers/repository-stream.txt repositorystream.txt-20080410222511-nh6b9bvscvcerh48-1
doc/en/user-guide/bzrtools_plugin.txt bzrtools_plugin.txt-20080509065016-cjc90f46407vi9a0-1
doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
doc/en/user-guide/web_browsing.txt web_browsing.txt-20080509065016-cjc90f46407vi9a0-3
renamed:
doc/en/user-guide/best_practice_intro.txt => doc/en/user-guide/part2_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/_patiencediff_py.py cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/atomicfile.py atomicfile.py-20050509044450-dbd24e6c564f7c66
bzrlib/benchmarks/bench_bundle.py bench_bundle.py-20060719055338-o1c6ieybbwt6c3zv-1
bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/counted_lock.py counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/doc/__init__.py __init__.py-20051224020731-eb3eb3ef5b4570df
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/hashcache.py hashcache.py-20050706091756-fe3a8cc1143ff24f
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/authentication.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/intset.py intset.py-20050717175247-81cd658f9aaa2731
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lazy_import.py lazy_import.py-20060910203832-f77c54gf3n232za0-1
bzrlib/lazy_regex.py lazy_regex.py-20061009091222-fyettq6z5qomdl9e-1
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
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/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/rio.py rio.py-20051128032247-770b120b34dfff60
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/testament.py testament.py-20051011100429-6d319a18183b13c8
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_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/ftp_server.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
bzrlib/tests/per_lock/__init__.py __init__.py-20070314201444-u92yjsqrkh2m3qcb-1
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/repository_implementations/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
bzrlib/tests/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
bzrlib/tests/stub_sftp.py stub_sftp.py-20051027032739-0e7ef4f7bab0e174
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
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_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
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_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_registry.py test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_strace.py test_strace.py-20070323001526-6zquhhw8leb9m6j8-2
bzrlib/tests/test_subsume.py test_subsume.py-20060927040024-tsvh4pchajoayymg-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/treeshape.py treeshape.py-20051004094628-312a98f0194306a8
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_add_reference.py test_add_reference.p-20061211024451-yo9i1691dgbv1eyn-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_set_root_id.py test_set_root_id.py-20061004073850-0r1c7qikmnkb8m9k-1
bzrlib/tests/workingtree_implementations/test_walkdirs.py test_walkdirs.py-20060731045042-ch366w6dve2m7ro9-1
bzrlib/textinv.py textinv.py-20050411024435-e3898231b7d1897b26c38878
bzrlib/textui.py textui.py-20050309040759-5d0cebe09c528e7d
bzrlib/timestamp.py timestamp.py-20070306142322-ttbb9oulf3jotljd-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transactions.py transactions.py-20051007010900-f1313d53cf58e223
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/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/wsgi.py wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
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/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/treebuilder.py treebuilder.py-20060907214856-4omn6hf1u7fvrart-1
bzrlib/tuned_gzip.py tuned_gzip.py-20060407014720-5aadc518e928e8d2
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weavefile.py weavefile.py-20050629135233-2ffe0200f103f6c2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml4.py xml4.py-20050916091259-db5ab55e7e6ca324
bzrlib/xml5.py xml5.py-20080328030717-t9guwinq8hom0ar3-1
bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
doc/en/user-guide/part2_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
------------------------------------------------------------
revno: 3398.1.8
revision-id:ian.clatworthy at canonical.com-20080506060944-c6dxxh7ms8sfslci
parent: ian.clatworthy at canonical.com-20080506054555-br294d6fre6e9328
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Tue 2008-05-06 16:09:44 +1000
message:
added NEWS item
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3398.1.7
revision-id:ian.clatworthy at canonical.com-20080506054555-br294d6fre6e9328
parent: ian.clatworthy at canonical.com-20080506034407-1xgz1vace8ui55du
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Tue 2008-05-06 15:45:55 +1000
message:
add PropertiesProvider tests
modified:
bzrlib/properties.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_properties.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
------------------------------------------------------------
revno: 3398.1.6
revision-id:ian.clatworthy at canonical.com-20080506034407-1xgz1vace8ui55du
parent: ian.clatworthy at canonical.com-20080506033625-igxkqcuy9alfw1kn
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Tue 2008-05-06 13:44:07 +1000
message:
get properties_filename() test passing
modified:
bzrlib/properties.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_properties.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
------------------------------------------------------------
revno: 3398.1.5
revision-id:ian.clatworthy at canonical.com-20080506033625-igxkqcuy9alfw1kn
parent: ian.clatworthy at canonical.com-20080506033534-cbf23mjeb2hck0eo
parent: pqm at pqm.ubuntu.com-20080505231558-7w3zaehbvtcjk7jv
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Tue 2008-05-06 13:36:25 +1000
message:
merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
------------------------------------------------------------
revno: 3398.1.4
revision-id:ian.clatworthy at canonical.com-20080506033534-cbf23mjeb2hck0eo
parent: ian.clatworthy at canonical.com-20080506032646-8xp61rm9w13pfv0p
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Tue 2008-05-06 13:35:34 +1000
message:
add properties_filename() test
added:
bzrlib/tests/test_properties.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
------------------------------------------------------------
revno: 3398.1.3
revision-id:ian.clatworthy at canonical.com-20080506032646-8xp61rm9w13pfv0p
parent: ian.clatworthy at canonical.com-20080506031731-kznp1rv6goygxf1r
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Tue 2008-05-06 13:26:46 +1000
message:
first cut at PropertiesProvider class
added:
bzrlib/properties.py properties.py-20080506032617-9k06uqalkf09ck0z-1
------------------------------------------------------------
revno: 3398.1.2
revision-id:ian.clatworthy at canonical.com-20080506031731-kznp1rv6goygxf1r
parent: ian.clatworthy at canonical.com-20080506025711-59ywlehptmne1xos
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Tue 2008-05-06 13:17:31 +1000
message:
add tests for _OrderedGlobster
modified:
bzrlib/tests/test_globbing.py test_glob.py-20061113075651-q63o2v35fm2ydk9x-2
------------------------------------------------------------
revno: 3398.1.1
revision-id:ian.clatworthy at canonical.com-20080506025711-59ywlehptmne1xos
parent: pqm at pqm.ubuntu.com-20080501112512-b9lgs4w8r43evtn1
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.properties
timestamp: Tue 2008-05-06 12:57:11 +1000
message:
simplify the custom Globster to only care about ordering
modified:
bzrlib/globbing.py glob.py-20061113075651-q63o2v35fm2ydk9x-1
=== added file 'bzrlib/help_topics/en/patterns.txt'
--- a/bzrlib/help_topics/en/patterns.txt 1970-01-01 00:00:00 +0000
+++ b/bzrlib/help_topics/en/patterns.txt 2008-06-25 07:17:14 +0000
@@ -0,0 +1,25 @@
+Patterns
+========
+
+Bazaar uses patterns to match files at various times. For example,
+the ``add`` command skips over files that match ignore patterns
+and preferences can be associated with files using rule patterns.
+The pattern syntax is described below.
+
+Trailing slashes on patterns are ignored. If the pattern contains a
+slash or is a regular expression, it is compared to the whole path
+from the branch root. Otherwise, it is compared to only the last
+component of the path. To match a file only in the root directory,
+prepend './'. Patterns specifying absolute paths are not allowed.
+
+Patterns may include globbing wildcards such as::
+
+ ? - Matches any single character except '/'
+ * - Matches 0 or more characters except '/'
+ /**/ - Matches 0 or more directories in a path
+ [a-z] - Matches a single character from within a group of characters
+
+Patterns may also be Python regular expressions. Regular expression
+patterns are identified by a 'RE:' prefix followed by the regular
+expression. Regular expression patterns may not include named or
+numbered groups.
=== added file 'bzrlib/help_topics/en/rules.txt'
--- a/bzrlib/help_topics/en/rules.txt 1970-01-01 00:00:00 +0000
+++ b/bzrlib/help_topics/en/rules.txt 2008-07-02 01:40:02 +0000
@@ -0,0 +1,39 @@
+Rules
+=====
+
+Introduction
+------------
+
+Rules are defined in ini file format where the sections are file glob
+patterns and the contents of each section are the preferences for files
+matching that pattern. For example::
+
+ [name *.bat]
+ eol = dos
+
+ [name *.html]
+ keywords = escape
+
+Preferences like these are useful for commands and plugins wishing to
+provide custom behaviour for selected files in selected branches.
+
+
+Files
+-----
+
+Branch-specific rules are defined in ``.bzrrules`` in the root of the
+working tree. Default rules for all branches are defined in
+``BZR_HOME/rules``. Either or both files may be missing. If a rule is
+matched by a pattern in the branch level file, searching stops.
+
+
+Rule Patterns
+-------------
+
+Patterns are ordered and searching stops as soon as one matches.
+As a consequence, more explicit patterns should be placed towards
+the top of the file. Rule patterns use exactly the same conventions
+as ignore patterns. See ``bzr help patterns`` for details.
+
+Note: Patterns containing square brackets should be surrounded in
+quotes to ensure they are corrected parsed.
=== added file 'bzrlib/rules.py'
--- a/bzrlib/rules.py 1970-01-01 00:00:00 +0000
+++ b/bzrlib/rules.py 2008-06-30 00:47:30 +0000
@@ -0,0 +1,142 @@
+# Copyright (C) 2008 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
+
+"""Rule-based definition of preferences for selected files in selected branches.
+
+See ``bzr help rules`` for details.
+"""
+
+from bzrlib import (
+ config,
+ errors,
+ globbing,
+ osutils,
+ )
+from bzrlib.util.configobj import configobj
+
+
+# Name of the file holding rules in a tree
+RULES_TREE_FILENAME = ".bzrrules"
+
+# Namespace prefix for per file preferences
+FILE_PREFS_PREFIX = 'name '
+FILE_PREFS_PREFIX_LEN = len(FILE_PREFS_PREFIX)
+
+
+class _RulesSearcher(object):
+ """An object that provides rule-based preferences."""
+
+ def get_items(self, path):
+ """Return the preferences for a path as name,value tuples.
+
+ :param path: tree relative path
+ :return: [] if no rule matched, otherwise a sequence of name,value
+ tuples.
+ """
+ raise NotImplementedError(self.get_items)
+
+ def get_selected_items(self, path, names):
+ """Return selected preferences for a path as name,value tuples.
+
+ :param path: tree relative path
+ :param names: the list of preferences to lookup
+ :return: [] if no rule matched, otherwise a sequence of name,value
+ tuples. The sequence is the same length as names,
+ tuple order matches the order in names, and
+ undefined preferences are given the value None.
+ """
+ raise NotImplementedError(self.get_selected_items)
+
+
+class _IniBasedRulesSearcher(_RulesSearcher):
+
+ def __init__(self, inifile):
+ """Construct a _RulesSearcher based on an ini file.
+
+ The content will be decoded as utf-8.
+
+ :param inifile: the name of the file or a sequence of lines.
+ """
+ options = {'encoding': 'utf-8'}
+ self._cfg = configobj.ConfigObj(inifile, options=options)
+ sections = self._cfg.keys()
+ patterns = [s[FILE_PREFS_PREFIX_LEN:] for s in sections
+ if s.startswith(FILE_PREFS_PREFIX)]
+ if len(patterns) < len(sections):
+ unknowns = [s for s in sections
+ if not s.startswith(FILE_PREFS_PREFIX)]
+ raise errors.UnknownRules(unknowns)
+ elif patterns:
+ self._globster = globbing._OrderedGlobster(patterns)
+ else:
+ self._globster = None
+
+ def get_items(self, path):
+ """See _RulesSearcher.get_items."""
+ if self._globster is None:
+ return []
+ pat = self._globster.match(path)
+ if pat is None:
+ return []
+ else:
+ all = self._cfg[FILE_PREFS_PREFIX + pat]
+ return tuple(all.items())
+
+ def get_selected_items(self, path, names):
+ """See _RulesSearcher.get_selected_items."""
+ if self._globster is None:
+ return []
+ pat = self._globster.match(path)
+ if pat is None:
+ return []
+ else:
+ all = self._cfg[FILE_PREFS_PREFIX + pat]
+ return tuple((k, all.get(k)) for k in names)
+
+
+class _StackedRulesSearcher(_RulesSearcher):
+
+ def __init__(self, searchers):
+ """Construct a _RulesSearcher based on a stack of other ones.
+
+ :param searchers: a sequence of searchers.
+ """
+ self.searchers = searchers
+
+ def get_items(self, path):
+ """See _RulesSearcher.get_items."""
+ for searcher in self.searchers:
+ result = searcher.get_items(path)
+ if result:
+ return result
+ return []
+
+ def get_selected_items(self, path, names):
+ """See _RulesSearcher.get_selected_items."""
+ for searcher in self.searchers:
+ result = searcher.get_selected_items(path, names)
+ if result:
+ return result
+ return []
+
+
+def rules_filename():
+ """Return the default rules filename."""
+ return osutils.pathjoin(config.config_dir(), 'rules')
+
+
+# The object providing default rules
+_per_user_searcher = _IniBasedRulesSearcher(rules_filename())
=== added file 'bzrlib/tests/test_rules.py'
--- a/bzrlib/tests/test_rules.py 1970-01-01 00:00:00 +0000
+++ b/bzrlib/tests/test_rules.py 2008-06-30 00:47:30 +0000
@@ -0,0 +1,119 @@
+# Copyright (C) 2008 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
+
+"""Tests for finding, parsing and searching rule-based preferences."""
+
+import os
+import sys
+
+from bzrlib import (
+ config,
+ errors,
+ rules,
+ tests,
+ )
+from bzrlib.util.configobj import configobj
+
+
+class TestIniBasedRulesSearcher(tests.TestCase):
+
+ def make_searcher(self, text):
+ """Make a _RulesSearcher from a string"""
+ if text is None:
+ lines = None
+ else:
+ lines = text.splitlines()
+ return rules._IniBasedRulesSearcher(lines)
+
+ def test_unknown_namespace(self):
+ self.assertRaises(errors.UnknownRules, rules._IniBasedRulesSearcher,
+ ["[junk]", "foo=bar"])
+
+ def test_get_items_file_missing(self):
+ rs = self.make_searcher(None)
+ self.assertEquals([], rs.get_items('a.txt'))
+ self.assertEquals([], rs.get_selected_items('a.txt', ['foo']))
+
+ def test_get_items_file_empty(self):
+ rs = self.make_searcher("")
+ self.assertEquals([], rs.get_items('a.txt'))
+ self.assertEquals([], rs.get_selected_items('a.txt', ['foo']))
+
+ def test_get_items_from_extension_match(self):
+ rs = self.make_searcher("[name *.txt]\nfoo=bar\na=True\n")
+ self.assertEquals([], rs.get_items('a.py'))
+ self.assertEquals((('foo', 'bar'), ('a', 'True')),
+ rs.get_items('a.txt'))
+ self.assertEquals((('foo', 'bar'), ('a', 'True')),
+ rs.get_items('dir/a.txt'))
+ self.assertEquals((('foo', 'bar'),),
+ rs.get_selected_items('a.txt', ['foo']))
+
+ def test_get_items_pathname_match(self):
+ rs = self.make_searcher("[name ./a.txt]\nfoo=baz\n")
+ self.assertEquals((('foo', 'baz'),),
+ rs.get_items('a.txt'))
+ self.assertEquals([], rs.get_items('dir/a.txt'))
+
+ def test_get_items_match_first(self):
+ rs = self.make_searcher(
+ "[name ./a.txt]\nfoo=baz\n"
+ "[name *.txt]\nfoo=bar\na=True\n")
+ self.assertEquals((('foo', 'baz'),),
+ rs.get_items('a.txt'))
+ self.assertEquals((('foo', 'bar'), ('a', 'True')),
+ rs.get_items('dir/a.txt'))
+
+
+class TestStackedRulesSearcher(tests.TestCase):
+
+ def make_searcher(self, text1=None, text2=None):
+ """Make a _StackedRulesSearcher with 0, 1 or 2 items"""
+ searchers = []
+ if text1 is not None:
+ searchers.append(rules._IniBasedRulesSearcher(
+ text1.splitlines()))
+ if text2 is not None:
+ searchers.append(rules._IniBasedRulesSearcher(
+ text2.splitlines()))
+ return rules._StackedRulesSearcher(searchers)
+
+ def test_stack_searching(self):
+ rs = self.make_searcher(
+ "[name ./a.txt]\nfoo=baz\n",
+ "[name *.txt]\nfoo=bar\na=True\n")
+ self.assertEquals((('foo', 'baz'),),
+ rs.get_items('a.txt'))
+ self.assertEquals((('foo', 'bar'), ('a', 'True')),
+ rs.get_items('dir/a.txt'))
+
+
+class TestRulesPath(tests.TestCase):
+
+ def setUp(self):
+ super(TestRulesPath, self).setUp()
+ os.environ['HOME'] = '/home/bogus'
+ if sys.platform == 'win32':
+ os.environ['BZR_HOME'] = \
+ r'C:\Documents and Settings\bogus\Application Data'
+ self.bzr_home = \
+ 'C:/Documents and Settings/bogus/Application Data/bazaar/2.0'
+ else:
+ self.bzr_home = '/home/bogus/.bazaar'
+
+ def test_rules_filename(self):
+ self.assertEqual(rules.rules_filename(),
+ self.bzr_home + '/rules')
=== added file 'bzrlib/tests/tree_implementations/test_iter_search_rules.py'
--- a/bzrlib/tests/tree_implementations/test_iter_search_rules.py 1970-01-01 00:00:00 +0000
+++ b/bzrlib/tests/tree_implementations/test_iter_search_rules.py 2008-06-26 06:53:18 +0000
@@ -0,0 +1,77 @@
+# Copyright (C) 2008 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
+
+"""Test that all Tree's implement iter_search_rules."""
+
+from bzrlib import (
+ rules,
+ tests,
+ )
+from bzrlib.tests.tree_implementations import TestCaseWithTree
+
+
+class TestIterSearchRules(TestCaseWithTree):
+
+ def make_per_user_searcher(self, text):
+ """Make a _RulesSearcher from a string"""
+ return rules._IniBasedRulesSearcher(text.splitlines(True))
+
+ def make_tree_with_rules(self, text):
+ tree = self.make_branch_and_tree('.')
+ if text is not None:
+ text_utf8 = text.encode('utf-8')
+ self.build_tree_contents([(rules.RULES_TREE_FILENAME, text_utf8)])
+ tree.add(rules.RULES_TREE_FILENAME)
+ tree.commit("add rules file")
+ result = self._convert_tree(tree)
+ result.lock_read()
+ self.addCleanup(result.unlock)
+ return result
+
+ def test_iter_search_rules_no_tree(self):
+ per_user = self.make_per_user_searcher(
+ "[name ./a.txt]\nfoo=baz\n"
+ "[name *.txt]\nfoo=bar\na=True\n")
+ tree = self.make_tree_with_rules(None)
+ result = list(tree.iter_search_rules(['a.txt', 'dir/a.txt'],
+ _default_searcher=per_user))
+ self.assertEquals((('foo', 'baz'),), result[0])
+ self.assertEquals((('foo', 'bar'), ('a', 'True')), result[1])
+
+ def test_iter_search_rules_just_tree(self):
+ per_user = self.make_per_user_searcher('')
+ tree = self.make_tree_with_rules(
+ "[name ./a.txt]\n"
+ "foo=baz\n"
+ "[name *.txt]\n"
+ "foo=bar\n"
+ "a=True\n")
+ result = list(tree.iter_search_rules(['a.txt', 'dir/a.txt'],
+ _default_searcher=per_user))
+ self.assertEquals((('foo', 'baz'),), result[0])
+ self.assertEquals((('foo', 'bar'), ('a', 'True')), result[1])
+
+ def test_iter_search_rules_tree_and_per_user(self):
+ per_user = self.make_per_user_searcher(
+ "[name ./a.txt]\nfoo=baz\n"
+ "[name *.txt]\nfoo=bar\na=True\n")
+ tree = self.make_tree_with_rules(
+ "[name ./a.txt]\n"
+ "foo=qwerty\n")
+ result = list(tree.iter_search_rules(['a.txt', 'dir/a.txt'],
+ _default_searcher=per_user))
+ self.assertEquals((('foo', 'qwerty'),), result[0])
+ self.assertEquals((('foo', 'bar'), ('a', 'True')), result[1])
=== modified file 'NEWS'
--- a/NEWS 2008-06-26 06:06:49 +0000
+++ b/NEWS 2008-07-02 01:40:02 +0000
@@ -8,6 +8,15 @@
IN DEVELOPMENT
--------------
+ FEATURES:
+
+ * Rule-based preferences can now be defined for selected files in
+ selected branches, allowing commands and plugins to provide
+ custom behaviour for files matching defined patterns.
+ See ``Rule-based preferences`` (part of ``Configuring Bazaar``)
+ in the User Guide and ``bzr help rules`` for more information.
+ (Ian Clatworthy)
+
IMPROVEMENTS:
* ``bzr export --format=tgz --root=NAME -`` to export a gzipped tarball
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2008-06-26 00:13:55 +0000
+++ b/bzrlib/builtins.py 2008-07-02 01:40:02 +0000
@@ -1936,27 +1936,12 @@
class cmd_ignore(Command):
"""Ignore specified files or patterns.
+ See ``bzr help patterns`` for details on the syntax of patterns.
+
To remove patterns from the ignore list, edit the .bzrignore file.
-
- Trailing slashes on patterns are ignored.
- If the pattern contains a slash or is a regular expression, it is compared
- to the whole path from the branch root. Otherwise, it is compared to only
- the last component of the path. To match a file only in the root
- directory, prepend './'.
-
- Ignore patterns specifying absolute paths are not allowed.
-
- Ignore patterns may include globbing wildcards such as::
-
- ? - Matches any single character except '/'
- * - Matches 0 or more characters except '/'
- /**/ - Matches 0 or more directories in a path
- [a-z] - Matches a single character from within a group of characters
-
- Ignore patterns may also be Python regular expressions.
- Regular expression ignore patterns are identified by a 'RE:' prefix
- followed by the regular expression. Regular expression ignore patterns
- may not include named or numbered groups.
+ After adding, editing or deleting that file either indirectly by
+ using this command or directly by using an editor, be sure to commit
+ it.
Note: ignore patterns containing shell wildcards must be quoted from
the shell on Unix.
@@ -1983,7 +1968,7 @@
bzr ignore "RE:(?!debian/).*"
"""
- _see_also = ['status', 'ignored']
+ _see_also = ['status', 'ignored', 'patterns']
takes_args = ['name_pattern*']
takes_options = [
Option('old-default-rules',
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py 2008-06-26 05:10:31 +0000
+++ b/bzrlib/errors.py 2008-07-02 01:40:02 +0000
@@ -2760,3 +2760,11 @@
def __init__(self, host, port, orig_error):
BzrError.__init__(self, host=host, port=port,
orig_error=orig_error[1])
+
+
+class UnknownRules(BzrError):
+
+ _fmt = ('Unknown rules detected: %(unknowns_str)s.')
+
+ def __init__(self, unknowns):
+ BzrError.__init__(self, unknowns_str=", ".join(unknowns))
=== modified file 'bzrlib/globbing.py'
--- a/bzrlib/globbing.py 2007-03-07 14:49:00 +0000
+++ b/bzrlib/globbing.py 2008-05-06 02:57:11 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006, 2008 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
@@ -214,7 +214,29 @@
if match:
return patterns[match.lastindex -1]
return None
-
+
+
+class _OrderedGlobster(Globster):
+ """A Globster that keeps pattern order."""
+
+ def __init__(self, patterns):
+ """Constructor.
+
+ :param patterns: sequence of glob patterns
+ """
+ # Note: This could be smarter by running like sequences together
+ self._regex_patterns = []
+ for pat in patterns:
+ pat = normalize_pattern(pat)
+ if pat.startswith(u'RE:') or u'/' in pat:
+ self._add_patterns([pat], _sub_fullpath)
+ elif pat.startswith(u'*.'):
+ self._add_patterns([pat], _sub_extension,
+ prefix=r'(?:.*/)?(?!.*/)(?:.*\.)')
+ else:
+ self._add_patterns([pat], _sub_basename,
+ prefix=r'(?:.*/)?(?!.*/)')
+
def normalize_pattern(pattern):
"""Converts backslashes in path patterns to forward slashes.
=== modified file 'bzrlib/help_topics/__init__.py'
--- a/bzrlib/help_topics/__init__.py 2008-05-02 06:00:46 +0000
+++ b/bzrlib/help_topics/__init__.py 2008-06-25 07:17:14 +0000
@@ -671,9 +671,15 @@
'Information on what a branch is', SECT_CONCEPT)
topic_registry.register('checkouts', _checkouts,
'Information on what a checkout is', SECT_CONCEPT)
+topic_registry.register('patterns', _load_from_file,
+ 'Information on the pattern syntax',
+ SECT_CONCEPT)
topic_registry.register('repositories', _repositories,
'Basic information on shared repositories.',
SECT_CONCEPT)
+topic_registry.register('rules', _load_from_file,
+ 'Information on defining rule-based preferences',
+ SECT_CONCEPT)
topic_registry.register('standalone-trees', _standalone_trees,
'Information on what a standalone tree is',
SECT_CONCEPT)
=== modified file 'bzrlib/revisiontree.py'
--- a/bzrlib/revisiontree.py 2008-06-11 04:20:16 +0000
+++ b/bzrlib/revisiontree.py 2008-07-02 01:40:02 +0000
@@ -42,6 +42,7 @@
self._repository = branch
self._inventory = inv
self._revision_id = revision_id
+ self._rules_searcher = None
def supports_tree_reference(self):
return True
@@ -202,3 +203,10 @@
for dir in reversed(dirblock):
if dir[2] == _directory:
pending.append(dir)
+
+ def _get_rules_searcher(self, default_searcher):
+ """See Tree._get_rules_searcher."""
+ if self._rules_searcher is None:
+ self._rules_searcher = super(RevisionTree,
+ self)._get_rules_searcher(default_searcher)
+ return self._rules_searcher
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2008-06-25 10:06:48 +0000
+++ b/bzrlib/tests/__init__.py 2008-07-02 01:40:02 +0000
@@ -2758,6 +2758,7 @@
'bzrlib.tests.test_revisionspec',
'bzrlib.tests.test_revisiontree',
'bzrlib.tests.test_rio',
+ 'bzrlib.tests.test_rules',
'bzrlib.tests.test_sampler',
'bzrlib.tests.test_selftest',
'bzrlib.tests.test_setup',
=== modified file 'bzrlib/tests/test_errors.py'
--- a/bzrlib/tests/test_errors.py 2008-05-21 19:02:34 +0000
+++ b/bzrlib/tests/test_errors.py 2008-06-25 11:37:34 +0000
@@ -499,6 +499,10 @@
err = errors.UnknownFormatError('bar', kind='foo')
self.assertEquals("Unknown foo format: 'bar'", str(err))
+ def test_unknown_rules(self):
+ err = errors.UnknownRules(['foo', 'bar'])
+ self.assertEquals("Unknown rules detected: foo, bar.", str(err))
+
class PassThroughError(errors.BzrError):
=== modified file 'bzrlib/tests/test_globbing.py'
--- a/bzrlib/tests/test_globbing.py 2007-03-07 14:49:00 +0000
+++ b/bzrlib/tests/test_globbing.py 2008-05-06 03:17:31 +0000
@@ -17,6 +17,7 @@
from bzrlib.globbing import (
Globster,
+ _OrderedGlobster,
)
from bzrlib.tests import (
TestCase,
@@ -305,3 +306,15 @@
self.assertEqual(patterns[x],globster.match(filename))
self.assertEqual(None,globster.match('foobar.300'))
+
+class TestOrderedGlobster(TestCase):
+
+ def test_ordered_globs(self):
+ """test that the first match in a list is the one found"""
+ patterns = [ u'*.foo', u'bar.*']
+ globster = _OrderedGlobster(patterns)
+ self.assertEqual(u'*.foo', globster.match('bar.foo'))
+ self.assertEqual(None, globster.match('foo.bar'))
+ globster = _OrderedGlobster(reversed(patterns))
+ self.assertEqual(u'bar.*', globster.match('bar.foo'))
+ self.assertEqual(None, globster.match('foo.bar'))
=== modified file 'bzrlib/tests/tree_implementations/__init__.py'
--- a/bzrlib/tests/tree_implementations/__init__.py 2008-06-20 19:06:38 +0000
+++ b/bzrlib/tests/tree_implementations/__init__.py 2008-06-25 01:06:53 +0000
@@ -352,6 +352,7 @@
'bzrlib.tests.tree_implementations.test_get_root_id',
'bzrlib.tests.tree_implementations.test_get_symlink_target',
'bzrlib.tests.tree_implementations.test_inv',
+ 'bzrlib.tests.tree_implementations.test_iter_search_rules',
'bzrlib.tests.tree_implementations.test_list_files',
'bzrlib.tests.tree_implementations.test_path_content_summary',
'bzrlib.tests.tree_implementations.test_revision_tree',
=== modified file 'bzrlib/tree.py'
--- a/bzrlib/tree.py 2008-06-26 00:17:06 +0000
+++ b/bzrlib/tree.py 2008-07-02 01:40:02 +0000
@@ -23,10 +23,11 @@
import bzrlib
from bzrlib import (
+ conflicts as _mod_conflicts,
delta,
osutils,
revision as _mod_revision,
- conflicts as _mod_conflicts,
+ rules,
symbol_versioning,
)
from bzrlib.decorators import needs_read_lock
@@ -512,6 +513,37 @@
"""
raise NotImplementedError(self.walkdirs)
+ def iter_search_rules(self, path_names, pref_names=None,
+ _default_searcher=rules._per_user_searcher):
+ """Find the preferences for filenames in a tree.
+
+ :param path_names: an iterable of paths to find attributes for.
+ Paths are given relative to the root of the tree.
+ :param pref_names: the list of preferences to lookup - None for all
+ :param _default_searcher: private parameter to assist testing - don't use
+ :return: an iterator of tuple sequences, one per path-name.
+ See _RulesSearcher.get_items for details on the tuple sequence.
+ """
+ searcher = self._get_rules_searcher(_default_searcher)
+ if searcher is not None:
+ if pref_names is not None:
+ for path in path_names:
+ yield searcher.get_selected_items(path, pref_names)
+ else:
+ for path in path_names:
+ yield searcher.get_items(path)
+
+ @needs_read_lock
+ def _get_rules_searcher(self, default_searcher):
+ """Get the RulesSearcher for this tree given the default one."""
+ searcher = default_searcher
+ file_id = self.path2id(rules.RULES_TREE_FILENAME)
+ if file_id is not None:
+ ini_file = self.get_file(file_id)
+ searcher = rules._StackedRulesSearcher(
+ [rules._IniBasedRulesSearcher(ini_file), default_searcher])
+ return searcher
+
class EmptyTree(Tree):
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py 2008-06-11 07:22:00 +0000
+++ b/bzrlib/workingtree.py 2008-07-02 01:40:02 +0000
@@ -246,6 +246,7 @@
# permitted to do this.
self._set_inventory(_inventory, dirty=False)
self._detect_case_handling()
+ self._rules_searcher = None
def _detect_case_handling(self):
wt_trans = self.bzrdir.get_workingtree_transport(None)
@@ -2463,6 +2464,14 @@
"""
return
+ @needs_read_lock
+ def _get_rules_searcher(self, default_searcher):
+ """See Tree._get_rules_searcher."""
+ if self._rules_searcher is None:
+ self._rules_searcher = super(WorkingTree,
+ self)._get_rules_searcher(default_searcher)
+ return self._rules_searcher
+
class WorkingTree2(WorkingTree):
"""This is the Format 2 working tree.
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py 2008-06-25 10:06:48 +0000
+++ b/bzrlib/workingtree_4.py 2008-07-02 01:40:02 +0000
@@ -148,6 +148,7 @@
#-------------
self._setup_directory_is_tree_reference()
self._detect_case_handling()
+ self._rules_searcher = None
@needs_tree_write_lock
def _add(self, files, ids, kinds):
=== modified file 'doc/en/user-guide/configuring_bazaar.txt'
--- a/doc/en/user-guide/configuring_bazaar.txt 2008-05-09 09:52:59 +0000
+++ b/doc/en/user-guide/configuring_bazaar.txt 2008-06-25 07:32:46 +0000
@@ -46,3 +46,15 @@
For further details on the syntax and configuration settings supported, see
`Configuration Settings <../user-reference/bzr_man.html#configuration-settings>`_
in the Bazaar User Reference.
+
+
+Rule-based preferences
+----------------------
+
+Some commands and plugins provide custom processing on files matching
+certain patterns. Branch-specific and per-user rule-based preferences
+are defined in ``.bzrrules`` and ``BZR_HOME/rules`` respectively.
+
+For further information on how rules are searched and the detailed syntax of
+the relevant files, see `Rules <../user-reference/bzr_man.html#rules>`_
+in the Bazaar User Reference.
More information about the bazaar-commits
mailing list