Noissue - Avoid "detached head" when using Git branches

ensure_dependencies.py

Index: ensure_dependencies.py
diff --git a/ensure_dependencies.py b/ensure_dependencies.py
index 2065f93d986646aa23ff94ccc82fcedceaf24d22..b24cb9d17e42c89c51ecbeec7c75e810c6750fcd 100755
--- a/ensure_dependencies.py
+++ b/ensure_dependencies.py
@@ -66,7 +66,7 @@ class Mercurial():
   def pull(self, repo):
     subprocess.check_call(["hg", "pull", "--repository", repo, "--quiet"])
 
-  def update(self, repo, rev):
+  def update(self, repo, rev, _):

[Wladimir Palant, 2015/11/10 10:53:17]

Please replace _ by revname so that the parameters are consistent.

[kzar, 2015/11/10 12:21:29]

Done.

     subprocess.check_call(["hg", "update", "--repository", repo, "--quiet", "--check", "--rev", rev])
 
   def ignore(self, target, repo):
@@ -122,7 +122,7 @@ class Git():
     if newly_tracked:
       subprocess.check_call(["git", "fetch", "--quiet", "origin"], cwd=repo)
 
-  def update(self, repo, rev):
+  def update(self, repo, _, rev):

[Wladimir Palant, 2015/11/10 10:53:17]

Please replace _ by rev and rev by revname so that the parameters are
consistent. The command below should operate on revname, this will make things
more obvious.

[kzar, 2015/11/10 12:21:29]

Done.

     subprocess.check_call(["git", "checkout", "--quiet", rev], cwd=repo)
 
   def ignore(self, target, repo):
@@ -280,7 +280,7 @@ def update_repo(target, type, revision):
         raise Exception("Failed to resolve revision %s" % revision)
 
     logging.info("Updating repository %s to revision %s" % (target, resolved_revision))
-    repo_types[type].update(target, resolved_revision)
+    repo_types[type].update(target, resolved_revision, revision)
 
 def resolve_deps(repodir, level=0, self_update=True, overrideroots=None, skipdependencies=set()):
   config = read_deps(repodir)