Ticket #277: buildbot-bug277.patch

buildbot/slave/commands.py

@@ -2204 +2204 @@
-    def setup(self, args):
-        SourceBase.setup(self, args)
-        self.vcexe = getCommand("hg")
-        self.repourl = args['repourl']
-        self.sourcedata = "%s\n" % self.repourl
-        self.stdout = ""
-        self.stderr = ""
-
-    def sourcedirIsUpdateable(self):
-        if os.path.exists(os.path.join(self.builder.basedir,
-                                       self.srcdir, ".buildbot-patched")):
-            return False
-        # like Darcs, to check out a specific (old) revision, we have to do a
-        # full checkout. TODO: I think 'hg pull' plus 'hg update' might work
-        if self.revision:
-            return False
-        return os.path.isdir(os.path.join(self.builder.basedir,
-                                          self.srcdir, ".hg"))
-
-    def doVCUpdate(self):
-        d = os.path.join(self.builder.basedir, self.srcdir)
-
-
-
+
-        c = ShellCommand(self.builder, command, d,
-                         sendRC=False, timeout=self.timeout,
-                         keepStdout=True)
-        self.command = c
-        d = c.start()
-        d.addCallback(self._handleEmptyUpdate)
-        return d
-
-    def _handleEmptyUpdate(self, res):
+        if res == 0:
+            return self._doUpdate()
+        
-        if type(res) is int and res == 1:
-            if self.command.stdout.find("no changes found") != -1:
-                # 'hg pull', when it doesn't have anything to do, exits with
-                # rc=1, and there appears to be no way to shut this off. It
-                # emits a distinctive message to stdout, though. So catch
-                # this and pretend that it completed successfully.
-0
+self._doUpdate()
-        return res
-
+    def _doUpdate(self):
+        dir = os.path.join(self.builder.basedir, self.srcdir)
+        # When cloning a tree without a specified revision, you get the tip
+        # of the default branch. Do the same thing when updating without
+        # a specified revision.
+        if self.args['revision']:
+            rev = self.args['revision']
+        else:
+            rev = 'default'
+        command = [self.vcexe, 'update', '-C', '--rev', rev]
+        c = ShellCommand(self.builder, command, dir,
+                         sendRC=False, timeout=self.timeout,
+                         keepStdout=True)
+        return c.start()
+
-    def doVCFull(self):
-        newdir = os.path.join(self.builder.basedir, self.srcdir)
-        command = [self.vcexe, 'clone']
-        if self.args['revision']:
-            command.extend(['--rev', self.args['revision']])
-        command.extend([self.repourl, newdir])
-        c = ShellCommand(self.builder, command, self.builder.basedir,
-                         sendRC=False, keepStdout=True, keepStderr=True,
-                         timeout=self.timeout)
-        self.command = c
-        d = c.start()
-        d.addCallback(self._maybeFallback, c)