Issue 4584 - Ignore Mercurial dependencies explicitly

ensure_dependencies.py

 #!/usr/bin/env python
 
 # 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
 import re
@@ skipping 52 matching lines @@
         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, revname):
         subprocess.check_call(['hg', 'update', '--repository', repo, '--quiet', '--check', '--rev', rev])
 
     def ignore(self, target, repo):
+        config_path = os.path.join(repo, '.hg', 'hgrc')
+        ignore_path = os.path.join(repo, '.hg', 'dependencies')
 
-        if not self.istype(target):
+        config = RawConfigParser()
+        config.read(config_path)
 
-            config_path = os.path.join(repo, '.hg', 'hgrc')
-            ignore_path = os.path.abspath(os.path.join(repo, '.hg', 'dependencies'))
+        if not config.has_section('ui'):
+            config.add_section('ui')
 
-            config = RawConfigParser()
-            config.read(config_path)
+        config.set('ui', 'ignore.dependencies', ignore_path)
+        with open(config_path, 'w') as stream:
+            config.write(stream)
 
-            if not config.has_section('ui'):
-                config.add_section('ui')
-
-            config.set('ui', 'ignore.dependencies', ignore_path)
-            with open(config_path, 'w') as stream:
-                config.write(stream)
-
-            module = os.path.relpath(target, repo)
-            _ensure_line_exists(ignore_path, module)
+        module = os.path.relpath(target, repo)
+        _ensure_line_exists(ignore_path, module)
 
     def postprocess_url(self, url):
         return url
 
 
 class Git():
     def istype(self, repodir):
         return os.path.exists(os.path.join(repodir, '.git'))
 
     def clone(self, source, target):
@@ skipping 272 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)