<br />
<b>Deprecated</b>:  Assigning the return value of new by reference is deprecated in <b>/home/bluestat/public_html/source/index.php</b> on line <b>477</b><br />
From d057c894291911a5ad3984b25f709fa72df48727 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Thu, 28 Jan 2010 12:02:08 -0500
Subject: [PATCH] Add git-svn-sync.py

---
 git-svn-sync.py | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 152 insertions(+)
 create mode 100755 git-svn-sync.py

diff --git a/git-svn-sync.py b/git-svn-sync.py
new file mode 100755
index 0000000..4c2debd
--- /dev/null
+++ b/git-svn-sync.py
@@ -0,0 +1,152 @@
+#!/usr/bin/env python
+"""
+git-svn-sync.py
+Copyright (c) 2010, Robert Sesek <http://www.bluestatic.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+"""
+git-svn Sync:
+
+This program is an extension to git-svn-rebase that performs an checkout of
+svn:external definitions. Place this in PATH and run it from any git repository
+with that is cloned from SVN. Running this will perform a git-svn-rebase and
+will then update exteranls.
+
+The external checkouts can be either svn working copies, full git repositories,
+or shallow (no history) git repositories. The default is an SVN working copy.
+
+Usage:
+
+cd to/some/git-svn/repo/
+git svn sync -t [svn|git|shallow]
+"""
+
+import optparse
+import os
+import os.path
+import subprocess
+import sys
+
+def GitRepoPath():
+  """Returns the git repository root path."""
+  get_path = subprocess.Popen(["git", "rev-parse", "--show-cdup"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+  get_path.wait()
+  if get_path.stderr.readline():
+    return None
+  return os.path.abspath(os.path.join(os.getcwd(), get_path.stdout.readline().strip()))
+
+def IsGitSVN(path):
+  """Returns a boolean indicating whether the git repository is git-svn enabled."""
+  fp = open(path + '/.git/config', 'r')
+  lines = fp.readlines()
+  fp.close()
+  for line in lines:
+    if line.find('[svn-remote') >= 0:
+      return True
+  return False
+
+def GetExternals():
+  """Returns a list of all the defined svn:externals. Must be called from a git repository."""
+  get_externals = subprocess.Popen(["git", "svn", "show-externals"], stdout=subprocess.PIPE)
+  get_externals.wait()
+  if get_externals.returncode:
+    return None
+  raw_externals = get_externals.stdout.readlines()
+  externals = []
+  for ext in raw_externals:
+    ext = ext.strip()
+    if len(ext) > 0 and ext[0] != '#':
+      externals.append(ext.split())
+  return externals
+
+def GetSVNRoot():
+  """Returns the SVN repository root path. Must be called from a git repository."""
+  get_root = subprocess.Popen(["git", "svn", "info"], stdout=subprocess.PIPE)
+  get_root.wait()
+  if get_root.returncode:
+    return None
+  info = get_root.stdout.readlines()
+  for line in info:
+    root_str = 'Root:'
+    root_pos = line.find(root_str)
+    if root_pos >= 0:
+      trimmer = root_pos + len(root_str)
+      return line[trimmer:].strip()
+  return None
+
+def AddExclude(path, exclude):
+  """Adds a path to the .git/info/exclude file."""
+  fp = open(path + '/.git/info/exclude', 'r+')
+  lines = fp.readlines()
+  for line in lines:
+    if line.find(exclude) >= 0:
+      fp.close()
+      return
+  fp.write(exclude)
+  fp.close()
+
+def Main():
+  """Main function."""  
+  parser = optparse.OptionParser()
+  parser.add_option("-t", "--type", choices=["svn", "git", "shallow"], default="svn", help="Type of checkout to perform for new externals. Choices are svn,git,shallow. svn is default.")  
+  (options, args) = parser.parse_args()
+  if options.type != "svn":
+    print "Sorry, only svn clones are currently supported."
+    sys.exit(3)  
+
+  git_path = GitRepoPath()
+  if not git_path:
+    print "Please run this script from within a git repository."
+    sys.exit(1)
+  os.chdir(git_path)
+  
+  if not IsGitSVN(git_path):
+    print "This git repository was not cloned via git-svn."
+    sys.exit(2)
+  
+  # Important info for cloneing.
+  svn_root = GetSVNRoot()
+  externals = GetExternals()
+  
+  if len(externals) > 0:
+    if not os.path.exists(".git_sync"):
+      os.mkdir(".git_sync")
+  
+  for ext in externals:
+    # Fix up URLs that are relative to SVN repository root.
+    url = ext[0]
+    path = ext[1]
+    if url[0:3] == "/^/":
+      url = url[1:]
+    if url[0:2] == "^/":
+      url = svn_root + "/" + url[2:]
+    
+    # Split out revision information.
+    url_parts = url.split('@')
+    url = url_parts[0]
+    rev = url_parts[1]
+    sync_path = os.path.join(".git_sync", path)
+    
+    # Perform the actual checkout.
+    if os.path.exists(sync_path):
+      subprocess.Popen(["svn", "update", "-r", rev, sync_path]).wait()
+    else:
+      subprocess.Popen(["svn", "checkout", "-r", rev, url, sync_path]).wait()
+      os.symlink(sync_path, os.path.join(git_path, path))
+    AddExclude(git_path, sync_path)
+
+if __name__ == '__main__':
+  Main()
-- 
1.7.11.3