Commit 87e7e385 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

BB 41603: Customize the creation of MOZ_SOURCE_URL 

MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and
MOZ_SOURCE_CHANGESET.
But the code takes for granted that it refers to a Hg instance, so it
combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`.
With this commit, we change this logic to combine them to create a URL
that is valid for GitLab.
$MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag.
If that is needed, we could use /-/tree/, instead of /-/commit/.
parent 067d9013

build/variables.py

+1 −2
Original line number Diff line number Diff line
@@ -107,8 +107,7 @@ def source_repo_header(output): 
        output.write("#define MOZ_SOURCE_STAMP %s\n" % changeset)



    if repo and buildconfig.substs.get("MOZ_INCLUDE_SOURCE_INFO"):

        rev_path = "/rev/" if "hg.mozilla.org" in repo else "/commit/"

        source = f"{repo}{rev_path}{changeset}"

        source = "%s/-/commit/%s" % (repo, changeset)

        output.write("#define MOZ_SOURCE_REPO %s\n" % repo)

        output.write("#define MOZ_SOURCE_URL %s\n" % source)