mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

git-update: Add a way for user to fix any rebasing issue interactively

Browse source
This commit is contained in:
Thibault Saunier 2016-09-29 20:25:42 -03:00
parent f802127a1e
commit 5428359c31
1 changed files with 49 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
git-update
View file

@ -58,7 +58,7 @@ def manifest_get_commits(manifest):
return res return res
def update_subprojects(manifest): def update_subprojects(manifest, no_interaction=False):
if manifest: if manifest:
repos_commits = manifest_get_commits(manifest) repos_commits = manifest_get_commits(manifest)
else: else:
@ -69,18 +69,46 @@ def update_subprojects(manifest):
repo_dir = os.path.normpath(os.path.join(SCRIPTDIR, subprojects_dir, repo_name)) repo_dir = os.path.normpath(os.path.join(SCRIPTDIR, subprojects_dir, repo_name))
if not os.path.exists(os.path.join(repo_dir, '.git')): if not os.path.exists(os.path.join(repo_dir, '.git')):
continue continue
revision = repos_commits.get(repo_name)
if not update_repo(repo_name, repo_dir, revision, no_interaction):
return False
return True
def update_repo(repo_name, repo_dir, revision, no_interaction, recurse_i=0):
print("Updating %s..." % repo_name) print("Updating %s..." % repo_name)
try: try:
revision = repos_commits.get(repo_name)
if revision: if revision:
git(["fetch"], repo_dir) git(["fetch"], repo_dir)
git(["checkout", revision], repo_dir) git(["checkout", revision], repo_dir)
else: else:
git(["pull", "--rebase"], repo_dir) git(["pull", "--rebase"], repo_dir)
except Exception as e: except Exception as e:
print("\nCould not rebase %s, please fix and try again\nerror:\n %s" % (repo_dir, e)) out = getattr(e, "output", b"").decode()
if not no_interaction:
print("====================================="
"\n%sEntering a shell in %s to fix that"
" just `exit` once done`"
"\n=====================================" % (
out, os.getcwd()))
try:
subprocess.check_call(os.environ.get("SHELL", "/bin/sh"),
cwd=repo_dir)
except:
# Result of subshell does not really matter
pass
if recurse_i < 3:
return update_repo(repo_name, repo_dir, revision, no_interaction,
recurse_i + 1)
return False return False
else:
print("\nCould not rebase %s, please fix and try again."
" Error:\n\n%s %s" % (repo_dir, out, e))
return False
commit_message = git("show", repo_dir).split("\n") commit_message = git("show", repo_dir).split("\n")
print(u" -> %s%s%s — %s" % (Colors.HEADER, commit_message[0][7:14], Colors.ENDC, print(u" -> %s%s%s — %s" % (Colors.HEADER, commit_message[0][7:14], Colors.ENDC,
@ -96,6 +124,10 @@ if __name__ == "__main__":
default=False, default=False,
action='store_true', action='store_true',
help="Do not output ansi colors.") help="Do not output ansi colors.")
parser.add_argument("--no-interaction",
default=False,
action='store_true',
help="Do not allow interaction with the user.")
parser.add_argument("--manifest", parser.add_argument("--manifest",
default=None, default=None,
help="Use a android repo manifest to sync repositories" help="Use a android repo manifest to sync repositories"
@ -104,4 +136,5 @@ if __name__ == "__main__":
if options.no_color: if options.no_color:
Colors.disable() Colors.disable()
exit(not update_subprojects(options.manifest)) exit(not update_subprojects(options.manifest,
options.no_interaction))