Merge pull request #1689 from jaredgrubb/git-inline-fetch-eight

Git._fetch: move to defer.inlineCallbacks
buildbot · May 25, 2015 · f4a7f59 · f4a7f59
2 parents 8df4ed3 + 383eecf
commit f4a7f59
Showing 1 changed file with 12 additions and 19 deletions.
diff --git a/master/buildbot/steps/source/git.py b/master/buildbot/steps/source/git.py
@@ -370,6 +370,7 @@ def evaluateCommand(cmd):
         d.addCallback(lambda _: evaluateCommand(cmd))
         return d
 
+    @defer.inlineCallbacks
     def _fetch(self, _):
         command = ['fetch', '-t', self.repourl, self.branch]
         # If the 'progress' option is set, tell git fetch to output
@@ -379,29 +380,21 @@ def _fetch(self, _):
         if self.prog:
             command.append('--progress')
 
-        d = self._dovccmd(command)
+        yield self._dovccmd(command)
 
-        def checkout(_):
-            if self.revision:
-                rev = self.revision
-            else:
-                rev = 'FETCH_HEAD'
-            command = ['reset', '--hard', rev, '--']
-            abandonOnFailure = not self.retryFetch and not self.clobberOnFailure
-            return self._dovccmd(command, abandonOnFailure)
-        d.addCallback(checkout)
+        if self.revision:
+            rev = self.revision
+        else:
+            rev = 'FETCH_HEAD'
+        command = ['reset', '--hard', rev, '--']
+        abandonOnFailure = not self.retryFetch and not self.clobberOnFailure
+        res = yield self._dovccmd(command, abandonOnFailure)
 
-        def renameBranch(res):
-            if res != RC_SUCCESS:
-                return res
-            d = self._dovccmd(['branch', '-M', self.branch], abandonOnFailure=False)
+        if res == RC_SUCCESS and self.branch != 'HEAD':
             # Ignore errors
-            d.addCallback(lambda _: res)
-            return d
+            yield self._dovccmd(['branch', '-M', self.branch], abandonOnFailure=False)
 
-        if self.branch != 'HEAD':
-            d.addCallback(renameBranch)
-        return d
+        defer.returnValue(res)
 
     @defer.inlineCallbacks
     def _fetchOrFallback(self, _=None):