lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mikemcc...@apache.org
Subject lucene-solr git commit: LUCENE-6938: switch from svn to git
Date Wed, 10 Feb 2016 22:55:48 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/master 6b6932e8e -> 70e61fd9e


LUCENE-6938: switch from svn to git


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/70e61fd9
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/70e61fd9
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/70e61fd9

Branch: refs/heads/master
Commit: 70e61fd9e04ba0312b9c1d3f6d6e8313ab0dce75
Parents: 6b6932e
Author: Mike McCandless <mikemccand@apache.org>
Authored: Wed Feb 10 17:55:07 2016 -0500
Committer: Mike McCandless <mikemccand@apache.org>
Committed: Wed Feb 10 17:56:39 2016 -0500

----------------------------------------------------------------------
 dev-tools/scripts/scriptutil.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/70e61fd9/dev-tools/scripts/scriptutil.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/scriptutil.py b/dev-tools/scripts/scriptutil.py
index 3494dff..71ade7a 100644
--- a/dev-tools/scripts/scriptutil.py
+++ b/dev-tools/scripts/scriptutil.py
@@ -97,19 +97,19 @@ def update_file(filename, line_re, edit):
 
 # branch types are "release", "stable" and "trunk"
 def find_branch_type():
-  output = subprocess.check_output('svn info', shell=True)
+  output = subprocess.check_output('git status', shell=True)
   for line in output.split(b'\n'):
-    if line.startswith(b'URL:'):
-      url = line.split(b'/')[-1]
+    if line.startswith(b'On branch '):
+      branchName = line.split(b' ')[-1]
       break
   else:
-    raise Exception('svn info missing repo URL')
+    raise Exception('git status missing branch name')
 
-  if url == b'trunk':
-    return 'trunk'
-  if url.startswith(b'branch_'):
+  if branchName == b'master':
+    return 'master'
+  if branchName.startswith(b'branch_'):
     return 'stable'
-  if url.startswith(b'lucene_solr_'):
+  if branchName.startswith(b'lucene_solr_'):
     return 'release'
   raise Exception('Cannot run bumpVersion.py on feature branch')
 


Mime
View raw message