rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added getGitRevision function to get current git revision.

This commit is contained in:
Nick Bolton 2014-10-20 17:46:11 +01:00
parent 685f53c7fc
commit 0f926658dc
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ext/toolchain/commands1.py
View File

@ -941,6 +941,24 @@ class InternalCommands:
print self.find_revision() print self.find_revision()
def find_revision(self): def find_revision(self):
return self.getGitRevision()
def getGitRevision(self):
if sys.version_info < (2, 4):
raise Exception("Python 2.4 or greater required.")
else:
p = subprocess.Popen(
["git", "log", "--pretty=format:%h", "-n", "1"],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = p.communicate()
if p.returncode != 0:
raise Exception('Could not get revision - git info failed with code: ' + str(p.returncode))
return stdout
def find_revision_svn(self):
if sys.version_info < (2, 4): if sys.version_info < (2, 4):
stdout = commands.getoutput('svn info') stdout = commands.getoutput('svn info')
else: else:
@ -1403,7 +1421,7 @@ class InternalCommands:
def dist_name_rev(self, type): def dist_name_rev(self, type):
# find the version number (we're puting the rev in after this) # find the version number (we're puting the rev in after this)
pattern = '(.*\d+\.\d+\.\d+)(.*)' pattern = '(.*\d+\.\d+\.\d+)(.*)'
replace = '\g<1>-r' + self.find_revision() + '\g<2>' replace = '\g<1>-' + self.find_revision() + '\g<2>'
return re.sub(pattern, replace, self.dist_name(type)) return re.sub(pattern, replace, self.dist_name(type))
def dist_usage(self): def dist_usage(self):