lucene-solr git commit: LUCENE-6938: switch from svn to git

[mi...@apache.org]

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_5_5 5d106503e -> 7a329d4e2


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/7a329d4e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7a329d4e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7a329d4e

Branch: refs/heads/branch_5_5
Commit: 7a329d4e299f364a716ca7e3d786684f280d0100
Parents: 5d10650
Author: Mike McCandless <mi...@apache.org>
Authored: Wed Feb 10 17:55:07 2016 -0500
Committer: Mike McCandless <mi...@apache.org>
Committed: Wed Feb 10 17:55:07 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/7a329d4e/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')