[Pkg-bazaar-commits] ./bzr/unstable r410: - Fix ignore command and add tests

[Martin Pool]

------------------------------------------------------------
revno: 410
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-05-09 14:59:00 +1000
message:
  - Fix ignore command and add tests
modified:
  bzrlib/atomicfile.py
  bzrlib/commands.py
  testbzr
-------------- next part --------------
=== modified file 'bzrlib/atomicfile.py'
--- a/bzrlib/atomicfile.py	2005-05-09 04:50:11 +0000
+++ b/bzrlib/atomicfile.py	2005-05-09 04:59:00 +0000
@@ -41,12 +41,15 @@
         self.write = self.f.write
 
     def commit(self):
+        import sys, os
+        
         self.f.close()
         if sys.platform == 'win32':
             os.remove(self.realfilename)
         os.rename(self.tmpfilename, self.realfilename)
 
     def abort(self):
+        import os
         self.f.close()
         os.remove(self.tmpfilename)
         

=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2005-05-09 04:50:11 +0000
+++ b/bzrlib/commands.py	2005-05-09 04:59:00 +0000
@@ -490,11 +490,12 @@
         import codecs
 
         b = Branch('.')
+        ifn = b.abspath('.bzrignore')
 
         # FIXME: probably doesn't handle non-ascii patterns
 
-        if os.path.exists(b.controlfilename('.bzrignore')):
-            f = b.controlfile('.bzrignore', 'rt')
+        if os.path.exists(ifn):
+            f = b.controlfile(ifn, 'rt')
             igns = f.read()
             f.close()
         else:
@@ -504,7 +505,7 @@
             igns += '\n'
         igns += name_pattern + '\n'
 
-        f = AtomicFile(b.controlfilename('.bzrignore'), 'wt')
+        f = AtomicFile(ifn, 'wt')
         f.write(igns)
         f.commit()
 

=== modified file 'testbzr'
--- a/testbzr	2005-05-09 03:11:21 +0000
+++ b/testbzr	2005-05-09 04:59:00 +0000
@@ -286,6 +286,28 @@
     runcmd('bzr export export.tmp')
     
     cd('..')
+    cd('..')
+
+    progress('ignore patterns')
+    mkdir('ignorebranch')
+    cd('ignorebranch')
+    runcmd('bzr init')
+    assert backtick('bzr unknowns') == ''
+
+    file('foo.tmp', 'wt').write('tmp files are ignored')
+    assert backtick('bzr unknowns') == ''
+
+    file('foo.c', 'wt').write('int main() {}')
+    assert backtick('bzr unknowns') == 'foo.c\n'
+    runcmd('bzr add foo.c')
+    assert backtick('bzr unknowns') == ''
+
+    file('foo.blah', 'wt').write('blah')
+    assert backtick('bzr unknowns') == 'foo.blah\n'
+    runcmd('bzr ignore *.blah')
+    assert backtick('bzr unknowns') == ''
+    assert file('.bzrignore', 'rt').read() == '*.blah\n'
+
 
     progress("all tests passed!")
 except Exception, e: