1388559 - Don't allow sub-repos on Firefox repositories

Status: RESOLVED FIXED

(Developer Services :: Mercurial: hg.mozilla.org, enhancement)

Description

[Gregory Szorc [:gps]]

We don't use sub-repositories for Firefox. We shouldn't allow them in the repo.

Comment 1

[Gregory Szorc [:gps]]

I audited hg.mozilla.org and the only repos with a .hgsub file anywhere in history appear to be:

services/server-full
users/romaxa_gmail.com/b2g-package
users/romaxa_gmail.com/gaia-package
users/romaxa_gmail.com/xulrunner

That first repo doesn't have .hgsub in the latest commit.

I was planning on implementing this hook on all non-user repos. I think I'll continue with that plan.

Comment 2

[Gregory Szorc [:gps]]

Attachment: hooks: don't allow subrepositories on non-user repos (bug 1388559);

For the reasons stated in the added code.

Review commit: https://reviewboard.mozilla.org/r/166336/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/166336/

Comment 3

[:glob ✱]

Comment on attachment 8895175 [details]
hooks: don't allow subrepositories on non-user repos (bug 1388559);

https://reviewboard.mozilla.org/r/166336/#review172018

::: hghooks/mozhghooks/checks.py:273
(Diff revision 1)
> +
> +Subrepositories are an advanced Mercurial feature. Subrepositories are not
> +allowed by default on non-user repositories. Attempting to push this changeset
> +to a non-user repository on this server will result in rejection.
> +
> +Please consider not using subrepositories.

it would be nice if this message provided hints towards alternatives.

::: hghooks/tests/test-prevent-subrepos.t:61
(Diff revision 1)
> +
> +We cannot create subrepos on non-user repos
> +
> +  $ hg init server
> +  $ configurehooks server
> +We need this to sub-repo push works

looks like you dropped a word there

Comment 4

[Mozilla Autoland]

We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg rebase -s 32edc8fd4ef2 -d 02675c286d0f: rebasing 5542:32edc8fd4ef2 "hooks: don't allow subrepositories on non-user repos (bug 1388559); r=glob" (tip)
merging hghooks/mozhghooks/checks.py
merging hghooks/mozhghooks/extension.py
warning: conflicts while merging hghooks/mozhghooks/checks.py! (edit, then use 'hg resolve --mark')
warning: conflicts while merging hghooks/mozhghooks/extension.py! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)

Comment 5

[Gregory Szorc [:gps]]

Comment on attachment 8895175 [details]
hooks: don't allow subrepositories on non-user repos (bug 1388559);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/166336/diff/1-2/

Comment 6

[Gregory Szorc [:gps]]

Comment on attachment 8895175 [details]
hooks: don't allow subrepositories on non-user repos (bug 1388559);

https://reviewboard.mozilla.org/r/166336/#review172018

> it would be nice if this message provided hints towards alternatives.

I'll fix this in a follow-up. Need to get this deployed.

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/28893272abf5
hooks: don't allow subrepositories on non-user repos ; r=glob