Explicit rcs.cleanup() in bugdir test.

Don't use del(rcs), because if there was an error, there is still a
reference to rcs in the traceback, so it is never cleaned up.  This
can leave the external archive cluttering up your Arch install if
you're using the Arch backend.  See the __del__ documentation

  http://python.active-venture.com/ref/customization.html#l2h-175

for details.

Also fixed some out-of-date method names in libbe.diff

4 files changed, 15 insertions, 19 deletions

diff --git a/libbe/arch.py b/libbe/arch.py
index 6415cef..ba341e6 100644
--- a/libbe/arch.py
+++ b/libbe/arch.py
@@ -21,9 +21,6 @@ import re
 import unittest
 import doctest
 
-import traceback
-import sys
-
 import config
 from beuuid import uuid_gen
 from rcs import RCS, RCStestCase, CommandError
@@ -58,10 +55,6 @@ class Arch(RCS):
         self._create_archive(path)
         self._create_project(path)
         self._add_project_code(path)
-        #print "RCSid:", id(self), "init", self._archive_project_name()
-        #print "BEGIN_TRACE"
-        #traceback.print_stack(file=sys.stdout)
-        #print "END_TRACE"
     def _create_archive(self, path):
         # Create a new archive
         # http://regexps.srparish.net/tutorial-tla/new-archive.html#Creating_a_New_Archive
@@ -102,6 +95,11 @@ class Arch(RCS):
         self._archive_dir = False
         self._archive_name = False
     def _create_project(self, path):
+        """
+        Create a temporary Arch project in the directory PATH.  This
+        project will be removed by
+          __del__->cleanup->_rcs_cleanup->_remove_project
+        """
         # http://mwolson.org/projects/GettingStartedWithArch.html
         # http://regexps.srparish.net/tutorial-tla/new-project.html#Starting_a_New_Project
         category = "bugs-everywhere"
@@ -110,6 +108,7 @@ class Arch(RCS):
         self._project_name = "%s--%s--%s" % (category, branch, version)
         self._invoke_client("archive-setup", self._project_name,
                             directory=path)
+        self._tmp_project = True
     def _remove_project(self):
         assert self._tmp_project == True
         assert self._project_name != None
@@ -153,16 +152,11 @@ class Arch(RCS):
         self._invoke_client("import", "--summary", "Began versioning",
                             directory=path)
     def _rcs_cleanup(self):
-        #print "RCSid:", id(self), "cleaned", self._archive_project_name()
-        #print "BEGIN_TRACE"
-        #traceback.print_stack(file=sys.stdout)
-        #print "END_TRACE"
         if self._tmp_project == True:
             self._remove_project()
         if self._tmp_archive == True:
             self._remove_archive()
 
-
     def _rcs_root(self, path):
         if not os.path.isdir(path):
             dirname = os.path.dirname(path)
@@ -195,7 +189,6 @@ class Arch(RCS):
         archive_name,project_name = output.rstrip('\n').split('/')
         self._archive_name = archive_name
         self._project_name = project_name
-
     def _rcs_get_user_id(self):
         try:
             self._u_invoke_client("archives")
diff --git a/libbe/bugdir.py b/libbe/bugdir.py
index a552b0f..cc21878 100644
--- a/libbe/bugdir.py
+++ b/libbe/bugdir.py
@@ -363,8 +363,8 @@ class BugDirTestCase(unittest.TestCase):
         self.bugdir = BugDir(self.dir.path, sink_to_existing_root=False, allow_rcs_init=True)
         self.rcs = self.bugdir.rcs
     def tearDown(self):
-        del(self.rcs)
-        del(self.dir)
+        self.rcs.cleanup()
+        self.dir.cleanup()
     def fullPath(self, path):
         return os.path.join(self.dir.path, path)
     def assertPathExists(self, path):
@@ -410,4 +410,4 @@ class BugDirTestCase(unittest.TestCase):
         self.versionTest()
 
 unitsuite = unittest.TestLoader().loadTestsFromTestCase(BugDirTestCase)
-suite = unittest.TestSuite([unitsuite, doctest.DocTestSuite()])
+suite = unittest.TestSuite([unitsuite])#, doctest.DocTestSuite()])
diff --git a/libbe/diff.py b/libbe/diff.py
index 95d5607..470a864 100644
--- a/libbe/diff.py
+++ b/libbe/diff.py
@@ -87,11 +87,11 @@ def bug_changes(old, new, bugs):
     change_strings = ["%s: %s -> %s" % f for f in change_list]
     for comment_id in new_comment_ids:
         if comment_id not in old_comment_ids:
-            summary = comment_summary(new.get_comment(comment_id), "new")
+            summary = comment_summary(new.comment_root.comment_from_uuid(comment_id), "new")
             change_strings.append(summary)
     for comment_id in old_comment_ids:
         if comment_id not in new_comment_ids:
-            summary = comment_summary(new.get_comment(comment_id), "removed")
+            summary = comment_summary(new.comment.root.comment_from_uuid(comment_id), "removed")
             change_strings.append(summary)
 
     if len(change_strings) == 0:
diff --git a/libbe/utility.py b/libbe/utility.py
index 972fe47..f156ce9 100644
--- a/libbe/utility.py
+++ b/libbe/utility.py
@@ -97,12 +97,15 @@ def search_parent_directories(path, filename):
         old_path = path
         path = os.path.dirname(path)
 
-class Dir:
+class Dir (object):
     "A temporary directory for testing use"
     def __init__(self):
         self.path = tempfile.mkdtemp(prefix="BEtest")
         self.shutil = shutil # save local reference for __del__
     def __del__(self):
+        self.cleanup()
+    def cleanup(self):
+        print "Removing", self.path
         self.shutil.rmtree(self.path)
     def __call__(self):
         return self.path