Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

bug 692388 - mozharness MercurialVCS with HG_SHARE_BASE_DIR set compl…

…etely ignores specified revision. r=rail
  • Loading branch information...
commit 6da3fee700e0717e38f1cc0d52a463f6d8bcd767 1 parent 21cc8b4
@escapewindow escapewindow authored
View
4 configs/multi_locale/release_mozilla-beta_linux-android.json
@@ -19,6 +19,10 @@
"repo": "http://hg.mozilla.org/build/compare-locales",
"tag": "RELEASE_AUTOMATION"
}],
+ "l10n_repos": [{
+ "repo": "http://hg.mozilla.org/build/buildbot-configs",
+ "dest": "build/configs"
+ }],
"hg_l10n_base": "http://hg.mozilla.org/releases/l10n/mozilla-beta",
"required_config_vars": ["tag_override"],
"l10n_dir": "mozilla-beta",
View
4 configs/multi_locale/release_mozilla-beta_linux-maemo5-gtk.json
@@ -21,6 +21,10 @@
"repo": "http://hg.mozilla.org/build/compare-locales",
"tag": "RELEASE_AUTOMATION"
}],
+ "l10n_repos": [{
+ "repo": "http://hg.mozilla.org/build/buildbot-configs",
+ "dest": "build/configs"
+ }],
"hg_l10n_base": "http://hg.mozilla.org/releases/l10n/mozilla-beta",
"required_config_vars": ["tag_override"],
"l10n_dir": "mozilla-beta",
View
4 configs/multi_locale/release_mozilla-release_linux-android.json
@@ -19,6 +19,10 @@
"repo": "http://hg.mozilla.org/build/compare-locales",
"tag": "RELEASE_AUTOMATION"
}],
+ "l10n_repos": [{
+ "repo": "http://hg.mozilla.org/build/buildbot-configs",
+ "dest": "build/configs"
+ }],
"hg_l10n_base": "http://hg.mozilla.org/releases/l10n/mozilla-release",
"required_config_vars": ["tag_override"],
"l10n_dir": "mozilla-release",
View
4 configs/multi_locale/release_mozilla-release_linux-maemo5-gtk.json
@@ -21,6 +21,10 @@
"repo": "http://hg.mozilla.org/build/compare-locales",
"tag": "RELEASE_AUTOMATION"
}],
+ "l10n_repos": [{
+ "repo": "http://hg.mozilla.org/build/buildbot-configs",
+ "dest": "build/configs"
+ }],
"hg_l10n_base": "http://hg.mozilla.org/releases/l10n/mozilla-release",
"required_config_vars": ["tag_override"],
"l10n_dir": "mozilla-release",
View
4 configs/multi_locale/staging_release_mozilla-beta_linux-android.json
@@ -19,6 +19,10 @@
"repo": "http://hg.mozilla.org/%(user_repo_override)s/compare-locales",
"tag": "RELEASE_AUTOMATION"
}],
+ "l10n_repos": [{
+ "repo": "http://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
+ "dest": "build/configs"
+ }],
"hg_l10n_base": "http://hg.mozilla.org/%(user_repo_override)s",
"required_config_vars": ["tag_override", "user_repo_override"],
"l10n_dir": "mozilla-beta",
View
4 configs/multi_locale/staging_release_mozilla-beta_linux-maemo5-gtk.json
@@ -21,6 +21,10 @@
"repo": "http://hg.mozilla.org/%(user_repo_override)s/compare-locales",
"tag": "RELEASE_AUTOMATION"
}],
+ "l10n_repos": [{
+ "repo": "http://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
+ "dest": "build/configs"
+ }],
"hg_l10n_base": "http://hg.mozilla.org/%(user_repo_override)s",
"required_config_vars": ["tag_override", "user_repo_override"],
"l10n_dir": "mozilla-beta",
View
4 configs/multi_locale/staging_release_mozilla-release_linux-android.json
@@ -19,6 +19,10 @@
"repo": "http://hg.mozilla.org/%(user_repo_override)s/compare-locales",
"tag": "RELEASE_AUTOMATION"
}],
+ "l10n_repos": [{
+ "repo": "http://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
+ "dest": "build/configs"
+ }],
"hg_l10n_base": "http://hg.mozilla.org/%(user_repo_override)s",
"required_config_vars": ["tag_override", "user_repo_override"],
"l10n_dir": "mozilla-release",
View
4 configs/multi_locale/staging_release_mozilla-release_linux-maemo5-gtk.json
@@ -21,6 +21,10 @@
"repo": "http://hg.mozilla.org/%(user_repo_override)s/compare-locales",
"tag": "RELEASE_AUTOMATION"
}],
+ "l10n_repos": [{
+ "repo": "http://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
+ "dest": "build/configs"
+ }],
"hg_l10n_base": "http://hg.mozilla.org/%(user_repo_override)s",
"required_config_vars": ["tag_override", "user_repo_override"],
"l10n_dir": "mozilla-release",
View
13 mozharness/base/vcs/mercurial.py
@@ -389,15 +389,16 @@ def _ensure_shared_repo_and_revision(self, share_base):
self.info("Updating shared repo")
if os.path.exists(shared_repo):
try:
- self.pull(repo, shared_repo, branch=branch, revision=revision)
+ self.pull(repo, shared_repo)
except subprocess.CalledProcessError:
self.warning("Error pulling changes into %s form %s; clobbering" % (shared_repo, repo))
self.dump_exception(level='debug')
- self.clone(repo, shared_repo, branch=branch, revision=revision)
+ self.clone(repo, shared_repo)
else:
- self.clone(repo, shared_repo, branch=branch, revision=revision)
+ self.clone(repo, shared_repo)
if os.path.exists(dest):
+ self.pull(shared_repo, dest)
return self.update(dest, branch=branch, revision=revision)
else:
try:
@@ -469,14 +470,16 @@ def ensure_repo_and_revision(self):
# Non-shared
if os.path.exists(dest):
try:
- return self.pull(repo, dest, branch=branch, revision=revision)
+ self.pull(repo, dest)
+ return self.update(dest, branch=branch, revision=revision)
except subprocess.CalledProcessError:
self.warning("Error pulling changes into %s form %s; clobbering" % (dest, repo))
self.dump_exception(level='debug')
self.rmtree(dest)
elif not os.path.exists(os.path.dirname(dest)):
self.mkdir_p(os.path.dirname(dest))
- return self.clone(repo, dest, branch, revision)
+ self.clone(repo, dest)
+ return self.update(dest, branch=branch, revision=revision)
View
2  mozharness/base/vcs/vcsbase.py
@@ -98,7 +98,7 @@ def vcs_checkout_repos(self, repo_list, parent_dir=None,
for repo_dict in repo_list:
kwargs = repo_dict.copy()
if tag_override:
- kwargs['tag'] = tag_override
+ kwargs['revision'] = tag_override
self.vcs_checkout(**kwargs)
finally:
self.chdir(orig_dir)
View
12 mozharness/l10n/multi_locale_build.py
@@ -159,6 +159,18 @@ def pull_locale_source(self):
c = self.config
dirs = self.query_abs_dirs()
self.mkdir_p(dirs['abs_l10n_dir'])
+ repos = []
+ replace_dict = {}
+ # Replace %(user_repo_override)s with c['user_repo_override']
+ if c.get("user_repo_override"):
+ replace_dict['user_repo_override'] = c['user_repo_override']
+ for repo_dict in c.get('l10n_repos', []):
+ repo_dict['repo'] = repo_dict['repo'] % replace_dict
+ repos.append(repo_dict)
+ else:
+ repos = c.get("l10n_repos")
+ if repos:
+ self.vcs_checkout_repos(repos, tag_override=c.get('tag_override'))
locales = self.query_locales()
locale_repos = []
hg_l10n_base = c['hg_l10n_base']
Please sign in to comment.
Something went wrong with that request. Please try again.