bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix identification of SVN revision after picking up incremental changes in the remote CEF Git repository. 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1802 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2014-08-08 12:40:16 +00:00
parent 5587ccbd2d
commit 828d2f68b2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/git_util.py
View File

@ -9,7 +9,7 @@ def is_checkout(path):
""" Returns true if the path represents a git checkout. """ """ Returns true if the path represents a git checkout. """
return os.path.exists(os.path.join(path, '.git')) return os.path.exists(os.path.join(path, '.git'))
def get_hash(path = '.', branch = 'master'): def get_hash(path = '.', branch = 'HEAD'):
""" Returns the git hash for the specified branch/tag/hash. """ """ Returns the git hash for the specified branch/tag/hash. """
cmd = "git rev-parse %s" % (branch) cmd = "git rev-parse %s" % (branch)
result = exec_cmd(cmd, path) result = exec_cmd(cmd, path)
@ -25,7 +25,7 @@ def get_url(path = '.'):
return result['out'].strip() return result['out'].strip()
return 'Unknown' return 'Unknown'
def get_svn_revision(path = '.', branch = 'master'): def get_svn_revision(path = '.', branch = 'HEAD'):
""" Returns the SVN revision associated with the specified path and git """ Returns the SVN revision associated with the specified path and git
branch/tag/hash. """ branch/tag/hash. """
svn_rev = "None" svn_rev = "None"

2
tools/make_distrib.py
View File

@ -387,7 +387,7 @@ if svn.is_checkout(src_dir):
chromium_rev = chromium_info['revision'] chromium_rev = chromium_info['revision']
elif git.is_checkout(src_dir): elif git.is_checkout(src_dir):
chromium_url = git.get_url(src_dir) chromium_url = git.get_url(src_dir)
chromium_rev = git.get_hash(src_dir, 'HEAD') chromium_rev = git.get_hash(src_dir)
else: else:
raise Exception('Not a valid checkout: %s' % (src_dir)) raise Exception('Not a valid checkout: %s' % (src_dir))