Rev 620: Merge 0.4. in file:///data/jelmer/bzr-svn/revprops/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/revprops/

------------------------------------------------------------
revno: 620
revision-id:jelmer at samba.org-20080201154204-cvfxae69hkcl3dh4
parent: jelmer at samba.org-20080201145634-584f22huhiha50bu
parent: jelmer at samba.org-20080201154001-9qtr3abggncffphn
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: revprops
timestamp: Fri 2008-02-01 16:42:04 +0100
message:
  Merge 0.4.
modified:
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
    ------------------------------------------------------------
    revno: 579.1.310
    revision-id:jelmer at samba.org-20080201154001-9qtr3abggncffphn
    parent: jelmer at samba.org-20080201152330-t1p3zz1jgfhjh8n2
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-02-01 16:40:01 +0100
    message:
      Determine file ids before doing anything else (allows setting them in the revision properties).
    modified:
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
    ------------------------------------------------------------
    revno: 579.1.309
    revision-id:jelmer at samba.org-20080201152330-t1p3zz1jgfhjh8n2
    parent: jelmer at samba.org-20080201152310-yy5elmpnsce49z1q
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-02-01 16:23:30 +0100
    message:
      Add example pre-revprop-change hook.
    added:
      pre-revprop-change.example     prerevpropchange.exa-20071214160928-9g7oevg3tlky780a-1
    ------------------------------------------------------------
    revno: 579.1.308
    revision-id:jelmer at samba.org-20080201152310-yy5elmpnsce49z1q
    parent: jelmer at samba.org-20080201145120-5v2rvp1556pzfod4
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-02-01 16:23:10 +0100
    message:
      Add docstrings.
    modified:
      mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
=== modified file 'mapping.py'
--- a/mapping.py	2008-02-01 13:52:13 +0000
+++ b/mapping.py	2008-02-01 15:42:04 +0000
@@ -276,6 +276,12 @@
 
 
 class BzrSvnMappingv1(BzrSvnMapping):
+    """This was the initial version of the mappings as used by bzr-svn
+    0.2.
+    
+    It does not support pushing revisions to Subversion as-is, but only 
+    as part of a merge.
+    """
     @staticmethod
     def parse_revision_id(revid):
         assert revid.startswith("svn-v1:")
@@ -290,6 +296,9 @@
 
 
 class BzrSvnMappingv2(BzrSvnMapping):
+    """The second version of the mappings as used in the 0.3.x series.
+
+    """
     @staticmethod
     def parse_revision_id(revid):
         assert revid.startswith("svn-v2:")
@@ -304,6 +313,9 @@
 
 
 class BzrSvnMappingv3(BzrSvnMapping):
+    """The third version of the mappings as used in the 0.4.x series.
+
+    """
     revid_prefix = "svn-v3-"
 
     @classmethod
@@ -321,6 +333,8 @@
 
         scheme = version[len(cls.revid_prefix):]
 
+        # Some older versions of bzr-svn 0.4 did not always set a branching
+        # scheme but set "undefined" instead.
         if scheme == "undefined":
             scheme = None