Re: [Openstack] Review Spam
What's the location of the gerrit git repository? Is it this: https://review.openstack.org/p/openstack/nova Lorin -- Lorin Hochstein, Computer Scientist USC Information Sciences Institute 703.812.3710 http://www.east.isi.edu/~lorin On Sep 23, 2011, at 2:08 PM, Todd Willey wrote: Strictly speaking I think gerrit is the canonical one and github is a mirror of that. On Fri, Sep 23, 2011 at 1:53 PM, Lorin Hochstein lo...@isi.edu wrote: Vish: The description at https://github.com/openstack/nova still says GitHub Mirror of OpenStack Compute (Nova). Is it now the case that the GitHub repo is the canonical one and that the Launchpad repo is a mirror? Lorin -- Lorin Hochstein, Computer Scientist USC Information Sciences Institute 703.812.3710 http://www.east.isi.edu/~lorin On Sep 23, 2011, at 11:04 AM, Vishvananda Ishaya wrote: Hey Nova-Core, A couple of apologies: 1) Sorry about not communicating more about the Gerrit move. Somehow I assumed that everyone already knew we were moving as soon as diablo was finalized, but I never made an official announcement. I will try to stay on top of these things in the future. 2) Sorry about the review spam earlier. I was trying to bring in an old branch and keep the commit history. It seems that in the new world of gerrit, we're going to end up squashing everything in to one commit anyway so that is not the right way to go. There is a lesson learned though for moving existing branches over. If you are not worried about keeping commit history in your local repository, you probably will have an easier time if you just squash everything using the second method on the bottom of the page here: http://wiki.openstack.org/MigrateMergePropFromLaunchpadToGerrit Good luck migrating branches. Vish PS: We have re-enabled the pep8 check which disappeared for a while recently, so don't forget to check your branches. ___ Mailing list: https://launchpad.net/~openstack Post to : openstack@lists.launchpad.net Unsubscribe : https://launchpad.net/~openstack More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~openstack Post to : openstack@lists.launchpad.net Unsubscribe : https://launchpad.net/~openstack More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~openstack Post to : openstack@lists.launchpad.net Unsubscribe : https://launchpad.net/~openstack More help : https://help.launchpad.net/ListHelp
Re: [Openstack] Review Spam
Lorin Hochstein lo...@isi.edu writes: What's the location of the gerrit git repository? Is it this: https://review.openstack.org/p/openstack/nova The official repository for nova is at https://github.com/openstack/nova which puts the GIT urls at either: git://github.com/openstack/nova.git or https://github.com/openstack/nova.git Technically, that's a real-time[1] mirror of the gerrit repository, and you _could_ clone directly from gerrit and ignore github. But we haven't publish any directions on doing that to avoid confusion. -Jim [1] Nearly real-time; it's currently on a 15 second delay so that multiple changes to the gerrit repo can be combined into one update. ___ Mailing list: https://launchpad.net/~openstack Post to : openstack@lists.launchpad.net Unsubscribe : https://launchpad.net/~openstack More help : https://help.launchpad.net/ListHelp
Re: [Openstack] Review Spam
When you say combined into one update, do you mean that changes are pushed every 15 seconds, or that multiple commits in Gerrit get combined before pushing to github? Mark On Mon, Sep 26, 2011 at 8:59 AM, James E. Blair cor...@inaugust.com wrote: Lorin Hochstein lo...@isi.edu writes: What's the location of the gerrit git repository? Is it this: https://review.openstack.org/p/openstack/nova The official repository for nova is at https://github.com/openstack/nova which puts the GIT urls at either: git://github.com/openstack/nova.git or https://github.com/openstack/nova.git Technically, that's a real-time[1] mirror of the gerrit repository, and you _could_ clone directly from gerrit and ignore github. But we haven't publish any directions on doing that to avoid confusion. -Jim [1] Nearly real-time; it's currently on a 15 second delay so that multiple changes to the gerrit repo can be combined into one update. ___ Mailing list: https://launchpad.net/~openstack Post to : openstack@lists.launchpad.net Unsubscribe : https://launchpad.net/~openstack More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~openstack Post to : openstack@lists.launchpad.net Unsubscribe : https://launchpad.net/~openstack More help : https://help.launchpad.net/ListHelp
Re: [Openstack] Review Spam
Mark Gius m...@markgius.com writes: When you say combined into one update, do you mean that changes are pushed every 15 seconds, or that multiple commits in Gerrit get combined before pushing to github? Changes are pushed as-is within 15 seconds. The repo is an exact mirror, no commit rewriting or any other madness happens. They're just batched for efficiency. -Jim ___ Mailing list: https://launchpad.net/~openstack Post to : openstack@lists.launchpad.net Unsubscribe : https://launchpad.net/~openstack More help : https://help.launchpad.net/ListHelp
Re: [Openstack] Review Spam
Hi Vish, On Fri, 2011-09-23 at 10:04 -0700, Vishvananda Ishaya wrote: 2) Sorry about the review spam earlier. I was trying to bring in an old branch and keep the commit history. It seems that in the new world of gerrit, we're going to end up squashing everything in to one commit anyway so that is not the right way to go. There's definitely a shift in how to think about commits and merges etc. with git, but I wouldn't quite put as squash everything into one commit. I haven't used launchpad/bzr much, but it seemed like with bzr merge props we ended up with a single patch to review but the history of how that patch was arrived at. With git, merge requests can have multiple, individually reviewable logical, bisectable commits on the proposed branch but no history of the revisions the author went through with each of those patches. As a simple example, this branch in bzr: https://code.launchpad.net/~markmc/nova/iscsi-tgtadm-choice/+merge/75906 had 7 commits. A commit by Chuck, three fixes to that commit, a trunk merge by me and two more commits by me. The reviewer can look at the individual commits, but I suspect most just review it as one big patch. With git, the branch: https://review.openstack.org/#q,status:open+project:openstack/nova+branch:master+topic:bug/819997,n,z has 3 commits. The original patch from Chuck including fixes made to it later and my two patches. This way the multiple contributors are still getting credit, but the change is more easily reviewable because each logically separate change is in its own commit. So, I guess the takeaways are: 1) Each commit you push is going to be tested by jenkins, so you need to make sure the tests pass for one 2) You need to squash fixes for your commits back into the appropriate commit 3) But you should attempt to keep logically separate changes[1] as individual commits for the sake of easier review and bisection. Cheers, Mark. [1] - best tip I've heard on this is to always keep in mind what your next commit message is going to be. If it will be Refactor foo, fix bar, add blaa, then you should probably have separate commits. ___ Mailing list: https://launchpad.net/~openstack Post to : openstack@lists.launchpad.net Unsubscribe : https://launchpad.net/~openstack More help : https://help.launchpad.net/ListHelp
