Author: danielsh
Date: Thu Apr 21 20:50:14 2011
New Revision: 1095817
URL: http://svn.apache.org/viewvc?rev=1095817&view=rev
Log:
Separate user-serviceable parts.
* contrib/server-side/fsfsfixer/fixer/config.py: New.
* contrib/server-side/fsfsfixer/fixer/fix-rev.py
(config): New import.
(SVNADMIN, SVNLOOK, VERBOSE):
Move to config.py, but keep them in the same namespace.
Added:
subversion/trunk/contrib/server-side/fsfsfixer/fixer/config.py
Modified:
subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py
Added: subversion/trunk/contrib/server-side/fsfsfixer/fixer/config.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/contrib/server-side/fsfsfixer/fixer/config.py?rev=1095817&view=auto
==============================================================================
--- subversion/trunk/contrib/server-side/fsfsfixer/fixer/config.py (added)
+++ subversion/trunk/contrib/server-side/fsfsfixer/fixer/config.py Thu Apr 21
20:50:14 2011
@@ -0,0 +1,10 @@
+# ----------------------------------------------------------------------
+# Configuration
+# (edit this file locally as required)
+
+# Path and file name of the 'svnadmin' and 'svnlook' programs
+SVNADMIN = 'svnadmin'
+SVNLOOK = 'svnlook'
+
+# Verbosity: True for verbose, or False for quiet
+VERBOSE = True
Modified: subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py?rev=1095817&r1=1095816&r2=1095817&view=diff
==============================================================================
--- subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py (original)
+++ subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py Thu Apr 21
20:50:14 2011
@@ -11,20 +11,14 @@ import os, sys, re, subprocess
from subprocess import Popen, PIPE
from find_good_id import FixError, rev_file_path, find_good_id,
find_good_rep_header
+from config import *
# ----------------------------------------------------------------------
-# Configuration
+# Globals
-# Path and file name of the 'svnadmin' and 'svnlook' programs
-SVNADMIN = 'svnadmin'
-SVNLOOK = 'svnlook'
-
-# Verbosity: True for verbose, or False for quiet
-VERBOSE = True
-
-URL = "$URL$"[6:-2]
# URL = dirname(dirname(URL))
+URL = "$URL$"[6:-2]
URL = URL[:URL.rindex('/', 0, URL.rindex('/'))]
# Global dictionaries recording the fixes made