Rev 1629: Fix wiki generation. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1629
revision-id: jelmer at samba.org-20080824135606-ey0wp0fo7ku2vxsl
parent: jelmer at samba.org-20080824125118-u7wewm29ugslipbg
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-08-24 15:56:06 +0200
message:
  Fix wiki generation.
modified:
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
  mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
  wiki.py                        wiki.py-20080708205255-vpo68letts9127kb-1
=== modified file 'commit.py'
--- a/commit.py	2008-08-23 21:41:57 +0000
+++ b/commit.py	2008-08-24 13:56:06 +0000
@@ -485,16 +485,8 @@
             for prop in self._svn_revprops:
                 if not properties.is_valid_property_name(prop):
                     warning("Setting property %r with invalid characters in name", prop)
-            if self.supports_custom_revprops:
-                self.editor = self.repository.transport.get_commit_editor(
-                        self._svn_revprops, done, None, False)
-                self._svn_revprops = {}
-            else:
-                # Try without bzr: revprops
-                self.editor = self.repository.transport.get_commit_editor({
-                    properties.PROP_REVISION_LOG: self._svn_revprops[properties.PROP_REVISION_LOG]},
-                    done, None, False)
-                del self._svn_revprops[properties.PROP_REVISION_LOG]
+            self.editor = self.repository.transport.get_commit_editor(
+                    self._svn_revprops, done, None, False)
 
             root = self.editor.open_root(self.base_revnum)
 
@@ -557,12 +549,6 @@
                 new_revprops[properties.PROP_REVISION_DATE] = properties.time_to_cstring(1000000*self._timestamp)
             set_svn_revprops(self.repository.transport, result_revision, new_revprops)
 
-        try:
-            set_svn_revprops(self.repository.transport, result_revision, 
-                         self._svn_revprops) 
-        except RevpropChangeFailed:
-            pass # Ignore for now
-
         return revid
 
     def record_entry_contents(self, ie, parent_invs, path, tree,

=== modified file 'mapping.py'
--- a/mapping.py	2008-08-23 21:41:57 +0000
+++ b/mapping.py	2008-08-24 13:56:06 +0000
@@ -383,8 +383,7 @@
         """
         raise NotImplementedError(self.export_text_parents)
 
-    def export_revision(self, can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, 
-                        revision_id, revno, merges, fileprops):
+    def export_revision(self, can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges, fileprops):
         """Determines the revision properties and branch root file 
         properties.
         """

=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py	2008-08-24 03:34:05 +0000
+++ b/mapping3/__init__.py	2008-08-24 13:56:06 +0000
@@ -330,7 +330,32 @@
 
 
 class BzrSvnMappingv3FileProps(mapping.BzrSvnMappingFileProps, BzrSvnMappingv3):
-    pass
+
+    def __init__(self, scheme, guessed_scheme=None):
+        mapping.BzrSvnMappingFileProps.__init__(self, scheme, guessed_scheme)
+        BzrSvnMappingv3.__init__(self, scheme, guessed_scheme)
+        self.revprop_map = mapping.BzrSvnMappingRevProps()
+
+    def export_text_parents(self, can_use_custom_revprops, text_parents, svn_revprops, fileprops):
+        mapping.BzrSvnMappingFileProps.export_text_parents(self, can_use_custom_revprops, text_parents, svn_revprops, fileprops)
+        if can_use_custom_revprops:
+            self.revprop_map.export_text_parents(can_use_custom_revprops, text_parents, svn_revprops, fileprops)
+
+    def export_revision(self, can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges, old_fileprops):
+        (_, fileprops) = mapping.BzrSvnMappingFileProps.export_revision(self, can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges, old_fileprops)
+        if can_use_custom_revprops:
+            (revprops, _) = self.revprop_map.export_revision(can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, None, revno, merges, old_fileprops)
+        return (revprops, fileprops)
+
+    def export_fileid_map(self, can_use_custom_revprops, fileids, revprops, fileprops):
+        mapping.BzrSvnMappingFileProps.export_fileid_map(self, can_use_custom_revprops, fileids, revprops, fileprops)
+        if can_use_custom_revprops:
+            self.revprop_map.export_fileid_map(can_use_custom_revprops, fileids, revprops, fileprops)
+
+    def export_message(self, can_use_custom_revprops, log, revprops, fileprops):
+        mapping.BzrSvnMappingFileProps.export_message(self, can_use_custom_revprops, log, revprops, fileprops)
+        if can_use_custom_revprops:
+            self.revprop_map.export_message(can_use_custom_revprops, log, revprops, fileprops)
 
 
 class BzrSvnMappingv3RevProps(mapping.BzrSvnMappingRevProps, BzrSvnMappingv3):

=== modified file 'wiki.py'
--- a/wiki.py	2008-08-09 12:13:53 +0000
+++ b/wiki.py	2008-08-24 13:56:06 +0000
@@ -34,11 +34,12 @@
 
     def version_sort(a, b):
         def versiontuple(a):
-            a = a.rstrip("~rc1")
+            if "~" in a:
+                a = a.split("~")[0]
             return [int(x) for x in a.split(".")]
         return cmp(versiontuple(a), versiontuple(b))
 
-    print versions
+    print repr(versions)
     versions.sort(version_sort, reverse=True)
 
     for version in versions: