[merge] global (per user) ignores and other cleanups

John Arbash Meinel john at arbash-meinel.com
Fri Jul 7 21:45:10 BST 2006


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel wrote:
...

> I'm also going to go ahead and do the work to write a command which
> writes the old default ignore list to ~/.bazaar/ignore. I'm not 100%
> settled that we want it, but it does give us a way to easily migrate
> users to 0.9, which will no longer have builtin default ignores.
> 
> The other possibility would be that if ~/.bazaar/ignore *doesn't* exist,
> it uses the builtin list of default ignores. Which is more of a
> compatible upgrade path than our current system.
> 
> John
> =:->


As promised, attached is a bundle which adds the 'setup-default-ignores'
command. I wanted to write this separately, because I figured it was
more controversial than the previous patch.

All of this can be found at
http://bzr.arbash-meinel.com/branches/bzr/ignores/

And if we want to restore the 0.8 behavior until people setup their
~/.bazaar/ignore file, the patch is:

=== modified file 'bzrlib/workingtree.py'
- --- bzrlib/workingtree.py       2006-07-07 20:29:48 +0000
+++ bzrlib/workingtree.py       2006-07-07 20:43:18 +0000
@@ -1093,6 +1093,7 @@
         except (IOError, OSError), e:
             if e.errno not in (errno.ENOENT, errno.EPERM):
                 raise
+            ignore_globs = bzrlib.DEFAULT_IGNORE[:]
         else:
             try:
                 process_file(f)

Though we would want tests to ensure that it is working correctly.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFErsfWJdeBCYSNAAMRArfoAJ4pvvSHPKFMBVXi4d9pWH0054n9TQCfZ6B2
OayNsHCDqOg+E94LU8Lf+Bo=
=9ZW5
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: setup_default_ignores.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20060707/8cb64cfd/attachment.diff 


More information about the bazaar mailing list