Changeset 862 in tailor

Timestamp:

09/29/05 22:56:37 (8 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Hash name:

20050929205637-d4f9e-1fa7321184c34256921544a69ddd7fc92ed16e09

Message:

bzrng-source-support
Add initial support for Bzr as source repository.

File:

• vcpx/bzrng.py (modified) (3 diffs)

vcpx/bzrng.py

@@ -3 +3 @@
 # :Creato:   Fri Aug 19 01:06:08 CEST 2005
 # :Autore:   Johan Rydberg <jrydberg@gnu.org>
+#            Jelmer Vernooij <jelmer@samba.org>
 # :Licenza:  GNU General Public License
 #
@@ -12 +13 @@
 __docformat__ = 'reStructuredText'
 
+from source import UpdatableSourceWorkingDir
 from target import SyncronizableTargetWorkingDir, TargetInitializationFailure
 from bzrlib.branch import Branch
@@ -21 +23 @@
 import re
 
-class BzrngWorkingDir(SyncronizableTargetWorkingDir):
+class BzrngWorkingDir(UpdatableSourceWorkingDir, SyncronizableTargetWorkingDir):
+    ## UpdatableSourceWorkingDir
+
+    """
+    Generate changeset for the given BzrNg revision
+    """
+    def _changesetFromRevision(self, parent, revision):
+        from changes import ChangesetEntry, Changeset
+        from datetime import datetime
+        r = parent.get_revision(revision)
+            
+        deltatree = parent.get_revision_delta(parent.revision_id_to_revno(revision))
+        entries = []
+
+        for delta in deltatree.added:
+            e = ChangesetEntry(delta[0])
+            e.action_kind = ChangesetEntry.ADDED
+            entries.append(e)
+            
+        for delta in deltatree.removed:
+            e = ChangesetEntry(delta[0])
+            e.action_kind = ChangesetEntry.DELETED
+            entries.append(e)
+            
+        for delta in deltatree.renamed:
+            e = ChangesetEntry(delta[1])
+            e.action_kind = ChangesetEntry.RENAMED
+            e.old_name = delta[2]
+            entries.append(e)
+
+        for delta in deltatree.modified:
+            e = ChangesetEntry(delta[0])
+            e.action_kind = ChangesetEntry.UPDATED
+            entries.append(e)
+
+        return Changeset(r.revision_id, 
+                              datetime.fromtimestamp(r.timestamp),
+                              r.committer, 
+                              r.message,
+                              entries)
+   
+    """
+    See what other revisions exist upstream and return them
+    """
+    def _getUpstreamChangesets(self, sincerev):
+        parent = Branch.open(self.repository.repository)
+
+        revisions = self._b.missing_revisions(parent)
+
+        changesets = [self._changesetFromRevision(parent, ri) for ri in revisions]
+        
+        return changesets
+
+    """
+    Apply given remote revision to workingdir
+    """
+    def _applyChangeset(self, changeset):
+        self._b.append_revision(changeset.revision_id)
+        return [] # No conflicts for now
+
+    """
+    Initial checkout, equivalent of 'bzr branch -r ... '
+    """
+    def _checkoutUpstreamRevision(self, revision):
+        from bzrlib.clone import copy_branch
+
+        parent = Branch.open(self.repository.repository)
+
+        if revision == "INITIAL":
+            self._b = copy_branch(parent, self.basedir)
+        else:
+            self._b = copy_branch(parent, self.basedir, revision)
+
+        return self._changesetFromRevision(parent, parent.last_revision())
+
+    ## SyncronizableTargetWorkingDir
+    
     def _addPathnames(self, entries):
         # This method may get invoked several times with the same