Strip trailing slashes from repository urls before passing them to hgtool.py (in client.py)

RESOLVED FIXED in Thunderbird 14.0

Status

MailNews Core
Build Config
RESOLVED FIXED
5 years ago
5 years ago

People

(Reporter: standard8, Assigned: standard8)

Tracking

unspecified
Thunderbird 14.0
Bug Flags:
in-testsuite -

Thunderbird Tracking Flags

(thunderbird13 fixed, thunderbird-esr1014+ fixed)

Details

Attachments

(1 attachment)

(Assignee)

Description

5 years ago
Created attachment 617686 [details] [diff] [review]
The fix

In running the build automation, I've just picked up a minor issue.

Firefox is using http://hg.mozilla.org/mozilla-central, whereas client.py for Thunderbird is coming out with http://hg.mozilla.org/mozilla-central/

hg share detects this and says:

hg path isn't correct (http://hg.mozilla.org/mozilla-central should be http://hg.mozilla.org/mozilla-central/); clobbering

That's not so good as it means whenever a builder swaps between Thunderbird & Firefox it we'll clobber the hg share directory.

The easiest way to fix this seems to be to strip the trailing slash from the url before passing it to hgtool. Hence we'll match the rest of the automation.

I've pushed the attached patch to try server to verify the correct stripping before I push this:

http://hg.mozilla.org/try-comm-central/rev/1539c6c16bb4
Attachment #617686 - Flags: review?(bugspam.Callek)
(Assignee)

Updated

5 years ago
Blocks: 698843
Comment on attachment 617686 [details] [diff] [review]
The fix

># HG changeset patch
># Parent c671975adf5f1d83b0c77cebb5ce42fc44f5ea14
># User Mark Banner <bugzilla@standard8.plus.com>
>diff --git a/client.py b/client.py
>         if repository is not None:
>-            cmd.append(repository)
>+            cmd.append(repo)
>         check_call_noisy(cmd, retryMax=options.retries)

Nit: |if repo is not None:| instead
Attachment #617686 - Flags: review?(bugspam.Callek) → review+
(Assignee)

Comment 2

5 years ago
Somehow the try server push did an empty patch, no idea how that happened. However, I verified locally with a simple python file:

import sys
for arg in sys.args:
  print arg

and passing that as an option to client.py via --hgtool
(Assignee)

Comment 3

5 years ago
Comment on attachment 617686 [details] [diff] [review]
The fix

[Triage Comment]
We want this on aurora as well so that it also gets onto beta and avoids taking unnecessary resources swapping between repos.
Attachment #617686 - Flags: approval-comm-aurora+
(Assignee)

Comment 4

5 years ago
Checked in:

https://hg.mozilla.org/comm-central/rev/9b83555adeb2
https://hg.mozilla.org/releases/comm-aurora/rev/715e865456c2
Status: NEW → RESOLVED
Last Resolved: 5 years ago
status-thunderbird13: --- → fixed
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 14.0
(Assignee)

Updated

5 years ago
Flags: in-testsuite-
(Assignee)

Comment 5

5 years ago
Unfortunately also needed to land a bustage fix, but this also simplifies the logic:

https://hg.mozilla.org/comm-central/rev/fbc7135f80a7
https://hg.mozilla.org/releases/comm-aurora/rev/8a041705c46a
(Assignee)

Comment 6

5 years ago
We also want this on esr for the next release, so that we're not unnecessarily forcing shares to be re-cloned (and hence wasting time during build and also during release cycles).
tracking-thunderbird-esr10: --- → 14+

Updated

5 years ago
Duplicate of this bug: 760385

Updated

5 years ago
status-thunderbird14: --- → fixed
Target Milestone: Thunderbird 14.0 → Thunderbird 15.0
(Assignee)

Comment 8

5 years ago
Callek: This landed before the last merge (a few changesets, you can see by following the child), and so the TM of TB 14 was correct.
status-thunderbird14: fixed → ---
Target Milestone: Thunderbird 15.0 → Thunderbird 14.0
(Assignee)

Comment 9

5 years ago
Comment on attachment 617686 [details] [diff] [review]
The fix

[Triage Comment]
This has been on trunk for a while now and we want it for ESR as well.
Attachment #617686 - Flags: approval-comm-esr10+
(In reply to Mark Banner (:standard8) from comment #9)
> Comment on attachment 617686 [details] [diff] [review]
> The fix
> 
> [Triage Comment]
> This has been on trunk for a while now and we want it for ESR as well.

Did it land on ESR ?
(Assignee)

Comment 11

5 years ago
Thanks for the reminder, yes it did:

http://hg.mozilla.org/releases/comm-esr10/rev/32f6a0d3bc6c
status-thunderbird-esr10: --- → fixed
You need to log in before you can comment on or make changes to this bug.