Issue 3194 - Allow multiple sources for a dependency

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 16 matching lines @@
   # File to update this script from (optional)
   _self = buildtools/ensure_dependencies.py
   # Clone elemhidehelper repository into extensions/elemhidehelper directory at
   # tag "1.2".
   extensions/elemhidehelper = elemhidehelper 1.2
   # Clone buildtools repository into buildtools directory at VCS-specific
   # revision IDs.
   buildtools = buildtools hg:016d16f7137b git:f3f8692f82e5
   # Clone the adblockplus repository into adblockplus directory, overwriting the
   # usual source URL for Git repository and specifying VCS specific revision IDs.
-  adblockplus = adblockplus hg:893426c6a6ab git:git@github.com:kzar/adblockplus.git@b2ffd52b
+  adblockplus = adblockplus hg:893426c6a6ab git:git@github.com:user/adblockplus.git@b2ffd52b
   # Clone the adblockpluschrome repository into the adblockpluschrome directory,
   # from a specific Git repository, specifying the revision ID.
-  adblockpluschrome = git:git@github.com:kzar/adblockpluschrome.git@1fad3a7

[Wladimir Palant, 2015/10/16 10:28:45]

Nit: I don't think your username belongs in the examples here - it should be
something generic like gituser.

[kzar, 2015/10/16 10:44:52]

Done.

+  adblockpluschrome = git:git@github.com:user/adblockpluschrome.git@1fad3a7
 """
 
 SKIP_DEPENDENCY_UPDATES = os.environ.get(
   "SKIP_DEPENDENCY_UPDATES", ""
 ).lower() not in ("", "0", "false")
 
 class Mercurial():
   def istype(self, repodir):
     return os.path.exists(os.path.join(repodir, ".hg"))
 
@@ skipping 96 matching lines @@
   "(.+)$"
 )
 
 # [url@]rev
 source_regexp = re.compile(
   "^(?:(.*)@)?"
   "(.+)$"
 )
 
 def merge_seqs(seq1, seq2):
-  """Return a tuple of any truthy values from the suplied sequences
-
-  (None, 2), (1,)      => (1, 2)
-  None, (1, 2)         => (1, 2)
-  (1, 2), (3, 4)       => (3, 4)
+  """Return a list of any truthy values from the suplied sequences
+
+  (None, 2), (1,)      => [1, 2]
+  None, (1, 2)         => [1, 2]
+  (1, 2), (3, 4)       => [3, 4]
   """
-  return tuple(map(lambda item1, item2: item2 or item1, seq1 or (), seq2 or ()))

[Sebastian Noack, 2015/10/16 10:24:49]

Nit: Is coercing to a tuple really necessary? Won't  list as returned by map do
as well?

[kzar, 2015/10/16 10:44:52]

You're right, a list will do. (I figured a tuple would be better as we're not
planning to mutate it, but on the other hand it's kind of pointless to coerce a
list that's already suitable for our needs.)
Done.

+  return map(lambda item1, item2: item2 or item1, seq1 or (), seq2 or ())
 
 def parse_spec(path, line):
   if "=" not in line:
     logging.warning("Invalid line in file %s: %s" % (path, line))
     return None, None
 
   key, value = line.split("=", 1)
   key = key.strip()
   items = value.split()
   if not len(items):
@@ skipping 188 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)