728801 - "MozillaHgTag" is confusing in a dual-repo world

Status: RESOLVED INCOMPLETE

(Camino Graveyard :: General, defect)

Description

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

When QAing the ML build this evening, I noticed that the way things sort in the plist leads to some confusing keys.  To wit, we have only one Hg tag (because it's the same across both repos), but it's labeled "MozillaHgTag".

In the old world, with only one repo, everything was simple: MozillaBuildID, MozillaGeckoVersion, MozillaCVSTag; "Mozilla" worked as a common prefix, and there were just 3 keys.

Now, though, things aren't as simple, and "Mozilla" is ambiguous.

As a result, this means our keys sort like this:

CaminoChangeset
CaminoRepository
[…]
MozillaBuildID
MozillaChangeset
MozillaGeckoVersion
MozillaHgTag
MozillaRepository

BuildID and GeckoVersion are properties of Gecko, although they are also "shared" across the repo boundary.  It's also pretty clear what they mean.  The tag, though, nestled there next to the repo, is much more confusing.


Some possibilities:

1) Rename the "Mozilla{Changeset|Repo}" to "GeckoFoo" or "MozillaGeckoFoo".

2) Rename "Camino{Changeset|Repo}" to "MozillaCaminoFoo" and rename "Mozilla{Changeset|Repo}" to "MozillaGeckoFoo" to keep "Mozilla" as the primary structure prefix and "Gecko" and "Camino" as secondary structure infixes; this would sort everything together and let BuildID and HgTag stand alone as children of the primary structure.  I like that, but I don't like "MozillaCamino" anything, particularly given how hard we've had to fight the wrong perception that MoCo/MoFo makes Camino and commits real resources.

3) Use a new prefix, like "Source", for source-related items: SourceHgTag, SourceCaminoRepository, SourceCaminoChangeset, Source{Mozilla|Gecko}Changeset, etc.  That's kind of awkward for the repo/changeset keys.

4) Add a new CaminoHgTag key so that the tag becomes a property of the repo rather than a general/global; that might actually be useful for bug 706391, where 2.1.x nightlies would be on a CAMINO_2_1_BRANCH; for 2.1.x releases, it'd be identical to the Gecko tag, but it would be crystal clear even if slightly redundant.

I think I'm leaning towards 4 right now, now that I'm thinking about what playground means.

Comment 1

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

FWIW, http://hg.mozilla.org/users/alqahira_ardisson.org/madhatter/rev/bf5bfee0d0de added per-repo tag/branch support to madhatter and populated a CM_HG_TAG env variable with the tag used for the Camino repo.