Re: [Geany-devel] [geanyprj] coding style patch
On 12/12/2011 11:02 PM, Yura Siamashka wrote: Hi Sorry I didn't follow conversion to github and I am not really familiar with new workflow. So as GeanyPrj maintainer how do I commit patch to mainline? Should my github user be added to main geany-plugins repository or I need to create new fork with related changes and create pull request to main geany-plugins from time to time? I think Frank asked for Github usernames in another thread for this. This github stuff is a bit confusing for me. There was some discussion about doing something like this: 1. Go to github.com/geany/geany-plugins and click Fork 2. Go to github.com/you/geany-plugins and get the clone URL 3. From terminal: $ git clone address from github in step 2 $ cd geany-plugins/geanyprj $ git checkout -b your-topic-branch hack, commit, hack, commit, ... 4. git push origin your-topic-branch 5. Go to github.com/you/geany-plugins/tree/your-topic-branch and click the Pull Request button. Or we might end up just working from the main repository ourselves like we did with SVN, unless someone can step up to review all the pull requests. Frank did you decide on a best practice yet? Cheers, Matthew Brush On 12/12/2011 06:51 AM, Johann SAUNIER wrote: Hi there, This is a new patch for Geanyprj. It doesn't implement any functionality or bug fix. It's only a cosmetic patch to comply to Geany's coding conventions. Since geany-plugins has moved on GitHub, is there an equivalent to the tracker-patches functionality of SourceForge for sending patches ? Yep, In Github land it's called a pull request. While logged in to Github, navigate to the geany-plugins repository and click the fork button. It will make a copy of the repository under your account. Create a new branch, hack away and when it's ready, click the Pull request button on Github and it will notify committers that you have something ready in your branch to be merged. Of course like you did here on the ML is fine too, but it's easier to loose track of if it's not persistent somewhere. Cheers, Matthew Brush ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] [geanyprj] coding style patch
Am 13.12.2011 09:11, schrieb Matthew Brush: On 12/12/2011 11:02 PM, Yura Siamashka wrote: Hi Sorry I didn't follow conversion to github and I am not really familiar with new workflow. So as GeanyPrj maintainer how do I commit patch to mainline? Should my github user be added to main geany-plugins repository or I need to create new fork with related changes and create pull request to main geany-plugins from time to time? I think Frank asked for Github usernames in another thread for this. This github stuff is a bit confusing for me. There was some discussion about doing something like this: 1. Go to github.com/geany/geany-plugins and click Fork 2. Go to github.com/you/geany-plugins and get the clone URL 3. From terminal: $ git clone address from github in step 2 $ cd geany-plugins/geanyprj $ git checkout -b your-topic-branch hack, commit, hack, commit, ... 4. git push origin your-topic-branch 5. Go to github.com/you/geany-plugins/tree/your-topic-branch and click the Pull Request button. Or we might end up just working from the main repository ourselves like we did with SVN, unless someone can step up to review all the pull requests. Frank did you decide on a best practice yet? I'd really like to see the workflow as you described inside the numbered section. But as I'm not god its a bit up to community what's the best way ;) Cheers, Frank ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Geany-Plugins: git repo up and running
Am 12.12.2011 22:36, schrieb Jiří Techet: On Mon, Dec 12, 2011 at 14:54, Frank Lanitz fr...@frank.uvena.de wrote: Hi folks, Just I case you missed the news inside the threads: the new git repo for geany-plugins is online and can be found at https://github.com/geany/geany-plugins Hi Frank, it looks you have forgotten to push the 0.18 branch - you need to use git push --all origin to push all the branches. Yepp, you are right. My wrong. Will do it soonish. Cheers, Frank ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] GtkBuilder is in!
On 12/12/2011 10:14 PM, Frank Lanitz wrote: Am 11.12.2011 01:21, schrieb Matthew Brush: - more testing on win32 Current nightly build of 12/12/11 did not start do to missing symbol on my box. A screenshot from my German Windows 7: http://frank.uvena.de/tmp/geany_error.png Its telling: g_malloc0_n wasn't found inside libglib-2.0-0.dll. OK, I'm pretty sure it's something with the nightly build system for Windows because I can successfully build and run latest geany from master against GTK+ 2.16.6 and 2.24.8 without any of these issues. Cheers, Matthew Brush ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Just a stupid github question: How to merge a pull request with fast forward?
Am 13.12.2011 09:51, schrieb Nathan Broadbent: See question from subject line. How can I merge a pull request without adding a new commit stating the merge? Is there some kind of ff or cherry-pick available through front end? You can't do a cherry pick or rebase through the front-end. I think adding this 'merge pull request' commit is a good idea, since it shows more information about where the commit came from. OK. So I assume its best practice also on github to do so? But if you want, you can use 'git rebase' to avoid the merge commit. In the case of my 'gitignore' branch, you could have run the following commands: git remote add ndbroadbent git://github.com/ndbroadbent/geany-plugins.git http://github.com/ndbroadbent/geany-plugins.git git fetch ndbroadbent git rebase ndbroadbent/gitignore git remote rm ndbroadbent Yepp. This I was aware of. Just wondeirng, wehther it can be done via github. Cheers, Frank ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Just a stupid github question: How to merge a pull request with fast forward?
You can't do a cherry pick or rebase through the front-end. I think adding this 'merge pull request' commit is a good idea, since it shows more information about where the commit came from. OK. So I assume its best practice also on github to do so? Yes, this is a best practice. It's also a best practice to add a 'merge' commit when merging in a feature branch, so that the branch's diversion is retained. Github's network graph [1] and gitk [2] are great tools for viewing this history, and you shouldn't worry too much about making the history as 'linear' as possible. [1] https://github.com/geany/geany-plugins/network [2] http://lwn.net/Articles/140350/ Best regards, Nathan B ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Wrap words Addon patch
Now that the geany-plugins has been converted to Git, I thought I'd post this patch that adds the feature I've been working on (wrapping text with characters) to the Addons plugin. Any chance of it being added? Hi Alex, Now that geany-plugins is on github, we can take advantage of the awesome 'Pull Request' feature. Everyone should read the introduction to pull requests if they are new to github. [1] Here's how you can send a pull request from your fork of geany-plugins: 1. Visit https://github.com/pzoxiuv/geany-plugins-1 2. Click 'Pull Request' 3. In the box on the right, you will see the heading 'Head branch · tag · commit'. There is an input field next to pzoxiuv/geany... @, where you should type your branch (addons_wraptext). 4. You can enter a title description, and double check the commits and changes. If everything looks good, click 'Send pull request' This is a lot more powerful than mailing patches back and forth. The 'patch' can be updated easily by adding new commits to your branch, and anyone can add comments to any of the changed lines. Best regards, Nathan [1]: http://help.github.com/send-pull-requests/ ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Just a stupid github question: How to merge a pull request with fast forward?
And another question: Is github allowing to do an automatic rebase for forks? E.g. I have forked geany-plugins into my namespace https://github.com/frlan/geany-plugins and want to keep it up to date. Do I need to to it locally with git remote --add etc. or is there any gui for? It's not possible to keep a fork up to date automatically. Any changes on your fork would start to produce merge conflicts that can't be resolved automatically. Also, there isn't too much benefit in having your own fork of the code, apart from having a place to store experimental branches that you don't want on the main repository. In that case, you should just delete the master branch from your fork and track the master branch from geany/geany-plugins. Best regards, Nathan B ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
Re: [Geany-devel] Just a stupid github question: How to merge a pull request with fast forward?
Le 13/12/2011 10:33, Nathan Broadbent a écrit : You can't do a cherry pick or rebase through the front-end. I think adding this 'merge pull request' commit is a good idea, since it shows more information about where the commit came from. OK. So I assume its best practice also on github to do so? Yes, this is a best practice. It's also a best practice to add a 'merge' commit when merging in a feature branch, so that the branch's diversion is retained. Github's network graph [1] and gitk [2] are great tools for viewing this history, and you shouldn't worry too much about making the history as 'linear' as possible. While I agree that when there are more than one commit in a branch it shouldn't be rebased to keep the branch history, I don't agree when it's a single commit like [1] or even [2]. When it's a single commit, I think it only adds junk to the history, making it less readable. And I don't see what we gain with the merge message in such situations: 1) we don't care it was a GitHub pull request and not a format-patch; 2) the branch name shouldn't be required, the commit should be enough; 3) the patch contains authoring information anyway; 4) etc. So IMHO it's better for single-commit patches (which should generally be quite small BTW) NOT to have the merge commit. Regards, Colomban [1] https://github.com/geany/geany/commit/903e69b388b935cfb135312a3a76b04608133a4e [2] https://github.com/geany/geany/commit/8f280ed884721a0a1c75462e428b9bcffb3ac527 ___ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel
