You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/02/27 18:27:39 UTC
svn commit: r1450864 - /cxf/branches/2.7.x-fixes/bin/DoMerges.java
Author: dkulp
Date: Wed Feb 27 17:27:39 2013
New Revision: 1450864
URL: http://svn.apache.org/r1450864
Log:
Merged revisions 1450640 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1450640 | dkulp | 2013-02-26 23:15:44 -0800 (Tue, 26 Feb 2013) | 2 lines
As Colm requested, add flag to only check your own commits
........
Modified:
cxf/branches/2.7.x-fixes/bin/DoMerges.java
Modified: cxf/branches/2.7.x-fixes/bin/DoMerges.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/bin/DoMerges.java?rev=1450864&r1=1450863&r2=1450864&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/bin/DoMerges.java (original)
+++ cxf/branches/2.7.x-fixes/bin/DoMerges.java Wed Feb 27 17:27:39 2013
@@ -78,6 +78,7 @@ public class DoMerges {
public static Ranges blocked = new Ranges();
public static String maxRev;
+ public static String username;
static class Ranges extends TreeSet<Range> {
private static final long serialVersionUID = 1L;
@@ -564,7 +565,7 @@ public class DoMerges {
p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "svn", "log",
"--oneline", "-r",
min + ":" + maxRev,
- gitSource}));
+ gitSource}));
} else {
p = Runtime.getRuntime().exec(getCommandLine(new String[] {"svn", "log",
"--quiet", "-r",
@@ -738,6 +739,10 @@ public class DoMerges {
auto = true;
} else if ("-from".equals(args[0])) {
fromVersion = Integer.valueOf(args[1]);
+ } else if ("-me".equals(args[0])) {
+ username = System.getProperty("user.name");
+ } else if ("-user".equals(args[0])) {
+ username = args[1];
} else {
onlyVersion = Integer.valueOf(args[0]);
}
@@ -793,10 +798,16 @@ public class DoMerges {
for (int cur = 0; cur < verArray.length; cur++) {
jiras.clear();
int ver = verArray[cur];
+ String[] logLines = getLog(ver, jiras);
+ if (logLines.length > 1
+ && username != null
+ && !logLines[1].contains("| " + username + " |")) {
+ continue;
+ }
+
System.out.println("Merging: " + ver + " (" + (cur + 1) + "/" + verList.size() + ")");
System.out.println("http://svn.apache.org/viewvc?view=revision&revision=" + ver);
- String[] logLines = getLog(ver, jiras);
for (String s : jiras) {
System.out.println("https://issues.apache.org/jira/browse/" + s);