Another major rewrite. Now BugDir, Bug, and Comment are more distinct.

I pushed a lot of the little helper functions into the main classes,
which makes it easier for me to keep track of what's going on.  I'm
now at the point where I can run through `python test.py` with each of
the backends (by changing the search order in rcs.py
_get_matching_rcs) without any unexpected errors for each backend
(except Arch).  I can also run `test_usage.sh` without non-Arch errors
either.

However, don't consider this a stable commit yet.  The bzr backend is
*really*slow*, and the other's aren't blazingly fast either.  I think
I'm rewriting the entire database every time I save it :p.  Still, it
passes the checks. and I don't like it when zounds of changes build up.

1 files changed, 6 insertions, 105 deletions

diff --git a/libbe/cmdutil.py b/libbe/cmdutil.py
index 62a0c7c..55a7a72 100644
--- a/libbe/cmdutil.py
+++ b/libbe/cmdutil.py
@@ -14,16 +14,17 @@
 #    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-import bugdir
-import plugin
-import locale
-import os
 import optparse
+import os
+import locale
 from textwrap import TextWrapper
 from StringIO import StringIO
-import utility
 import doctest
 
+import bugdir
+import plugin
+import utility
+
 class UserError(Exception):
     def __init__(self, msg):
         Exception.__init__(self, msg)
@@ -33,40 +34,6 @@ class UserErrorWrap(UserError):
         UserError.__init__(self, str(exception))
         self.exception = exception
 
-def get_bug(spec, bug_dir=None):
-    """
-    >>> bd = bugdir.simple_bug_dir()
-    >>> bug_a = get_bug('a', bd)
-    >>> print type(bug_a)
-    <class 'libbe.bug.Bug'>
-    >>> print bug_a
-    a:om: Bug A
-    >>> print bd.get_bug('a')
-    a:om: Bug A
-    >>> bug_a == bd.get_bug('a')
-    True
-    """
-    matches = []
-    try:
-        if bug_dir is None:
-            bug_dir = bugdir.tree_root('.')
-    except bugdir.NoBugDir, e:
-        raise UserErrorWrap(e)
-    bugs = list(bug_dir.list())
-    for bug in bugs:
-        if bug.uuid.startswith(spec):
-            matches.append(bug)
-    if len(matches) > 1:
-        raise UserError("More than one bug matches %s.  Please be more"
-                        " specific." % spec)
-    if len(matches) == 1:
-        return matches[0]
-        
-    matches = []
-    if len(matches) == 0:
-        raise UserError("No bug matches %s" % spec)
-    return matches[0]
-
 def iter_commands():
     for name, module in plugin.iter_plugins("becommands"):
         yield name.replace("_", "-"), module
@@ -115,34 +82,6 @@ class UsageError(Exception):
 def raise_get_help(option, opt, value, parser):
     raise GetHelp
 
-
-def iter_comment_name(bug, unique_name):
-    """Iterate through id, comment pairs, in date order.
-    (This is a user-friendly id, not the comment uuid)
-    """
-    def key(comment):
-        return comment.time
-    for num, comment in enumerate(sorted(bug.list_comments(), key=key)):
-        yield ("%s:%d" % (unique_name, num+1), comment)
-
-
-def comment_from_name(bug, unique_name, name):
-    """Use a comment name to look up a comment"""
-    for cur_name, comment in iter_comment_name(bug, unique_name):
-        if name == cur_name:
-            return comment
-    raise KeyError(name)
-
-
-def get_bug_and_comment(identifier, bug_dir=None):
-    ids = identifier.split(':')
-    bug = get_bug(ids[0], bug_dir)
-    if len(ids) == 2:
-        comment = comment_from_name(bug, ids[0], identifier)
-    else:
-        comment = None
-    return bug, comment
-
         
 class CmdOptionParser(optparse.OptionParser):
     def __init__(self, usage):
@@ -174,44 +113,6 @@ def underlined(instring):
     return "%s\n%s" % (instring, "="*len(instring))
 
 
-def print_threaded_comments(comments, name_map, indent=""):
-    """Print a threaded display of comments"""
-    tw = TextWrapper(initial_indent = indent, subsequent_indent = indent, 
-                     width=80)
-    for comment, children in comments:
-        s = StringIO()
-        print >> s, "--------- Comment ---------"
-        print >> s, "Name: %s" % name_map[comment.uuid]
-        print >> s, "From: %s" % comment.From
-        print >> s, "Date: %s\n" % utility.time_to_str(comment.time)
-        print >> s, comment.body.rstrip('\n')
-
-        s.seek(0)
-        for line in s:
-            print tw.fill(line).rstrip('\n')
-        print_threaded_comments(children, name_map, indent=indent+"    ")
-
-
-def bug_tree(dir=None):
-    """Retrieve the bug tree specified by the user.  If no directory is
-    specified, the current working directory is used.
-
-    :param dir: The directory to search for the bug tree in.
-
-    >>> bug_tree() is not None
-    True
-    >>> bug_tree("/")
-    Traceback (most recent call last):
-    UserErrorWrap: The directory "/" has no bug directory.
-    """
-    if dir is None:
-        dir = os.getcwd()
-    try:
-        return bugdir.tree_root(dir)
-    except bugdir.NoBugDir, e:
-        raise UserErrorWrap(e)
-
-
 def _test():
     import doctest
     import sys