1
=== modified file 'modules/svn_oo/Revision.py'
2
--- modules/svn_oo/Revision.py	2009-06-16 08:37:12 +0000
3
+++ modules/svn_oo/Revision.py	2009-10-18 19:15:22 +0000
4
@@ -21,6 +21,8 @@
5
21
from svn_oo.SourceIterator import SourceIterator
21
from svn_oo.SourceIterator import SourceIterator
6
22
import svn_oo.util
22
import svn_oo.util
7
23
23
8
24
import urllib
9
25
10
24
26
11
25
class RevisionNumberError(Exception):
27
class RevisionNumberError(Exception):
12
26
    """Revision.number() cannot be used on this Revision instance.
28
    """Revision.number() cannot be used on this Revision instance.
13
@@ -103,7 +105,9 @@
14
103
        uuid = svn_wc_entry(self.path, adm, True).uuid
105
        uuid = svn_wc_entry(self.path, adm, True).uuid
15
104
        return {'cscvs-svn-branch-path': self.repoPrefix(),
106
        return {'cscvs-svn-branch-path': self.repoPrefix(),
16
105
                'cscvs-svn-repository-uuid': uuid,
107
                'cscvs-svn-repository-uuid': uuid,
18
106
                'cscvs-svn-revision-number': str(self.rev.number)}
108
                'cscvs-svn-revision-number': str(self.rev.number),
19
109
                'converted-from': 'svn %s:%d:%s\n' % (uuid, self.rev.number, urllib.quote(self.repoPrefix().strip("/")))
20
110
               }
21
107
111
22
108
    def get_log(self):
112
    def get_log(self):
23
109
        """My raw log, as an utf8 encoded str."""
113
        """My raw log, as an utf8 encoded str."""
24
110
114
25
=== modified file 'modules/svn_oo/tests/test_revision.py'
26
--- modules/svn_oo/tests/test_revision.py	2009-06-16 08:24:20 +0000
27
+++ modules/svn_oo/tests/test_revision.py	2009-10-18 19:15:22 +0000
28
@@ -137,7 +137,8 @@
29
137
        self.assertEqual(
137
        self.assertEqual(
30
138
            {'cscvs-svn-branch-path': 'modulefile1',
138
            {'cscvs-svn-branch-path': 'modulefile1',
31
139
             'cscvs-svn-repository-uuid': uuid,
139
             'cscvs-svn-repository-uuid': uuid,
33
140
             'cscvs-svn-revision-number': '1'},
140
             'cscvs-svn-revision-number': '1',
34
141
             'converted-from': 'svn %s:1:modulefile1\n' % uuid},
35
141
            self.rev1().get_extra_revprops())
142
            self.rev1().get_extra_revprops())
36
142
143
37
143
    def testGetDate(self):
144
    def testGetDate(self):
Status:	Merged
Merged at revision:	not available
Proposed branch:	lp:~jelmer/launchpad-cscvs/converted-from
Merge into:	lp:launchpad-cscvs
Diff against target:	37 lines 2 files modified modules/svn_oo/Revision.py (+5/-1) modules/svn_oo/tests/test_revision.py (+2/-1)
To merge this branch:	bzr merge lp:~jelmer/launchpad-cscvs/converted-from
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Paul Hummer (community)		2009-10-18	Approve on 2009-10-21
Review via email: mp+13542@code.launchpad.net