Changes in / [20:30]

Files:

• data_recovery (added)
• data_recovery/branches (added)
• data_recovery/tags (added)
• data_recovery/trunk (added)
• data_recovery/trunk/README (added)
• data_recovery/trunk/recover_log.py (added)
• data_recovery/trunk/salvage_data.py (added)
• mergebot/branches/ticket-1/mergebot/SvnOps.py (modified) (2 diffs)
• mergebot/branches/ticket-2 (deleted)
• mergebot/trunk/README.txt (modified) (1 diff)
• mergebot/trunk/mergebot/Actor.py (modified) (5 diffs)
• mergebot/trunk/mergebot/BranchActor.py (modified) (4 diffs)
• mergebot/trunk/mergebot/CheckMergeActor.py (modified) (1 diff)
• mergebot/trunk/mergebot/MergeActor.py (modified) (1 diff)
• mergebot/trunk/mergebot/RebranchActor.py (modified) (4 diffs)
• mergebot/trunk/mergebot/SvnOps.py (modified) (2 diffs)
• mergebot/trunk/setup.py (modified) (1 diff)

/mergebot/branches/ticket-1/mergebot/SvnOps.py

@@ -69 +69 @@
     skipped_regex = re.compile("Skipped.* '(.*)'", re.M)
     start_rev, end_rev = revision_range
-    pipe = os.popen("cd %s && svn merge --revision %s:%s %s . 2>>%s" % \
+    pipe = os.popen("cd %s && svn merge --non-interactive --revision %s:%s %s . 2>>%s" % \
         (workingdir, start_rev, end_rev, from_url, logfile))
     output = pipe.readlines()
@@ -79 +79 @@
             filename = skipped_regex.findall(line)[0]
             status = "C"
+        elif line.startswith('--- Merging '):
+            continue # ignore this line for now
+        elif line.startswith('Summary of conflicts:'):
+            continue # ignore this line for now
+        elif line.startswith('  Text conflicts:'):
+            continue # ignore this line for now
         else:
             assert line[4] == ' ', "Unexpected output from svn merge " \

/mergebot/trunk/README.txt

@@ -3 +3 @@
 $ svn co <url> mergebot-0.11
 $ cd mergebot-0.11
-$ ./rpm/makerpm
+$ python setup.py bdist_rpm
 $ su -c "rpm --install dist/TracMergeBot*.noarch.rpm"
 # Create the mergebot work area

/mergebot/trunk/mergebot/Actor.py

@@ +1 @@
+"""Base class for mergebot actors that do the various kinds of tasks
+"""
 import os
+from mergebot import SvnOps
 
 class Actor(object):
+    """Base class for mergebot actors"""
     def __init__(self, work_dir, repo_url, repo_dir, ticket, component,
                  version, summary, requestor):
@@ -23 +27 @@
 
     def logfilename(self):
+        """Returns the absolute path of the logfile for this ticket"""
         return os.path.abspath(os.path.join(os.path.dirname(self.work_dir),
             'ticket-%s.log' % self.ticket))
 
     def public_url(self):
+        """Returns the public URL for this component"""
         return '%s/%s' % (self.repo_url, self.component)
 
@@ -35 +41 @@
 
     def local_url(self):
+        """Returns the local URL for this component"""
         return 'file://%s/%s' % (self.repo_dir, self.component)
 
@@ -48 +55 @@
 
     def version_subdir(self):
+        """Returns the subdirectory name for the version"""
         if self.version == 'trunk':
             subdir = 'trunk'
@@ -58 +66 @@
         return subdir
 
+    def check_required_directories(self):
+        """Make sure the various urls we require do exist"""
+        if not SvnOps.does_url_exist(self.local_url()):
+            return 'Component %s does not exist in the repository.' \
+                % self.component
+        if not SvnOps.does_url_exist(self.local_url() + '/branches'):
+            return 'No directory in which to create branches for ' \
+                'component %s in the repository.' % self.component
+        if not SvnOps.does_url_exist(self.baseline_local_url()):
+            return 'Version %s for component %s does not exist in the ' \
+                'repository.' % (self.version, self.component)
+        return None
+

/mergebot/trunk/mergebot/BranchActor.py

@@ -2 +2 @@
 """Module for creating new branches for tickets"""
 
-import os
 import time
 
@@ -20 +19 @@
 
         # Make sure the various urls we require do exist
-        if not SvnOps.get_branch_info(self.local_url(), logfile):
-            comment = 'Component %s does not exist in the repository.' \
-                % self.component
-            return results, comment, False
-        if not SvnOps.get_branch_info(self.local_url() + '/branches', logfile):
-            comment = 'No directory in which to create branches for component %s in the repository.' % self.component
-            return results, comment, False
-        if not SvnOps.get_branch_info(self.baseline_local_url(), logfile):
-            comment = 'Version %s for component %s does not exist in the repository.' % (self.version, self.component)
-            return results, comment, False
+        problems = self.check_required_directories()
+        if problems:
+            return results, problems, False
 
         commit_header = 'Ticket #%s: %s' % (self.ticket, self.summary)
@@ -35 +27 @@
         # Delete the branch if it already exists.  This can happen if the branch
         # was merged, but we're still working on it.
-        if SvnOps.get_branch_info(self.branch_local_url(), logfile):
+        if SvnOps.does_url_exist(self.branch_local_url()):
             # This branch already exists.
             commit_message = "\n".join([commit_header,
@@ -59 +51 @@
             comment = 'Failed to create branch.'
             return results, comment, False
+
         results['mergebotstate'] = 'branched'
         comment = '\n'.join([
             'Created branch from %s for %s.' % (self.version, self.requestor),
             '',
-            'Browse branch [source:%s/branches/ticket-%s source code] and [log:%s/branches/ticket-%s commit log].' % 
+            'Browse branch [source:%s/branches/ticket-%s source code] and ' \
+                '[log:%s/branches/ticket-%s commit log].' % 
                 (self.component, self.ticket, self.component, self.ticket),
             '',

/mergebot/trunk/mergebot/CheckMergeActor.py

@@ -28 +28 @@
 
         # Make sure the various urls we require do exist
-        if not SvnOps.get_branch_info(self.local_url(), logfile):
-            comment = 'Component %s does not exist in the repository.' \
-                % self.component
-            return results, comment, False
-        if not SvnOps.get_branch_info(self.local_url() + '/branches', logfile):
-            comment = 'No directory in which to create branches for ' \
-                'component %s in the repository.' % self.component
-            return results, comment, False
-        if not SvnOps.get_branch_info(self.baseline_local_url(), logfile):
-            comment = 'Version %s for component %s does not exist in the ' \
-                'repository.' % (self.version, self.component)
-            return results, comment, False
+        problems = self.check_required_directories()
+        if problems:
+            return results, problems, False
 
         branch_info = SvnOps.get_branch_info(self.branch_local_url(), logfile)

/mergebot/trunk/mergebot/MergeActor.py

@@ -26 +26 @@
 
         # Make sure the various urls we require do exist
-        if not SvnOps.get_branch_info(self.local_url(), logfile):
-            comment = 'Component %s does not exist in the repository.' \
-                % self.component
-            return results, comment, False
-        if not SvnOps.get_branch_info(self.local_url() + '/branches', logfile):
-            comment = 'No directory in which to create branches for component %s in the repository.' % self.component
-            return results, comment, False
-        if not SvnOps.get_branch_info(self.baseline_local_url(), logfile):
-            comment = 'Version %s for component %s does not exist in the repository.' % (self.version, self.component)
-            return results, comment, False
+        problems = self.check_required_directories()
+        if problems:
+            return results, problems, False
 
         rev_info = SvnOps.get_branch_info(self.branch_local_url(), logfile)
         if not rev_info:
-            comment = 'Branch for ticket %s does not exist in the repository.' % (self.ticket)
+            comment = 'Branch for ticket %s does not exist in the repository.' \
+                % (self.ticket)
             return results, comment, False
         startrev, endrev = rev_info

/mergebot/trunk/mergebot/RebranchActor.py

@@ -36 +36 @@
 
         # Make sure the various urls we require do exist
-        if not SvnOps.get_branch_info(self.local_url(), logfile):
-            comment = 'Component %s does not exist in the repository.' \
-                % self.component
-            return results, comment, False
-        if not SvnOps.get_branch_info(self.local_url() + '/branches', logfile):
-            comment = 'No directory in which to create branches for ' \
-                'component %s in the repository.' % self.component
-            return results, comment, False
-        if not SvnOps.get_branch_info(self.baseline_local_url(), logfile):
-            comment = 'Version %s for component %s does not exist in the ' \
-                'repository.' % (self.version, self.component)
-            return results, comment, False
+        problems = self.check_required_directories()
+        if problems:
+            return results, problems, False
 
         rev_info = SvnOps.get_branch_info(self.branch_local_url(), logfile)
@@ -97 +88 @@
                 "Rebranch internal error: Unable to recreate the branch.  %s" \
                     % (instructioncomment, )),
-            (lambda x: SvnOps.checkout(self.branch_local_url(), workingcopy, x),
-                "Rebranch internal error: Unable to get working copy.  %s" % \
-                    (instructioncomment, )),
         )
         for cmd, error_comment in commanderrors:
@@ -108 +96 @@
                 results['mergebotstate'] = 'rebranchfailed'
                 return results, error_comment, False
+
+        # Check to see if there have been no commits on the branch.  If there
+        # have been no commits, we know we don't need to merge anything.
+        if startrev == endrev:
+            ticket_message = "\n".join([
+                "Rebranched from %s for %s." % (self.version,
+                                                self.requestor),
+                "There were no changes to commit to the branch since there "
+                    "were no commits on the branch.",
+                "You will need to update your working copy.",
+            ])
+            results['mergebotstate'] = 'branched'
+            return results, ticket_message, True
+
+        retval = SvnOps.checkout(self.branch_local_url(), workingcopy, logfile)
+        if retval:
+            error_comment = \
+                "Rebranch internal error: Unable to get working copy.  " + \
+                instructioncomment
+            if os.path.exists(workingcopy):
+                shutil.rmtree(workingcopy)
+            results['mergebotstate'] = 'rebranchfailed'
+            return results, error_comment, False
 
         # On success, we're in the same state as if we had just branched.
@@ -135 +146 @@
                     "commit your work to the branch.",
             ]) 
+            success = False # the rebranch failed because there were conflicts
         else: # No conflicts, do the commit.
             mergemessage = "\n".join([

/mergebot/trunk/mergebot/SvnOps.py

@@ -8 +8 @@
 import time
 import re
+import subprocess
 
 def shell_quote(string):
@@ -24 +25 @@
     """Given a log entry split out of svn log, return its revision number"""
     return int(logentry.split()[0][1:])
+
+def does_url_exist_14(url):
+    """Given a subversion url return true if it exists, false otherwise."""
+    return not subprocess.call(['svn', 'log', '--limit=1', '--non-interactive',
+                                url],
+                    stdout=open('/dev/null', 'w'),
+                    stderr=open('/dev/null', 'w'))
+
+def does_url_exist_15(url):
+    """Given a subversion url return true if it exists, false otherwise."""
+    return not subprocess.call(['svn', 'ls', '--depth', 'empty',
+                                '--non-interactive', url],
+                    stdout=open('/dev/null', 'w'),
+                    stderr=open('/dev/null', 'w'))
+
+does_url_exist=does_url_exist_14 # default to most compatible form for now
 
 def get_branch_info(url, logfile):

/mergebot/trunk/setup.py

@@ -5 +5 @@
 setup(
     name = "TracMergeBot",
-    version = "0.11",
+    version = "0.11.1",
     author = "Eli Carter",
     author_email = "eli.carter@retracile.net",