Real example for git-push-to-try about moz-git-tools

[amccreight]

What part of it isn't clear? The PATH_TO_HG_REPO?

[marcoscaceres]

On Saturday, January 10, 2015, Andrew McCreight [email protected]
wrote:

What part of it isn't clear? The PATH_TO_HG_REPO?

Well I would say all of it. The terminology assumes some kind of knowledge
of hg. It's not clear what -tip means - at least I don't know what that
means git wise.

Also, it's not clear how one uses:

Push the commits $(git merge-base HEAD $(git-tracks))..HEAD

Or where, or if at all in this context. Might be the above assumes way too
much git knowledge (at least more than I have, and I've been using git for
a couple of years).

Would be nice to have some real examples to make some sense of how to use
this quickly (ideally just something one can copy/paste to command line).

—
Reply to this email directly or view it on GitHub
#28 (comment)
.

[amccreight]

Alright, I'll try to write something up. In the meanwhile for your use, what I use most commonly is this:
git-push-to-try ~/hg/mc/ -b d -p linux -u all -t none
where ~/hg/mc/ is the directory of my hg repo for mozilla-central. "-b d -p linux -u all -t none" is just the standard try chooser mumbo jumbo from http://trychooser.pub.build.mozilla.org/

Adding the -t just makes it so it does hg pull -u before it applies your patches, I think. I don't use that, because I like to ensure my git and hg repos stay in sync.

The $(git merge-base HEAD $(git-tracks))..HEAD is just describing what commits it pushes. I think it is basically what |hg qapplied| shows you. I'll have to check that.

[marcoscaceres]

where ~/hg/mc/ is the directory of my hg repo for mozilla-central.

Hehe, I was not aware that I would need to clone the hg repo for mozilla central in addition to the git repo. Can you please mention that in the README?

The $(git merge-base HEAD $(git-tracks))..HEAD is just describing what commits it pushes. I think it is basically what |hg qapplied| shows you. I'll have to check that.

I've never really used hg, but will look into it a bit to see what qapplied does.

Thanks also for the additional clarifications and help! I'll try this out (no pun intended!).

[amccreight]

Oh, sorry, I meant, what |git qapplied| shows you, which is a command defined by moz-git-tools that attempts to mimic the hg queue work flow. Basically, if you set your upstream to some branch then it will show you the commits not in the upstream. Or something like that.

[marcoscaceres]

(...just putting this here for record keeping...)
So, the only bit I needed to add to get this working was the following to .hgrc:

[extensions]
mq =

When the above was missing, hg complained that qpop and qapplied were unknown commands.

[miketaylr]

@marcoscaceres can you document the steps you used to get this working? Pasting from bash history would be cool. 🆒

edit: I eventually figured this out--turns out I was running into ssh issues (using wrong email in my ssh config for the try server 🙈 )

Here's the steps I did in case this is useful for writing an example, or future readers:

With an upstream remote (pointing to [email protected]:mozilla/gecko-dev.git), I set the upstream for my branch like so: git branch --set-upstream cool_guy_branch upstream/master.

I needed to clone the hg repo, and I went ahead and set an environment variable HG_REPO pointing to it (twice the repos, twice the fun).

And then, use the actual command: git push-to-try $HG_REPO -b d -p linux,android-x86 -u all -t none

I don't know if this is normal, or specific to my set up, but it just sat there until I figured out I needed to type :wq for my commit message (I had a weird Vim: Warning: Output is not to a terminal message in my terminal). And after that it succeeded and I got a URL for my try push.

[marcoscaceres]

@miketaylr, good to hear. I also found this helpful too: http://glandium.org/blog/?p=3413

[vladikoff]

@marcoscaceres the updated version of that article http://glandium.org/blog/?page_id=3438 However following the steps in the article just leaves me hanging in the terminal

[marcoscaceres]

@vladikoff I'm not sure what you mean by "just leaves me hanging in the terminal"?

[vladikoff]

@marcoscaceres after typing in git push try I get no more feedback or output in the terminal. It just sits there with the process running (waited ~30 minutes). However I got things to work using @miketaylr's method" (:tm:) with git push-to-try $HG_REPO .....

[marcoscaceres]

@vladikoff ah, ok. Yeah, I'm using:

 git-push-to-try --tip ~/hg-moz -p all -u all -t none

[jankeromnes]

It also took me a long time with a lot of trial-and-error before I figured out how to properly use push-to-try, because there didn't seem to be any examples anywhere.

A complete example for each instruction in the README would be extremely helpful!

However, maybe the push-to-try example should not use -p all -u all, because that is frowned upon by sheriffs (it triggers some resource-intensive builds and test suites which are rarely useful, so it's basically wasting resources). May I suggest -p linux,linux64,macosx64,win32,win64 -u reftest,mochitests instead?

[marcoscaceres]

heh, I've been using -p all -u all for the last year+. I'll switch to the one @jankeromnes suggested.

[jankeromnes]

I had been using that as well for a while (since I'd figured out how to make push-to-try work) but one day a sheriff complained to me about that, and told me about http://trychooser.pub.build.mozilla.org/