Noissue - Avoid "detached head" when using Git branches

ensure_dependencies.py

 #!/usr/bin/env python
 # coding: utf-8
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import sys
 import os
 import posixpath
@@ skipping 48 matching lines @@
       command.extend(["--rev", rev])
 
     # Ignore stderr output and return code here: if revision lookup failed we
     # should simply return an empty string.
     result = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0]
     return result.strip()
 
   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):
 
     if not self.istype(target):
 
       config_path = os.path.join(repo, ".hg", "hgrc")
       ignore_path = os.path.abspath(os.path.join(repo, ".hg", "dependencies"))
 
       config = RawConfigParser()
@@ skipping 35 matching lines @@
     for match in re.finditer(r"^\s*(origin/(\S+))$", remotes, re.M):
       remote, local = match.groups()
       with open(os.devnull, "wb") as devnull:
         if subprocess.call(["git", "branch", "--track", local, remote],
                            cwd=repo, stdout=devnull, stderr=devnull) == 0:
           newly_tracked = True
     # Finally fetch any newly tracked remote branches
     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):
     module = os.path.sep + os.path.relpath(target, repo)
     exclude_file = os.path.join(repo, ".git", "info", "exclude")
     _ensure_line_exists(exclude_file, module)
 
   def postprocess_url(self, url):
     # Handle alternative syntax of SSH URLS
     if "@" in url and ":" in url and not urlparse.urlsplit(url).scheme:
@@ skipping 137 matching lines @@
       return
 
     if not resolved_revision:
       logging.info("Revision %s is unknown, downloading remote changes" % revision)
       repo_types[type].pull(target)
       resolved_revision = repo_types[type].get_revision_id(target, revision)
       if not resolved_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)
   if config is None:
     if level == 0:
       logging.warning("No dependencies file in directory %s, nothing to do...\n%s" % (repodir, USAGE))
     return
   if level >= 10:
     logging.warning("Too much subrepository nesting, ignoring %s" % repo)
     return
@@ skipping 68 matching lines @@
   args = parser.parse_args()
 
   if args.quiet:
     logging.disable(logging.INFO)
 
   repos = args.repos
   if not len(repos):
     repos = [os.path.dirname(__file__)]
   for repo in repos:
     resolve_deps(repo)