Dan I know I had brought up using github in the past. It's been about a year, so thought its time to bring it up again. I work for a very large internet company who has recently, amongs other (buzzword alert) Continuous Integration/Continuous Delivery initiatives, has migrated entirely to a private github. I must say that it has been well received and one of the better and smoother internal tech migrations that we have done. +1 for moving chirp github right now most popular SCM, "everyone already knows how to use it" nice built in code review tools for discussing/evolving a patch/feature (i.e., pull requests)fork-and-pull collaboration pattern is very chirp friendly and permissive - while keeping control over main chirp reponice api support to hook into your existing build, test, and publish pipelines. (Can enforce style, commit message structure, trigger your build systems, etc)very easy and straightforward to work on new feature branches for major changes like Zach's or Kosta's UI work, without disturbing master branch until everyone is ready. better ui ;) https://codio.com/blog/2013/06/moving-from-mercurial-to-git/
From: Zach Welch zach@mandolincreekfarm.com To: chirp_devel@intrepid.danplanet.com Sent: Monday, February 23, 2015 11:44 PM Subject: Re: [chirp_devel] git vs hg patches [was: [PATCH 1/4] chirp.py: add --list-radios option (#2343)]
On 02/23/2015 03:27 PM, Dan Smith wrote: ...
Can you send these in mercurial native format? That way I can just import them into the repo and they're properly stamped with your name, commit message, etc.
If that's strictly necessary, I could. I haven't used mercurial for a great many years, but I use git on a daily basis. Thus, I used hg-git to create a git repository that I could use for my chirp development. I used git to format and post my patches, and I figured that would be sufficient for importing into mercurial. Apparently not.
On the bright side, the problem may have been solved for us:
https://github.com/mozilla/moz-git-tools/blob/master/git-patch-to-hg-patch
Will that script give you some joy? After testing it here, I can see it will need a small tweak to remove [PATCH x/n] (not just [PATCH]), but that should be fairly easy for someone well-versed in Python. There may be other gotchas that I don't see, so let me know what you think about it.
Honestly, I would really love to avoid learning mercurial right now. Isn't it enough that I'm learning Python? ;)
Also, you need a bug in the commit message or I physically can't put it into the repo. See this for more details:
The bug number is in the Subject line of all of my patches, which becomes the first line of the commit message when using git. Will that work (after the above conversion) for mercurial, or do I need to put it in the body of the message proper?
Thanks,