Thanks for sending this email! Some responses below..
On 31/10/2014, 1:48, Gregory Szorc wrote:
a) Landing code to inbound, fx-team, aurora, etc b) Pushing to Try
My workflow involves exporting patches from git as flat text files and then using qimport/push from a single hg pseudo-unified repo to push wherever. (I say "pseudo-unified" because I just pulled all the repos I care about into my local hg repo, but didn't use your mercurial extension that probably does something better under the hood).
c) Fetching new commits
git pull
d) Collaborating/sharing commits with others, especially hg<->git sharing
Push to github, or upload WIP patches to a bug.
I found https://etherpad.mozilla.org/moz-git-tools and the like-named GitHub repo with a suite of Mozilla-centric Git commands. These seem to be largely based on top of low-level patch format conversion and make little attempt (if any) to preserve commit SHA-1 mappings to enable bi-directional conversion (i.e. they are unidirectional, lossy tools). Many of them seem to have `hg` invocations buried under the covers. I'm interested in knowing how people feel about these "hidden hg" tools. Is going through a hidden, local hg bridge seamless? Satisfactory? Barely tolerable? A horrible pain point? (I noticed some of the hg interactions in moz-git-tools aren't optimal. If these are important tools, please ping me off list so I can help you improve them.) Is moz-git-tools the de facto standard for Mozilla developers? Are there other competing tools?
I don't use moz-git-tools. I'm not aware of other "competing" tools; the stuff I use I wrote myself and is pretty minimal. It's probably a poor man's version of moz-git-tools.
Does anyone use hg-git (it has gotten *much* faster in the past year thanks to Facebook's investment)?
Never used it locally. I do however occasionally run into the problem where I have a git or hg identifier and I need to map it to the other system. For this I use https://github.com/staktrace/moz-scripts/blob/master/vcslookup.sh
I'm particularly interested in knowing if any Git developers have been able to eliminate local hg completely. i.e. you are fetching and pushing from/to Git repos exclusively. If so, what are you using? What limitations do you have?
Nope. checkin-needed can help with landing code, but pushing to try still needs to be done using a local hg instance.
Overall, how happy are you with your Git fetch/push workflows? Short of switching the canonical repositories to Git, what do you need to be more productive?
It's one of those "I've learned to live with it, and forgot how painful it used to be" things. Obviously switching to a new workflow might make me more productive in the long run but has a short-term cost and it's always hard to tell upfront whether the switch is worth it. In hindsight it usually is.
Cheers, kats _______________________________________________ dev-platform mailing list [email protected] https://lists.mozilla.org/listinfo/dev-platform
