cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [1/3] git commit: The merge log entry things are no longer appicable with git based merges
Date Fri, 21 Mar 2014 17:20:48 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 9fa052b13 -> 7a4c219fa


The merge log entry things are no longer appicable with git based merges


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8e5d8b5b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8e5d8b5b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8e5d8b5b

Branch: refs/heads/2.7.x-fixes
Commit: 8e5d8b5b1917c5f79c38d7980097a9f9c30935f6
Parents: 9fa052b
Author: Daniel Kulp <dkulp@apache.org>
Authored: Thu Mar 20 16:47:41 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Fri Mar 21 13:19:58 2014 -0400

----------------------------------------------------------------------
 bin/DoMerges.java | 33 +++++----------------------------
 1 file changed, 5 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/8e5d8b5b/bin/DoMerges.java
----------------------------------------------------------------------
diff --git a/bin/DoMerges.java b/bin/DoMerges.java
index 603d3c7..4bb6d7c 100644
--- a/bin/DoMerges.java
+++ b/bin/DoMerges.java
@@ -240,7 +240,7 @@ public class DoMerges {
         while (line != null) {
             if (line.length() > 0 && line.startsWith("commit ")) {
                 if (!list.isEmpty()) {
-                    addIfNotMergeBlock(map, list);
+                    map.add(list.toArray(new String[list.size()]));
                     list.clear();
                 }
                 while (line != null && line.length() > 0 && line.charAt(0)
!= ' ') {
@@ -252,36 +252,12 @@ public class DoMerges {
             line = reader.readLine();
         }
         if (!list.isEmpty()) {
-            addIfNotMergeBlock(map, list);
+            map.add(list.toArray(new String[list.size()]));
             list.clear();
         }
         return map;
     }
-    
-    private static void addIfNotMergeBlock(List<String[]> map, List<String> list)
{
-        for (String s: list) {
-            if (s.trim().startsWith("Merged revision")
-                && s.contains(" via ")) {
-                return;
-            }
-            if (s.trim().startsWith("Recording revision")
-                && s.contains(" via ")) {
-                return;
-            }
-            if (s.trim().startsWith("Blocking revision")
-                && s.contains(" via ")) {
-                return;
-            }
-            if (s.trim().contains("Recording .gitmergeinfo Changes")) {
-                return;
-            }
-            if (s.contains("[maven-release-plugin] prepare")) {
-                return;
-            }
-        }
-        map.add(list.toArray(new String[list.size()]));
-    }
-    
+        
     public static String[] getLog(String ver, Set<String> jiras) throws Exception {
         Process p;
         BufferedReader reader;
@@ -594,7 +570,8 @@ public class DoMerges {
             if (s.trim().length() > 0 
                 && !onBranch.remove(s.trim())
                 && !s.startsWith("Author: ")
-                && !s.startsWith("Date: ")) {                
+                && !s.startsWith("Date: ")
+                && !s.contains("git-svn-id")) {                
                 ll.add(s);
             } 
         }


Mime
View raw message