Rev 1530: Eliminate WeaveRevisionBuildEditor. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1530
revision-id: jelmer at samba.org-20080802191628-odxvdgh2wib7x246
parent: jelmer at samba.org-20080802191340-73p9go8yl8l1690l
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-08-02 21:16:28 +0200
message:
  Eliminate WeaveRevisionBuildEditor.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
=== modified file 'fetch.py'
--- a/fetch.py	2008-08-02 19:13:40 +0000
+++ b/fetch.py	2008-08-02 19:16:28 +0000
@@ -429,7 +429,14 @@
         return (rev, signature)
 
     def _finish_commit(self):
-        raise NotImplementedError(self._finish_commit)
+        (rev, signature) = self._get_revision(self.revid)
+        self.inventory.revision_id = self.revid
+        # Escaping the commit message is really the task of the serialiser
+        rev.message = _escape_commit_message(rev.message)
+        rev.inventory_sha1 = None
+        self.target.add_revision(self.revid, rev, self.inventory)
+        if signature is not None:
+            self.target.add_signature_text(self.revid, signature)
 
     def _rename(self, file_id, parent_id, old_path, new_path, kind):
         assert isinstance(new_path, unicode)
@@ -465,29 +472,6 @@
         self.delta.removed.append((path, file_id, 'unknown-kind'))
 
 
-class WeaveRevisionBuildEditor(RevisionBuildEditor):
-    """Subversion commit editor that can write to a weave-based repository.
-    """
-    def _finish_commit(self):
-        (rev, signature) = self._get_revision(self.revid)
-        self.inventory.revision_id = self.revid
-        # Escaping the commit message is really the task of the serialiser
-        rev.message = _escape_commit_message(rev.message)
-        rev.inventory_sha1 = None
-        self.target.add_revision(self.revid, rev, self.inventory)
-        if signature is not None:
-            self.target.add_signature_text(self.revid, signature)
-
-
-def get_revision_build_editor(repository):
-    """Obtain a RevisionBuildEditor for a particular target repository.
-    
-    :param repository: Repository to obtain the buildeditor for.
-    :return: Class object of class descending from RevisionBuildEditor
-    """
-    return WeaveRevisionBuildEditor
-
-
 def report_inventory_contents(reporter, inv, revnum, start_empty):
     try:
         reporter.set_path("", revnum, start_empty)
@@ -627,8 +611,6 @@
         num = 0
         prev_inv = None
 
-        revbuildklass = get_revision_build_editor(self.target)
-
         try:
             for (revid, parent_revid, revmeta) in revids:
                 assert revid != NULL_REVISION
@@ -655,7 +637,7 @@
                 if not self.target.is_in_write_group():
                     self.target.start_write_group()
                 try:
-                    editor = revbuildklass(self.source, self.target, revid, parent_inv, revmeta)
+                    editor = RevisionBuildEditor(self.source, self.target, revid, parent_inv, revmeta)
                     try:
                         conn = None
                         try: