1192068 - Use 40 character revision in the index for l10n builds

Status: RESOLVED FIXED

(Release Engineering :: Applications: MozharnessCore, defect)

Description

[Michael Shal [:mshal]]

Bug 1175655 fixed the index for most builds, but l10n builds are different. They pull the revision from the application.ini file in the en-US build (using 'make ident' in objdir/browser/locales). The revision stored in this file is only 12 characters due to the toolkit/xre/Makefile.in using a {node|short} template in hg parent.

Comment 1

[Michael Shal [:mshal]]

Attachment: 0001-Bug-1192068-Use-long-hg-revision-for-sourcestamp-in-.patch

:jlund for mozharness changes - note I added the abspath in some mozharness tests, since it seemed to be necessary to get them to run.

:gps for the build system changes - are you aware of anything else that might rely on a 12-character SourceStamp in application.ini?

Note there are other places in tree where we use {node|short}, but I'm leery of breaking random things by replacing them all in one go.

Comment 2

[Gregory Szorc [:gps]]

Comment on attachment 8645166 [details] [diff] [review]
0001-Bug-1192068-Use-long-hg-revision-for-sourcestamp-in-.patch

Review of attachment 8645166 [details] [diff] [review]:
-----------------------------------------------------------------

::: build/Makefile.in
@@ +19,5 @@
>  DEFINES += -DAPP_BUILDID=$(APP_BUILDID)
>  
>  APP_INI_DEPS += $(DEPTH)/config/autoconf.mk
>  
> +MOZ_SOURCE_STAMP := $(firstword $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg parent --template='{node}\n' 2>/dev/null))

`hg parents` is deprecated. This should be changed to `hg log -r . -T '{node}\n'`. It seems a bit invasive to change in this patch. File a follow-up or land it later?

::: testing/mozharness/scripts/desktop_l10n.py
@@ +414,5 @@
>          Only valid after setup is run.
>         """
>          if self.revision:
>              return self.revision
> +        r = re.compile(r"^(gecko|fx)_revision ([0-9a-f]*\+?)$")

Please switch the "*" to a "+" to indicate 1 or more (instead of 0 or more).

::: testing/mozharness/scripts/mobile_l10n.py
@@ +204,5 @@
>          Only valid after setup is run.
>          """
>          if self.revision:
>              return self.revision
> +        r = re.compile(r"gecko_revision ([0-9a-f]*\+?)")

Ditto.

Comment 3

[Michael Shal [:mshal]]

(In reply to Gregory Szorc [:gps] from comment #2)
> `hg parents` is deprecated. This should be changed to `hg log -r . -T
> '{node}\n'`. It seems a bit invasive to change in this patch. File a
> follow-up or land it later?

Filed bug 1192885.

> 
> ::: testing/mozharness/scripts/desktop_l10n.py
> @@ +414,5 @@
> >          Only valid after setup is run.
> >         """
> >          if self.revision:
> >              return self.revision
> > +        r = re.compile(r"^(gecko|fx)_revision ([0-9a-f]*\+?)$")
> 
> Please switch the "*" to a "+" to indicate 1 or more (instead of 0 or more).
> 
> ::: testing/mozharness/scripts/mobile_l10n.py
> @@ +204,5 @@
> >          Only valid after setup is run.
> >          """
> >          if self.revision:
> >              return self.revision
> > +        r = re.compile(r"gecko_revision ([0-9a-f]*\+?)")
> 
> Ditto.

Good idea - I fixed these.

Comment 4

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/38f81480762d

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/38f81480762d