Issue 2311 - Track remote Git branches when required

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 84 matching lines @@
   def get_revision_id(self, repo, rev="HEAD"):
     command = ["git", "rev-parse", "--revs-only", rev + '^{commit}']
     return subprocess.check_output(command, cwd=repo).strip()
 
   def pull(self, repo):
     # Fetch tracked branches, new tags and the list of available remote branches
     subprocess.check_call(["git", "fetch", "--quiet", "--all", "--tags"], cwd=repo)
     # Next we need to ensure all remote branches are tracked
     newly_tracked = False
     remotes = subprocess.check_output(["git", "branch", "--remotes"], cwd=repo)
-    for match in re.finditer(r"(?:^|\s)(origin/((?!HEAD(?:$|\s))\S+))", remotes):

[Wladimir Palant, 2015/05/06 14:27:41]

Is HEAD really worth excluding in the regexp? The following should be much
clearer:

  if local == 'HEAD':
    continue

[Sebastian Noack, 2015/05/06 14:31:48]

We actually had something like that before. I suggested to move the check into
the regex however. But if you think it's more clear to have it below fine with
me. Theoretically, we don't even need that check. "git branch --track" will just
fail for HEAD, and the code below handles it like it's already a tracked branch.

[kzar, 2015/05/06 14:37:31]

Yea, I guess we don't need the check at all. Done.

+    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):
@@ skipping 201 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)