Rev 3125: Use self.outf in cmd_ignored (Lalinsky) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3125
revision-id:pqm at pqm.ubuntu.com-20071218201613-83d41agovrry31lv
parent: pqm at pqm.ubuntu.com-20071218192043-bxigzty67cddkj7z
parent: abentley at panoramicfeedback.com-20071218184453-u5vzjc827se0283p
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-12-18 20:16:13 +0000
message:
  Use self.outf in cmd_ignored (Lalinsky)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
    ------------------------------------------------------------
    revno: 3123.2.1
    revision-id:abentley at panoramicfeedback.com-20071218184453-u5vzjc827se0283p
    parent: pqm at pqm.ubuntu.com-20071217234754-hzi1en08nilnvh6s
    parent: lalinsky at gmail.com-20071218152312-njiuw74xml5n421h
    author: Lukáš Lalinský
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Tue 2007-12-18 13:44:53 -0500
    message:
      Use self.outf in cmd_ignored
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
    ------------------------------------------------------------
    revno: 3123.3.1
    revision-id:lalinsky at gmail.com-20071218152312-njiuw74xml5n421h
    parent: pqm at pqm.ubuntu.com-20071217234754-hzi1en08nilnvh6s
    committer: Lukáš Lalinský <lalinsky at gmail.com>
    branch nick: unicode-ignored
    timestamp: Tue 2007-12-18 16:23:12 +0100
    message:
      Use self.outf instead of sys.stdout in cmd_ignored.
            
      This fixes Unicode failures when the output is redirected to something that isn't a terminal.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
=== modified file 'NEWS'
--- a/NEWS	2007-12-17 17:28:25 +0000
+++ b/NEWS	2007-12-18 15:23:12 +0000
@@ -40,6 +40,9 @@
 
   BUGFIXES:
 
+   * Fixed Unicode encoding error in ``ignored`` when the output is
+     redirected to a pipe. (Lukáš Lalinský)
+
    * Transform failures no longer cause ImmortalLimbo errors (Aaron Bentley,
      #137681)
 

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-12-17 02:48:23 +0000
+++ b/bzrlib/builtins.py	2007-12-18 15:23:12 +0000
@@ -2000,7 +2000,9 @@
     """List ignored files and the patterns that matched them.
     """
 
+    encoding_type = 'replace'
     _see_also = ['ignore']
+
     @display_command
     def run(self):
         tree = WorkingTree.open_containing(u'.')[0]
@@ -2011,7 +2013,7 @@
                     continue
                 ## XXX: Slightly inefficient since this was already calculated
                 pat = tree.is_ignored(path)
-                print '%-50s %s' % (path, pat)
+                self.outf.write('%-50s %s\n' % (path, pat))
         finally:
             tree.unlock()
 

=== modified file 'bzrlib/tests/blackbox/test_non_ascii.py'
--- a/bzrlib/tests/blackbox/test_non_ascii.py	2007-11-14 17:32:58 +0000
+++ b/bzrlib/tests/blackbox/test_non_ascii.py	2007-12-18 15:23:12 +0000
@@ -496,3 +496,13 @@
         self.run_bzr_decode(['info', self.info['directory']])
         self.run_bzr_decode(['info', self.info['directory']],
                             encoding='ascii')
+
+    def test_ignored(self):
+        fname = self.info['filename'] + '1.txt'
+        self.build_tree_contents([(fname, 'ignored\n')])
+        self.run_bzr(['ignore', fname])
+        txt = self.run_bzr_decode(['ignored'])
+        self.assertEqual(txt, '%-50s %s\n' % (fname, fname))
+        txt = self.run_bzr_decode(['ignored'], encoding='ascii')
+        fname = fname.encode('ascii', 'replace')
+        self.assertEqual(txt, '%-50s %s\n' % (fname, fname))