merged with Trevor branch

1 files changed, 0 insertions, 120 deletions

diff --git a/interfaces/email/interactive/becommands/diff.py b/interfaces/email/interactive/becommands/diff.py
deleted file mode 100644
index b6ac5b0..0000000
--- a/interfaces/email/interactive/becommands/diff.py
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright (C) 2005-2009 Aaron Bentley and Panometrics, Inc.
-#                         W. Trevor King <wking@drexel.edu>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-"""Compare bug reports with older tree"""
-from libbe import cmdutil, bugdir, diff
-import os
-__desc__ = __doc__
-
-def execute(args, manipulate_encodings=True):
-    """
-    >>> import os
-    >>> bd = bugdir.SimpleBugDir()
-    >>> bd.set_sync_with_disk(True)
-    >>> original = bd.vcs.commit("Original status")
-    >>> bug = bd.bug_from_uuid("a")
-    >>> bug.status = "closed"
-    >>> changed = bd.vcs.commit("Closed bug a")
-    >>> os.chdir(bd.root)
-    >>> if bd.vcs.versioned == True:
-    ...     execute([original], manipulate_encodings=False)
-    ... else:
-    ...     print "Modified bugs:\\n  a:cm: Bug A\\n    Changed bug settings:\\n      status: open -> closed"
-    Modified bugs:
-      a:cm: Bug A
-        Changed bug settings:
-          status: open -> closed
-    >>> if bd.vcs.versioned == True:
-    ...     execute(["--modified", original], manipulate_encodings=False)
-    ... else:
-    ...     print "a"
-    a
-    >>> if bd.vcs.versioned == False:
-    ...     execute([original], manipulate_encodings=False)
-    ... else:
-    ...     print "This directory is not revision-controlled."
-    This directory is not revision-controlled.
-    >>> bd.cleanup()
-    """
-    parser = get_parser()
-    options, args = parser.parse_args(args)
-    cmdutil.default_complete(options, args, parser)
-    if len(args) == 0:
-        revision = None
-    if len(args) == 1:
-        revision = args[0]
-    if len(args) > 1:
-        raise cmdutil.UsageError("Too many arguments.")
-    bd = bugdir.BugDir(from_disk=True,
-                       manipulate_encodings=manipulate_encodings)
-    if bd.vcs.versioned == False:
-        print "This directory is not revision-controlled."
-    else:
-        if revision == None: # get the most recent revision
-            revision = bd.vcs.revision_id(-1)
-        old_bd = bd.duplicate_bugdir(revision)
-        d = diff.Diff(old_bd, bd)
-        tree = d.report_tree()
-
-        uuids = []
-        if options.all == True:
-            options.new = options.modified = options.removed = True
-        if options.new == True:
-            uuids.extend([c.name for c in tree.child_by_path("/bugs/new")])
-        if options.modified == True:
-            uuids.extend([c.name for c in tree.child_by_path("/bugs/mod")])
-        if options.removed == True:
-            uuids.extend([c.name for c in tree.child_by_path("/bugs/rem")])
-        if (options.new or options.modified or options.removed) == True:
-            print "\n".join(uuids)
-        else :
-            rep = tree.report_string()
-            if rep != None:
-                print rep
-        bd.remove_duplicate_bugdir()
-
-def get_parser():
-    parser = cmdutil.CmdOptionParser("be diff [options] REVISION")
-    # boolean options
-    bools = (("n", "new", "Print UUIDS for new bugs"),
-             ("m", "modified", "Print UUIDS for modified bugs"),
-             ("r", "removed", "Print UUIDS for removed bugs"),
-             ("a", "all", "Print UUIDS for all changed bugs"))
-    for s in bools:
-        attr = s[1].replace('-','_')
-        short = "-%c" % s[0]
-        long = "--%s" % s[1]
-        help = s[2]
-        parser.add_option(short, long, action="store_true",
-                          default=False, dest=attr, help=help)
-    return parser
-
-longhelp="""
-Uses the VCS to compare the current tree with a previous tree, and
-prints a pretty report.  If REVISION is given, it is a specifier for
-the particular previous tree to use.  Specifiers are specific to their
-VCS.
-
-For Arch your specifier must be a fully-qualified revision name.
-
-Besides the standard summary output, you can use the options to output
-UUIDS for the different categories.  This output can be used as the
-input to 'be show' to get and understanding of the current status.
-"""
-
-def help():
-    return get_parser().help_str() + longhelp