Closed Bug 758914 Opened 7 years ago Closed 7 years ago

client.py always pulls from http://hg.mozilla.org/mozilla-central/

Categories

(MailNews Core :: Build Config, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
Thunderbird 16.0

People

(Reporter: neil, Assigned: standard8)

References

Details

Attachments

(2 files, 1 obsolete file)

I have several trees that all pull from a local clone that I pull from hg.mozilla.org, however I accidentally ran client.py without pulling my local clones first. Imagine my surprise when client.py proceeded to pull my mozilla folder anyway from hg.mozilla.org, leaving me with a failed build.
Attached patch Possible patch (obsolete) — Splinter Review
This fixed things locally for me. I don't know why bug 688856 changed that code in the first place, but it seems wrong, so this patch backs that out.
Attachment #627516 - Flags: review?(gozer)
My only concern is how this interacts with hg shared stuff - if they correctly set the repo to clone from when using hgtool.py when using client.py. Probably needs a quick test.
Comment on attachment 627516 [details] [diff] [review]
Possible patch

So as I feared I just tried this locally and it would break the current use of hg share that we're using on the tinderboxes.

I think I have a possible alternative that I can propose.
Attachment #627516 - Flags: review?(gozer) → review-
Attached patch Alternative fixSplinter Review
I think this will fix it. If we've got a mozilla directory, but haven't specified the repo on the command line, then we'll fall back to using the value in .hg/hgrc.

This should work even for hg share as it stores the http://hg... repo in the mozilla/.hg/hgrc file.
Attachment #627653 - Flags: review?(bugspam.Callek)
Comment on attachment 627653 [details] [diff] [review]
Alternative fix

Happier if gozer reviews, as I haven't tested client.py with hg share/hgtool myself yet.

But I'm leaving a request open on me, incase gozer takes longer and I find a free moment sooner.
Attachment #627653 - Flags: review?(gozer)
Attachment #627653 - Flags: review?(bugspam.Callek)
Attachment #627653 - Flags: review?(gozer) → review+
Attachment #627653 - Flags: review?(bugspam.Callek)
Attachment #627516 - Attachment is obsolete: true
Checked in: https://hg.mozilla.org/comm-central/rev/72a1699e3ad5
Assignee: nobody → mbanner
Status: NEW → RESOLVED
Closed: 7 years ago
Flags: in-testsuite-
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 16.0
So that I can run client.py from another working directory again.
Attachment #633483 - Flags: review?(mbanner)
Comment on attachment 633483 [details] [diff] [review]
Improve error messages, add topsrcdir

Looks good.
Attachment #633483 - Flags: review?(mbanner) → review+
Comment on attachment 633483 [details] [diff] [review]
Improve error messages, add topsrcdir

Pushed comm-central changeset a4dcfae6ddad.
You need to log in before you can comment on or make changes to this bug.