mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 14:08:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

update: Ensure that a revision is used when updating a detached repo

Browse source 
For the  case it was not guaranteed
This commit is contained in:
Thibault Saunier 2018-11-05 09:43:50 -03:00
parent 52c0086c5a
commit 57f8844958
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
git-update
View file

@ -33,6 +33,18 @@ def manifest_get_commits(manifest):
return res return res
def ensure_revision_if_necessary(repo_dir, revision):
"""
Makes sure that @revision is set if the current repo is detached.
"""
if not revision:
ret = git('-C', repo_dir, 'rev-parse', '--symbolic-full-name', 'HEAD')
if ret.strip() == 'HEAD':
revision = git('-C', repo_dir, 'rev-parse', 'HEAD').strip()
return revision
def update_subprojects(repos_commits, no_interaction=False): def update_subprojects(repos_commits, no_interaction=False):
subprojects_dir = os.path.join(SCRIPTDIR, "subprojects") subprojects_dir = os.path.join(SCRIPTDIR, "subprojects")
for repo_name in os.listdir(subprojects_dir): for repo_name in os.listdir(subprojects_dir):
@ -41,13 +53,6 @@ def update_subprojects(repos_commits, no_interaction=False):
continue continue
revision, args = repos_commits.get(repo_name, [None, []]) revision, args = repos_commits.get(repo_name, [None, []])
if not revision:
# If we're on a detached head because the revision= value in the
# wrap file is a commit, don't try to git pull --rebase because
# that will always fail.
ret = git('-C', repo_dir, 'rev-parse', '--symbolic-full-name', 'HEAD')
if ret.strip() == 'HEAD':
revision = git('-C', repo_dir, 'rev-parse', 'HEAD').strip()
if not update_repo(repo_name, repo_dir, revision, no_interaction, args): if not update_repo(repo_name, repo_dir, revision, no_interaction, args):
return False return False
@ -55,7 +60,7 @@ def update_subprojects(repos_commits, no_interaction=False):
def update_repo(repo_name, repo_dir, revision, no_interaction, fetch_args=[], recurse_i=0): def update_repo(repo_name, repo_dir, revision, no_interaction, fetch_args=[], recurse_i=0):
print("Updating %s..." % repo_name) revision = ensure_revision_if_necessary(repo_dir, revision)
git("config", "rebase.autoStash", "true", repository_path=repo_dir) git("config", "rebase.autoStash", "true", repository_path=repo_dir)
try: try:
if revision: if revision: