Rev 1871: (jam) allow global user ignores,
and include a small set by default in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Jul 19 22:44:17 BST 2006
------------------------------------------------------------
revno: 1871
revision-id: pqm at pqm.ubuntu.com-20060719214416-9fab2f627df9f1aa
parent: pqm at pqm.ubuntu.com-20060719213607-f777696fc691064c
parent: john at arbash-meinel.com-20060719203933-0fc9037bdb449761
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-07-19 22:44:16 +0100
message:
(jam) allow global user ignores, and include a small set by default
added:
bzrlib/ignores.py ignores.py-20060712153832-2von9l0t7p43ixsv-1
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
bzrlib/tests/test_ignores.py test_ignores.py-20060712172354-vqq9ln0t8di27v53-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
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_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/workingtree_implementations/test_is_ignored.py test_is_ignored.py-20060518083307-a5b383dd4d070083
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
------------------------------------------------------------
merged: john at arbash-meinel.com-20060719203933-0fc9037bdb449761
parent: john at arbash-meinel.com-20060719190156-11da95c8e2d987a5
parent: pqm at pqm.ubuntu.com-20060719203238-892f369155dca5dc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Wed 2006-07-19 15:39:33 -0500
message:
[merge] bzr.dev 1869
------------------------------------------------------------
merged: john at arbash-meinel.com-20060719190156-11da95c8e2d987a5
parent: john at arbash-meinel.com-20060713001248-59b78d76cb6cd8e0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Wed 2006-07-19 14:01:56 -0500
message:
cleanups suggested by Martin.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060713001248-59b78d76cb6cd8e0
parent: john at arbash-meinel.com-20060713000738-974459fa90527670
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Wed 2006-07-12 19:12:48 -0500
message:
remove the stub DEFAULT_IGNORE for just the deprecated list.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060713000738-974459fa90527670
parent: john at arbash-meinel.com-20060713000514-aa62627aa0d4deb6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Wed 2006-07-12 19:07:38 -0500
message:
Workaround plugins modifying the DEFAULT_IGNORE list when testing exact results.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060713000514-aa62627aa0d4deb6
parent: john at arbash-meinel.com-20060712235250-eea301eedffb7a11
parent: pqm at pqm.ubuntu.com-20060712215300-126aea223e34b65c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Wed 2006-07-12 19:05:14 -0500
message:
[merge] bzr.dev 1861
------------------------------------------------------------
merged: john at arbash-meinel.com-20060712235250-eea301eedffb7a11
parent: john at arbash-meinel.com-20060712234452-764f80cf21d61565
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Wed 2006-07-12 18:52:50 -0500
message:
Restore the ability to ignore items by modifying DEFAULT_IGNORE
------------------------------------------------------------
merged: john at arbash-meinel.com-20060712234452-764f80cf21d61565
parent: john at arbash-meinel.com-20060712233911-75bfbbdf732c0480
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Wed 2006-07-12 18:44:52 -0500
message:
Make sure that mixing global and local ignores work
------------------------------------------------------------
merged: john at arbash-meinel.com-20060712233911-75bfbbdf732c0480
parent: john at arbash-meinel.com-20060712233432-fd97116c76f4c8ba
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Wed 2006-07-12 18:39:11 -0500
message:
Update NEWS to explain the current situation for ignores.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060712233432-fd97116c76f4c8ba
parent: john at arbash-meinel.com-20060712232221-59ff471807ac2927
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Wed 2006-07-12 18:34:32 -0500
message:
Cleaned up the last failing tests. All tests pass again.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060712232221-59ff471807ac2927
parent: john at arbash-meinel.com-20060712193216-6f57cb717d4d4677
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Wed 2006-07-12 18:22:21 -0500
message:
move 'bzr ls' tests into their own file, and fix them up.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060712193216-6f57cb717d4d4677
parent: john at arbash-meinel.com-20060712180501-1a638c0c5b1e7646
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Wed 2006-07-12 14:32:16 -0500
message:
Cleanup some tests which don't expect .bazaar/ to show up. Some still fail.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060712180501-1a638c0c5b1e7646
parent: john at arbash-meinel.com-20060712173657-c79f05be9d74095b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Wed 2006-07-12 13:05:01 -0500
message:
Updated WorkingTree to use the new user-level ignores.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060712173657-c79f05be9d74095b
parent: john at arbash-meinel.com-20060712172416-161dc0bd567a2682
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Wed 2006-07-12 12:36:57 -0500
message:
Adding a helper function that will only add patterns if they are missing.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060712172416-161dc0bd567a2682
parent: john at arbash-meinel.com-20060712162000-c8cfe629b012e0bb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Wed 2006-07-12 12:24:16 -0500
message:
Adding functions for getting user ignores.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060712162000-c8cfe629b012e0bb
parent: john at arbash-meinel.com-20060712143754-6ae813e12c8ab5d9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Wed 2006-07-12 11:20:00 -0500
message:
Move ignores into a file of their own, make DEFAULT_IGNORE a deprecated list. Create deprecated_list in symbol versioning.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060712143754-6ae813e12c8ab5d9
parent: john at arbash-meinel.com-20060710165247-cc68c30ea42574dc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Wed 2006-07-12 09:37:54 -0500
message:
Removing setup-default-ignores per Martin's request
------------------------------------------------------------
merged: john at arbash-meinel.com-20060710165247-cc68c30ea42574dc
parent: john at arbash-meinel.com-20060710164849-6657190389d9e6c4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Mon 2006-07-10 11:52:47 -0500
message:
Make NEWS nicer for setup-default-ignores.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060710164849-6657190389d9e6c4
parent: john at arbash-meinel.com-20060707203837-652b426cfd7856de
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Mon 2006-07-10 11:48:49 -0500
message:
Add global ignore information to the tutorial.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060707203837-652b426cfd7856de
parent: john at arbash-meinel.com-20060707203114-9a5bad72db418754
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Fri 2006-07-07 15:38:37 -0500
message:
NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060707203114-9a5bad72db418754
parent: john at arbash-meinel.com-20060707202948-835b9b7031034d04
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Fri 2006-07-07 15:31:14 -0500
message:
Added a setup-default-ignores, which lets us restore the old default ignores.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060707202948-835b9b7031034d04
parent: john at arbash-meinel.com-20060707195626-9102f3d623083329
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Fri 2006-07-07 15:29:48 -0500
message:
Creating a helper function for getting the user ignore filename
------------------------------------------------------------
merged: john at arbash-meinel.com-20060707195626-9102f3d623083329
parent: john at arbash-meinel.com-20060707193953-0b5deaea49f21a9f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Fri 2006-07-07 14:56:26 -0500
message:
NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060707193953-0b5deaea49f21a9f
parent: john at arbash-meinel.com-20060707160159-2e7b7360bc3bed82
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Fri 2006-07-07 14:39:53 -0500
message:
Cleanup is_ignored to handle comment lines, and a global ignore pattern
------------------------------------------------------------
merged: john at arbash-meinel.com-20060707160159-2e7b7360bc3bed82
parent: john at arbash-meinel.com-20060704140029-f7d23145ea05d75a
parent: pqm at pqm.ubuntu.com-20060706145359-27c4289acd83b54e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ignores
timestamp: Fri 2006-07-07 11:01:59 -0500
message:
[merge] 1843
More information about the bazaar-commits
mailing list