From 5699aef2a5741c5ffc24d9cb12d6bc9b085d484a Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@drexel.edu>
Date: Tue, 25 Nov 2008 15:47:19 -0500
Subject: Added libbe/encoding.py to wrap input/output/file access
 appropriately.

I borrowed most of the code for this.

get_encoding() is from Trac
  http://trac.edgewall.org/browser/trunk/trac/util/datefmt.py
  format_datetime()
Trac has a BSD license
  http://trac.edgewall.org/wiki/TracLicense
I don't know if such a small snippet requires us to "reproduce the
above copyright" or where we need to reproduce it if it is needed.

The stdout/stdin replacement code follows
  http://wiki.python.org/moin/ShellRedirectionFails

Because of the stdout replacement, the doctests executes now need an
optional 'test' argument to turn off replacement during the doctests,
otherwise doctest flips out (since it had set up stdout to catch
output, and then we clobbered it's setup).

References:
  http://wiki.python.org/moin/Unicode
  http://www.amk.ca/python/howto/unicode
  http://www.python.org/dev/peps/pep-0100/


I also split libbe/editor.py off from libbe.utility.py and started
explaining the motivation for the BugDir init flags in it's docstring.
---
 becommands/diff.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'becommands/diff.py')

diff --git a/becommands/diff.py b/becommands/diff.py
index 862afc5..8714d77 100644
--- a/becommands/diff.py
+++ b/becommands/diff.py
@@ -20,7 +20,7 @@ from libbe import cmdutil, bugdir, diff
 import os
 __desc__ = __doc__
 
-def execute(args):
+def execute(args, test=False):
     """
     >>> import os
     >>> bd = bugdir.simple_bug_dir()
@@ -31,7 +31,7 @@ def execute(args):
     >>> changed = bd.rcs.commit("Closed bug a")
     >>> os.chdir(bd.root)
     >>> if bd.rcs.versioned == True:
-    ...     execute([original])
+    ...     execute([original], test=True)
     ... else:
     ...     print "a:cm: Bug A\\nstatus: open -> closed\\n"
     Modified bug reports:
@@ -45,16 +45,14 @@ def execute(args):
     if len(args) == 1:
         revision = args[0]
     if len(args) > 1:
-        help()
-        raise cmdutil.UserError("Too many arguments.")
-    bd = bugdir.BugDir(from_disk=True)
+        raise cmdutil.UsageError("Too many arguments.")
+    bd = bugdir.BugDir(from_disk=True, manipulate_encodings=not test)
     if bd.rcs.versioned == False:
         print "This directory is not revision-controlled."
     else:
         old_bd = bd.duplicate_bugdir(revision)
         r,m,a = diff.diff(old_bd, bd)
-        diff.diff_report((r,m,a), bd)
-        # TODO, string return from diff report
+        print diff.diff_report((r,m,a), bd).encode(bd.encoding)
         bd.remove_duplicate_bugdir()
 
 def get_parser():
-- 
cgit