Launchpad CSCVS

Merge lp://staging/~jelmer/launchpad-cscvs/converted-from into lp://staging/launchpad-cscvs

  1. converted-from
  2. Merge into devel
Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~jelmer/launchpad-cscvs/converted-from
Merge into: lp://staging/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://staging/~jelmer/launchpad-cscvs/converted-from
Reviewer Review Type Date Requested Status
Paul Hummer (community) Approve
Review via email: mp+13542@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

This makes svn2bzr set the 'converted-from' property as described in http://bazaar-vcs.org/ConvertedRevisionProperty

Revision history for this message
Paul Hummer (rockstar) wrote :

Are you going to need someone to land this for you?

review: Approve
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

> Are you going to need someone to land this for you?
Yes, please.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

> > Are you going to need someone to land this for you?
> Yes, please.
.. and thanks for the review :-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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 from svn_oo.SourceIterator import SourceIterator
6 import svn_oo.util
7
8+import urllib
9+
10
11 class RevisionNumberError(Exception):
12 """Revision.number() cannot be used on this Revision instance.
13@@ -103,7 +105,9 @@
14 uuid = svn_wc_entry(self.path, adm, True).uuid
15 return {'cscvs-svn-branch-path': self.repoPrefix(),
16 'cscvs-svn-repository-uuid': uuid,
17- 'cscvs-svn-revision-number': str(self.rev.number)}
18+ 'cscvs-svn-revision-number': str(self.rev.number),
19+ 'converted-from': 'svn %s:%d:%s\n' % (uuid, self.rev.number, urllib.quote(self.repoPrefix().strip("/")))
20+ }
21
22 def get_log(self):
23 """My raw log, as an utf8 encoded str."""
24
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 self.assertEqual(
30 {'cscvs-svn-branch-path': 'modulefile1',
31 'cscvs-svn-repository-uuid': uuid,
32- 'cscvs-svn-revision-number': '1'},
33+ 'cscvs-svn-revision-number': '1',
34+ 'converted-from': 'svn %s:1:modulefile1\n' % uuid},
35 self.rev1().get_extra_revprops())
36
37 def testGetDate(self):

Subscribers

People subscribed via source and target branches