From acb77ccb0a334a4beb07c0ae0f72f355bf45102f Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Mon, 5 Nov 2018 09:52:41 -0300 Subject: [PATCH] update: Enhance logging about what kind of update is happening --- git-update | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/git-update b/git-update index 83d2006..6a4b46b 100755 --- a/git-update +++ b/git-update @@ -33,13 +33,16 @@ def manifest_get_commits(manifest): return res +def get_branch_name(repo_dir): + return git('-C', repo_dir, 'rev-parse', '--symbolic-full-name', 'HEAD').strip() + + 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': + if get_branch_name(repo_dir) == 'HEAD': revision = git('-C', repo_dir, 'rev-parse', 'HEAD').strip() return revision @@ -64,9 +67,11 @@ def update_repo(repo_name, repo_dir, revision, no_interaction, fetch_args=[], re git("config", "rebase.autoStash", "true", repository_path=repo_dir) try: if revision: + print("Checking out %s in %s" % (revision, repo_name)) git("fetch", *fetch_args, repository_path=repo_dir) git("checkout", revision, repository_path=repo_dir) else: + print("Updating branch %s in %s" % (get_branch_name(repo_dir), repo_name)) git("pull", "--rebase", repository_path=repo_dir) git("submodule", "update", repository_path=repo_dir) except Exception as e: -- 2.7.4