1413922 - [tryselect] Merge vcs.py into mozversioncontrol

Status: RESOLVED FIXED

(Testing :: General, enhancement)

Description

[Andrew Halberstadt [:ahal]]

We should consolidate all our vcs code into a single module. This means merging the vcs related functionality in tools/tryselect/vcs.py into python/mozversioncontrol.

Comment 1

[Phabricator Automation]

Attachment: Bug 1413922 - [mozversioncontrol] Always use hglib.client if available and fall back to subprocesses if not, r?gps

Most HG commands use subprocesses, even if a context manager (and therefore an
hglib client) has been created. There are only two commands that make use of
the client, but they *only* work inside a context manager. I don't think
there are any technical reason these two commands *need* to use the context
manager.

This patch merges the HgRepository._run_in_client function with
HgRepository._run(). If a client exists, that will be used, otherwise a
subprocess will be used.

Comment 2

[Phabricator Automation]

Attachment: Bug 1413922 - [mozversioncontrol] Always use hglib.client if available and fall back to subprocesses if not, r?gps

Most HG commands use subprocesses, even if a context manager (and therefore an
hglib client) has been created. There are only two commands that make use of
the client, but they *only* work inside a context manager. I don't think
there are any technical reason these two commands *need* to use the context
manager.

This patch merges the HgRepository._run_in_client function with
HgRepository._run(). If a client exists, that will be used, otherwise a
subprocess will be used.

Comment 3

[Phabricator Automation]

Comment on attachment 8987597 [details]
Bug 1413922 - [mozversioncontrol] Always use hglib.client if available and fall back to subprocesses if not, r?gps

Gregory Szorc [:gps] has approved the revision.

https://phabricator.services.mozilla.com/D1809

Comment 4

[Phabricator Automation]

Attachment: Bug 1413922 - [tryselect] Merge vcs.py into mozversioncontrol

This moves all version control logic out of tools/tryselect and into
python/mozversioncontrol. The 'push_to_try' function is a bit different as we
want it's output to be streamed to stdout rather than being captured. For this
reason it uses 'subprocess.check_call' directly instead of calling 'self._run'.

Depends on D1816.

Comment 5

[Andrew Halberstadt [:ahal]]

Sorry, this was my first attempt at phabricator and I definitely bungled it. Somehow the second attachment got lost in the bug here, but I've fixed your issues at:
https://phabricator.services.mozilla.com/D1808

Not sure if it's in your bugzilla queue or not, so needinfo'ing just in case.

Comment 6

[Phabricator Automation]

Attachment: Bug 1413922 - [tryselect] Merge vcs.py into mozversioncontrol

Comment 7

[Andrew Halberstadt [:ahal]]

And it's back. I have no idea how I managed to do all this :p. I'll leave the needinfo just in case.

Comment 8

[Phabricator Automation]

Comment on attachment 8987952 [details]
Bug 1413922 - [tryselect] Merge vcs.py into mozversioncontrol

Gregory Szorc [:gps] has approved the revision.

https://phabricator.services.mozilla.com/D1808

Comment 9

[Phabricator Automation]

Comment on attachment 8987961 [details]
Bug 1413922 - [tryselect] Merge vcs.py into mozversioncontrol

Gregory Szorc [:gps] has approved the revision.

https://phabricator.services.mozilla.com/D1808

Comment 10

[Gregory Szorc [:gps]]

I think my review addressed the needinfo.

Comment 11

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/b3bead1f5729
[mozversioncontrol] Always use hglib.client if available and fall back to subprocesses if not, r=gps

Comment 12

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/e7a1d749ff9a
[tryselect] Merge vcs.py into mozversioncontrol r=gps

Comment 13

[Andrei Ciure[:aciure]]

https://hg.mozilla.org/mozilla-central/rev/b3bead1f5729
https://hg.mozilla.org/mozilla-central/rev/e7a1d749ff9a

Comment 14

[Cristina Coroiu [:ccoroiu]]

Backed out 2 changesets (bug 1413922) for breaking Nightly L10n

Backout: https://hg.mozilla.org/mozilla-central/rev/9f03501341bf35bc502f69f870746ffac73992ae

Failure push: https://treeherder.mozilla.org/#/jobs?repo=mozilla-central&revision=19edc7c22303a37b7b5fea326171288eba17d788&filter-resultStatus=testfailed&filter-resultStatus=busted&filter-resultStatus=exception&filter-classifiedState=unclassified&filter-searchStr=l10n

Comment 15

[Andrew Halberstadt [:ahal]]

Looks like we just need to s/_run_in_client/_run/g in langpack_manifest.py. Since all instances happen inside the context manager, the _run function will automatically use the client to handle the command. Though ideally we should either make _run a public interface or not use it directly from external consumers.

Comment 16

[Andrew Halberstadt [:ahal]]

Fixed:
https://treeherder.mozilla.org/#/jobs?repo=try&revision=eded3ff119be3e4b9dc73f5d9ad722d703afb4eb

Comment 17

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/0facbb3ab290
[mozversioncontrol] Always use hglib.client if available and fall back to subprocesses if not, r=gps

Comment 18

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/992f33d04e60
[tryselect] Merge vcs.py into mozversioncontrol r=gps

Comment 19

[Stefan Hindli [:stefan_hindli]]

https://hg.mozilla.org/mozilla-central/rev/0facbb3ab290
https://hg.mozilla.org/mozilla-central/rev/992f33d04e60

Comment 20

[Tom Prince [:tomprince]]

https://hg.mozilla.org/releases/mozilla-esr60/rev/6a1be51c3539
https://hg.mozilla.org/releases/mozilla-esr60/rev/d9434ba605cd