"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "buildbot/steps/source/git.py" between
buildbot-3.0.2.tar.gz and buildbot-3.1.0.tar.gz

About: Buildbot is a continuous integration testing framework (Python-based). It supports also automation of complex build systems, application deployment, and management of sophisticated software-release processes.

git.py  (buildbot-3.0.2):git.py  (buildbot-3.1.0)
skipping to change at line 332 skipping to change at line 332
command.append('--progress') command.append('--progress')
else: else:
log.msg("Git versions < 1.7.2 don't support progress") log.msg("Git versions < 1.7.2 don't support progress")
yield self._dovccmd(command) yield self._dovccmd(command)
if self.revision: if self.revision:
rev = self.revision rev = self.revision
else: else:
rev = 'FETCH_HEAD' rev = 'FETCH_HEAD'
command = ['reset', '--hard', rev, '--'] command = ['checkout', '-f', rev]
abandonOnFailure = not self.retryFetch and not self.clobberOnFailure abandonOnFailure = not self.retryFetch and not self.clobberOnFailure
res = yield self._dovccmd(command, abandonOnFailure) res = yield self._dovccmd(command, abandonOnFailure)
# Rename the branch if needed. # Rename the branch if needed.
if res == RC_SUCCESS and self.branch != 'HEAD': if res == RC_SUCCESS and self.branch != 'HEAD':
# Ignore errors # Ignore errors
yield self._dovccmd(['checkout', '-B', self.branch], abandonOnFailur e=False) yield self._dovccmd(['checkout', '-B', self.branch], abandonOnFailur e=False)
return res return res
skipping to change at line 424 skipping to change at line 424
def _fullClone(self, shallowClone=False): def _fullClone(self, shallowClone=False):
"""Perform full clone and checkout to the revision if specified """Perform full clone and checkout to the revision if specified
In the case of shallow clones if any of the step fail abort whole bui ld step. In the case of shallow clones if any of the step fail abort whole bui ld step.
""" """
res = yield self._clone(shallowClone) res = yield self._clone(shallowClone)
if res != RC_SUCCESS: if res != RC_SUCCESS:
return res return res
# If revision specified checkout that revision # If revision specified checkout that revision
if self.revision: if self.revision:
res = yield self._dovccmd(['reset', '--hard', res = yield self._dovccmd(['checkout', '-f', self.revision], shallow
self.revision, '--'], Clone)
shallowClone)
# init and update submodules, recursively. If there's not recursion # init and update submodules, recursively. If there's not recursion
# it will not do it. # it will not do it.
if self.submodules: if self.submodules:
cmdArgs = ["submodule", "update", "--init", "--recursive"] cmdArgs = ["submodule", "update", "--init", "--recursive"]
if self.remoteSubmodules: if self.remoteSubmodules:
cmdArgs.append("--remote") cmdArgs.append("--remote")
res = yield self._dovccmd(cmdArgs, shallowClone) res = yield self._dovccmd(cmdArgs, shallowClone)
return res return res
 End of changes. 2 change blocks. 
4 lines changed or deleted 4 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)