Re: Git - Hg workflows?

2014-11-04 Thread Nicolas B. Pierron
On 11/03/2014 06:37 PM, Gregory Szorc wrote: On 10/31/14 7:21 AM, Ehsan Akhgari wrote: On 2014-10-31 1:48 AM, Gregory Szorc wrote: a) Landing code to inbound, fx-team, aurora, etc I have the following git alias: hgp = show -M -C --binary --full-index --format=\From: %an %ae%nSubject:

Re: Git - Hg workflows?

2014-11-04 Thread Nicolas B. Pierron
On 11/03/2014 07:43 PM, Gregory Szorc wrote: On 10/31/14 11:03 AM, Ehsan Akhgari wrote: Not sure if I follow. Are you suggesting that git users push to their own vanilla git server, and then autoland comes around some time later, converts that into hg, and tries to transplant the result? Why

Re: Git - Hg workflows?

2014-11-03 Thread Trevor Saunders
On Fri, Oct 31, 2014 at 02:03:35PM -0400, Ehsan Akhgari wrote: On 2014-10-31 12:51 PM, Gregory Szorc wrote: As has been said on this list before, switching canonical to Git just isn't going to happen. Valid reasons have been given before. But here's a new one: we don't need to. I think it's

Re: Git - Hg workflows?

2014-11-03 Thread Gregory Szorc
On 10/31/14 7:21 AM, Ehsan Akhgari wrote: On 2014-10-31 1:48 AM, Gregory Szorc wrote: a) Landing code to inbound, fx-team, aurora, etc I have the following git alias: hgp = show -M -C --binary --full-index --format=\From: %an %ae%nSubject: %s%n%n%b\ -U8 And my workflow for landing code is

Re: Git - Hg workflows?

2014-11-03 Thread Gregory Szorc
On 10/31/14 11:03 AM, Ehsan Akhgari wrote: On 2014-10-31 12:51 PM, Gregory Szorc wrote: All problems in computer science can be solved by another level of indirection. The problem here is that Git users need to push to the canonical Mercurial repositories (inbound, try, etc). You will be

Re: Git - Hg workflows?

2014-11-01 Thread 陳侃如
Gregory Szorc g...@mozilla.com writes: I'm trying to learn more about how the people who use Git for Firefox/Gecko development manage interacting with repositories that have their canonical home in Mercurial (mozilla-central, Try, etc). I'm doing this to ensure the replacement Try

Re: Git - Hg workflows?

2014-11-01 Thread Philip Chee
On 31/10/2014 13:48, Gregory Szorc wrote: Does anyone use hg-git (it has gotten *much* faster in the past year thanks to Facebook's investment)? In order to submit a patch (or is it called a pull request) to the Addon-SDK I installed hggit (since all my other workflows are Hg). Pulling and

Re: Git - Hg workflows?

2014-11-01 Thread Philip Chee
On 31/10/2014 22:21, Ehsan Akhgari wrote: a) Landing code to inbound, fx-team, aurora, etc I have the following git alias: hgp = show -M -C --binary --full-index --format=\From: %an %ae%nSubject: %s%n%n%b\ -U8 And my workflow for landing code is like this: $ cd /path/to/src # this

Re: Git - Hg workflows?

2014-10-31 Thread Bobby Holley
Just my 2c: On Fri, Oct 31, 2014 at 6:48 AM, Gregory Szorc g...@mozilla.com wrote: a) Landing code to inbound, fx-team, aurora, etc b) Pushing to Try I do (b) with |git push-to-try|. It's flakey sometimes, and I've always been somewhat superstitious about using it to actually push to inbound

Re: Git - Hg workflows?

2014-10-31 Thread Ehsan Akhgari
On 2014-10-31 1:48 AM, Gregory Szorc wrote: I'm trying to learn more about how the people who use Git for Firefox/Gecko development manage interacting with repositories that have their canonical home in Mercurial (mozilla-central, Try, etc). I'm doing this to ensure the replacement Try

Re: Git - Hg workflows?

2014-10-31 Thread Patrick McManus
I use git day to day. I use hg primarily for landing code and hg bzepxort. On Fri, Oct 31, 2014 at 1:48 AM, Gregory Szorc g...@mozilla.com wrote: I I'm interested in knowing how people feel about these hidden hg tools. Is going through a hidden, local hg bridge seamless? Satisfactory? Barely

Re: Git - Hg workflows?

2014-10-31 Thread Nathan Froyd
- Original Message - a) Landing code to inbound, fx-team, aurora, etc b) Pushing to Try I have a script that handles pushing a range of commits to the repository of my choice. This script is essentially: for id in ${range}; do git show --unified=3 --id=${id} --format=${stuff} |

Re: Git - Hg workflows?

2014-10-31 Thread Dirkjan Ochtman
On Fri, Oct 31, 2014 at 3:21 PM, Ehsan Akhgari ehsan.akhg...@gmail.com wrote: In the current world, there are enough hg and git users that I think Mozilla should consider supporting both as first class citizens. The proper way to do that would be deploying a git push server which eliminates

Re: Git - Hg workflows?

2014-10-31 Thread Ehsan Akhgari
On 2014-10-31 10:43 AM, Dirkjan Ochtman wrote: On Fri, Oct 31, 2014 at 3:21 PM, Ehsan Akhgari ehsan.akhg...@gmail.com wrote: In the current world, there are enough hg and git users that I think Mozilla should consider supporting both as first class citizens. The proper way to do that would be

Re: Git - Hg workflows?

2014-10-31 Thread Ting-Yu Lin
I cannot live without moz-git-tools. Let me explain. a) Landing code to inbound, fx-team, aurora, etc I use git bz attach to attach patches to bugzilla and use checkin-needed. b) Pushing to Try I use git push-to-try. This command needs a local hg repo, so I need to update it every time when

Re: Git - Hg workflows?

2014-10-31 Thread Nicolas B. Pierron
On 10/31/2014 06:48 AM, Gregory Szorc wrote: a) Landing code to inbound, fx-team, aurora, etc b) Pushing to Try From what I recall, the default moz-git-tools way is to have a clone for each repository. This implies that you need one hg work directory per target branch. I changed the

Re: Git - Hg workflows?

2014-10-31 Thread Eric Rescorla
Let me try to answer at a high level first. I use git for all of my workflows and when I collaborate with other people on my team, we use git and github. See, for instance: https://github.com/unicorn-wg/gecko-dev/tree/multistream_rebase So, I primarily need to engage with hg for the following

Re: Git - Hg workflows?

2014-10-31 Thread Kyle Huey
On Thu, Oct 30, 2014 at 10:48 PM, Gregory Szorc g...@mozilla.com wrote: I'm trying to learn more about how the people who use Git for Firefox/Gecko development manage interacting with repositories that have their canonical home in Mercurial (mozilla-central, Try, etc). I'm doing this to ensure

Re: Git - Hg workflows?

2014-10-31 Thread Gregory Szorc
On 10/30/14 10:48 PM, Gregory Szorc wrote: I'm trying to learn more about how the people who use Git for Firefox/Gecko development manage interacting with repositories that have their canonical home in Mercurial (mozilla-central, Try, etc). I'm doing this to ensure the replacement Try

Re: Git - Hg workflows?

2014-10-31 Thread Ehsan Akhgari
On 2014-10-31 12:51 PM, Gregory Szorc wrote: As has been said on this list before, switching canonical to Git just isn't going to happen. Valid reasons have been given before. But here's a new one: we don't need to. I think it's fair to say that the pain point for Firefox Git developers *today*

Re: Git - Hg workflows?

2014-10-31 Thread Andrew McCreight
Generally speaking, I use git for everything except pushing to inbound and try, and I use moz-git-tools to intermediate my interaction with hg. a) Landing code to inbound, fx-team, aurora, etc For this, I keep around hg repos for the repos I care about, which is m-c and inbound right now,

Re: Git - Hg workflows?

2014-10-31 Thread James Graham
On 30/10/14 22:48, Gregory Szorc wrote: I'm trying to learn more about how the people who use Git for Firefox/Gecko development manage interacting with repositories that have their canonical home in Mercurial (mozilla-central, Try, etc). I'm doing this to ensure the replacement Try

Re: Git - Hg workflows?

2014-10-31 Thread Steve Fink
On 10/31/2014 08:00 AM, Nicolas B. Pierron wrote: On 10/31/2014 06:48 AM, Gregory Szorc wrote: 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

Re: Git - Hg workflows?

2014-10-31 Thread Kyle Huey
On Fri, Oct 31, 2014 at 2:24 PM, Steve Fink sf...@mozilla.com wrote: On 10/31/2014 08:00 AM, Nicolas B. Pierron wrote: On 10/31/2014 06:48 AM, Gregory Szorc wrote: I'm interested in knowing how people feel about these hidden hg tools. Is going through a hidden, local hg bridge seamless?

Re: Git - Hg workflows?

2014-10-31 Thread Steve Fink
On 10/31/2014 07:21 AM, Ehsan Akhgari wrote: And my workflow for landing code is like this: $ cd /path/to/src # this is a git repo $ git hg commit_id /tmp/x $ cd /path/to/inbound # this is an hg repo $ hg pull -u $ hg qim /tmp/x hg qpush hg qfi -a hg push Sorry for the irrelevant

Re: Git - Hg workflows?

2014-10-31 Thread Botond Ballo
From: Ehsan Akhgari ehsan.akhg...@gmail.com To: Gregory Szorc g...@mozilla.com, dev-platform dev-platform@lists.mozilla.org Cc: Nicolas Pierron npier...@mozilla.com Sent: Friday, October 31, 2014 10:21:09 AM Subject: Re: Git - Hg workflows? In the current world, there are enough hg

Re: Git - Hg workflows?

2014-10-31 Thread Steve Fink
On 10/31/2014 11:03 AM, Ehsan Akhgari wrote: On 2014-10-31 12:51 PM, Gregory Szorc wrote: All problems in computer science can be solved by another level of indirection. The problem here is that Git users need to push to the canonical Mercurial repositories (inbound, try, etc). You will be

Re: Git - Hg workflows?

2014-10-31 Thread Blake Kaplan
Ehsan Akhgari ehsan.akhg...@gmail.com wrote: The reason I and others go through this pain right now to avoid having to use hg more is increased productivity. [...] For the record (and I'm currently a user of the git+github+moz-git-tools cohort, so I'm me-too'ing here), I've occasionally tried

Re: Git - Hg workflows?

2014-10-31 Thread Daniel Stenberg
On Thu, 30 Oct 2014, Gregory Szorc wrote: Hey ho, Let me give you my views on this as a relative newcomer in the source tree. I started at Mozilla early 2014 and as an old open source contributor to and maintainer of dozens of projects for many years I am deeply accustomed to using git and