GitRevisionCollector: Change order of constructor arguments.

git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@5442 be7e6eca-30d4-0310-a8e5-ac0d63af7087

cvs2git-example.options

@@ -134,10 +134,6 @@ ctx.tmpdir = r'cvs2git-tmp'
 # chance of working with CVSNT repositories.  It invokes CVS or RCS to
 # reconstuct the contents of CVS file revisions:
 ctx.revision_collector = GitRevisionCollector(
-    # The file in which to write the git-fast-import stream that
-    # contains the file revision contents:
-    'cvs2git-tmp/git-blob.dat',
-
     # The following option specifies how the revision contents of the
     # RCS files should be read.
     #
@@ -162,6 +158,10 @@ ctx.revision_collector = GitRevisionCollector(
     # Uncomment one of the two following lines:
     #RCSRevisionReader(co_executable=r'co'),
     CVSRevisionReader(cvs_executable=r'cvs'),
+
+    # The file in which to write the git-fast-import stream that
+    # contains the file revision contents:
+    blob_filename='cvs2git-tmp/git-blob.dat',
     )
 # This second alternative is vastly faster than the version above.  It
 # uses an external Python program to reconstruct the contents of CVS

cvs2svn_lib/git_revision_collector.py

@@ -24,9 +24,9 @@
 class GitRevisionCollector(RevisionCollector):
   """Output file revisions to git-fast-import."""
 
-  def __init__(self, blob_filename, revision_reader):
-    self.blob_filename = blob_filename
+  def __init__(self, revision_reader, blob_filename):
     self.revision_reader = revision_reader
+    self.blob_filename = blob_filename
 
   def register_artifacts(self, which_pass):
     self.revision_reader.register_artifacts(which_pass)

cvs2svn_lib/git_run_options.py

@@ -181,7 +181,7 @@ def process_extraction_options(self):
             cvs_executable=options.cvs_executable
             )
       ctx.revision_collector = GitRevisionCollector(
-          options.blobfile, revision_reader,
+          revision_reader, options.blobfile,
           )
 
   def process_output_options(self):