maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

runtest.py: fixed checking out branch from git

Browse source 
Checking out a branch which only exists remotely requires
a bit more work. Checking out tags might also have failed
due to an unnecessary "git pull". Now "git tag" and "git branch"
are used to check what the requested revision is and do the
necessary opertions.
This commit is contained in:
Patrick Ohly 2009-10-21 14:04:59 +02:00
parent 8e6bfc24e5
commit 653c1986b9
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/runtests.py
View file

@ -369,10 +369,15 @@ class GitCheckout(Action):
def execute(self):
if os.access(self.basedir, os.F_OK):
cmd = "cd %s && git fetch %s && git checkout %s && git pull" % (self.basedir, self.url, self.revision)
cmd = "cd %s && git fetch %s" % (self.basedir, self.url)
else:
cmd = "git clone %s %s && cd %s && git checkout %s" % (self.url, self.basedir, self.basedir, self.revision)
cmd = "git clone %s %s" % (self.url, self.basedir)
context.runCommand(cmd)
context.runCommand("cd %(dir)s && "
"((git tag -l | grep -w -q %(rev)s) && git checkout %(rev)s ||"
"((git branch -l | grep -w -q %(rev)s) && git checkout %(rev)s || git checkout -b %(rev)s origin/%(rev)s) && git merge origin/%(rev)s)" %
{"dir": self.basedir,
"rev": self.revision})
os.chdir(self.basedir)
if os.access("autogen.sh", os.F_OK):
context.runCommand("%s ./autogen.sh" % (self.runner))