Changeset 34

Timestamp:

Feb 22, 2010 5:14:43 PM (15 years ago)

Author:

retracile

Message:

Mergebot: begin refactoring svn layer, fix some errors

File:

• mergebot/trunk/mergebot/svn.py (modified) (5 diffs)

mergebot/trunk/mergebot/svn.py

@@ -10 +10 @@
 import subprocess
 
+def shell_quote(self, string):
+    """Given a string, escape the characters interpretted by the shell."""
+    for char in ["\\", "\"", "$"]:
+        string = string.replace(char, "\\%s" % (char, ))
+    return '"%s"' % (string, )
+
+
 class SvnLib(object):
     def __init__(self):
         pass
-
-    def shell_quote(self, string):
-        """Given a string, escape the characters interpretted by the shell."""
-        for char in ["\\", "\"", "$"]:
-            string = string.replace(char, "\\%s" % (char, ))
-        return '"%s"' % (string, )
 
     def logcmd(self, cmd, logfile):
@@ -59 +60 @@
         # If there have been no commits on the branch since it was created, there
         # will only be one revision listed.... but the log will split into 3 parts.
-        endrev = get_rev_from_log(logs[1])
-        startrev = get_rev_from_log(logs[-2])
+        endrev = self.get_rev_from_log(logs[1])
+        startrev = self.get_rev_from_log(logs[-2])
         return (startrev, endrev)
 
@@ -69 +70 @@
             "svn copy --username=mergebot --password=mergebot -m %s %s %s" \
             % (shell_quote(commit_message), from_url, to_url)
-        return logcmd(svncmd, logfile)
+        return self.logcmd(svncmd, logfile)
 
     def delete_branch(self, url, commit_message, logfile):
@@ -78 +79 @@
         svncmd = "svn rm --no-auth-cache --username=mergebot --password=mergebot " \
             "-m %s %s 2>>%s" % (shell_quote(commit_message), url, logfile)
-        return _svn_new_rev_command(svncmd)
+        return self._svn_new_rev_command(svncmd)
 
     def checkout(self, from_url, workingdir, logfile):
@@ -120 +121 @@
             "--password=mergebot -m %s 2>>%s" % (workingdir,
                 shell_quote(commit_message), logfile)
-        return _svn_new_rev_command(svncmd)
+        return self._svn_new_rev_command(svncmd)
 
     def _svn_new_rev_command(self, svncmd):