New Blog!
I moved all my posts over to my new blog over here! http://ronalleva.com. It’s still in progress, but I’ll update soon with information about it.
jmeter-maven-plugin now on github
Wow, I’ve gotten a lot of requests for the jmeter-maven-plugin, for enhancements and whatnot. I originally had the code on code.google.com, but from there I have to add contributors, blah blah blah. So I moved all the code over to github, so if anybody wants to update it, now they can do so directly, through github.
The page for the jmeter plugin is still here.
Our group is starting to use Review Board more and more to conduct our code reviews. But using it with git-svn, or with anything you’ve already checked into svn can be a real hassle. You don’t want to have uncommitted code hanging around in your computer for extended periods of time for a number of reasons, so this rendered it difficult to use for code projects that take more than a week.
Since I like to eat, and hence get paid so that I can afford food, I have to work on things that take longer than a week. But luckily, git can help get a diff for review board based only on a string in the commit comments.
This came about when one of my co-workers posted a bash scripts someone had written that would take a git diff and make it into a svn-like diff. And that worked great. My first attempt was to modify it to do multiple files at once, but it ended up making a diff for each revision for each file (if you need that functionality, you can get that here).
So I pulled out python and worked on a new script, which is at the bottom of this post, or you can get it here.
Once you download the file, you run it like this from your git repository:
git-create-review.py (some grep string) > diff.output
The script will take the argument as a string to search for in the commit comments. This is thanks to the git log –grep=foo command available in git. It outputs directly to the terminal, which you can see I’m redirecting into diff.output. Once you have the file, you can upload to Review Board as you normally would.
I did it by using a search string because we use JIRA to track our work in svn. We have pre-commit hooks to ensure that we put a JIRA number on each commit. This helps out git as it has something to search through to get the change list.
Known issues:
First: It will get all the changes between the first and last revision that had the search string.
Example:
I change File.java under JIRA-123 (now at r1). Another change to File.java under JIRA-321 (now at r2). I change the file again under JIRA-123 (now r3).
This script will take all changes between 1 and 3, even if I don’t want the JIRA-321 changes to show up.
Second: it doesn’t have any context around removed/moved files. It still should pick up a renamed file as just a completely new file, but it doesn’t have any context of renaming. But I believe that’s the case with svn anyway.
Third: I am by no means a good python programmer, and might not know all the conventions that people normally follow. The code below may cause eye hemorrhaging, face hemorrhaging…pretty much any of your organs could be hemorrhaged by looking at the code. CONSIDER THIS YOUR ONLY WARNING.
But I did some testing with newly created files, and removed files, and binary files, but I’m sure I missed some crazy edge cases. Let me know if you hit any snags.
The script follows:
If you go to the bottom of the page for git-svn, under the “Basic Examples” section, you’ll see in there a procedure to clone a git-svn repo that someone has painstakingly already cloned from svn. That’s great, because it will save you hours and hours of mind numbing time that would normally take someone to clone an svn repo.
That person may be tremendously happy…that is, until, you try to “git svn fetch” to get new revisions and branched and what have you, and you get an error message like this:
Last fetched revision of (some branch or tag) was r3421, but we are about to fetch: r3421!
In an attempt to fix it, you may find this blog post, saying to remove the .ref files from your svn directory, which also proves fruitless.
The fix: modify the .git/svn/.metadata file so that the branches-maxRev and tags-maxRev equals the latest commit revision in svn. So it should look like this after you are done:
; This file is used internally by git-svn ; You should not have to edit it [svn-remote "svn"] reposRoot = (svn server name) uuid = c08781d2-f03e-0410-8c7c-e884ea3e41f3 branches-maxRev = 17224 tags-maxRev = 17224
Where 17224 was our latest revision.
I got the idea from git-svn’s webpage, where it states:
If the subset of branches or tags is changed after fetching, then .git/svn/.metadata must be manually edited to remove (or reset) branches-maxRev and/or tags-maxRev as appropriate.
I must caveat this with the fact that I have no idea why this works. Git svn is still black magic to me, and making this work is akin to me throwing muskrat bones onto a flaming pyre, and drawing conclusions from the charred remains. Maybe someone with more git knowledge could drop it off here?
