changeset 488:a739568f8d48

Add a test for URLs that have spaces in them.
author Augie Fackler <durin42@gmail.com>
date Tue, 15 Sep 2009 21:57:17 -0400
parents 6b481331c355
children cd793ca555af
files hgsubversion/stupid.py tests/fixtures/spaces-in-path.sh tests/fixtures/spaces-in-path.svndump
diffstat 3 files changed, 284 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/stupid.py
+++ b/hgsubversion/stupid.py
@@ -551,6 +551,7 @@ def convert_rev(ui, meta, svn, r, tbdelt
     for b in branches:
 
         parentctx = meta.repo[meta.get_parent_revision(r.revnum, b)]
+        print parentctx
         if parentctx.branch() != (b or 'default'):
             check_deleted_branches.add(b)
 
@@ -592,6 +593,7 @@ def convert_rev(ui, meta, svn, r, tbdelt
             files_touched.remove(f)
 
         if parentctx.node() == node.nullid and not files_touched:
+            print 'skipping commit since parent is null and no files touched.'
             continue
 
         for f in files_touched:
new file mode 100755
--- /dev/null
+++ b/tests/fixtures/spaces-in-path.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+mkdir temp
+cd temp
+svnadmin create repo
+svn co file://`pwd`/repo wc
+cd wc
+mkdir branches trunk tags
+mkdir tags/versions
+mkdir tags/blah
+svn add *
+svn ci -m 'btt'
+cd trunk
+for a in alpha beta gamma delta ; do
+    echo $a > $a
+    svn add $a
+done
+svn ci -m 'Add files.'
+
+echo 'foo bar' > 'foo bar'
+svn add 'foo bar'
+svn ci -m 'Add files.'
+
+mkdir 'blah blah'
+echo 'another file' > 'blah blah/another file'
+svn add 'blah blah'
+svn ci -m 'Add files.'
+
+cd ..
+svn up
+svn cp trunk branches/dev_branch
+svn ci -m 'Make a branch'
+cd ../..
+
+svnadmin dump temp/repo > spaces-in-path.svndump
+echo
+echo 'Complete.'
+echo 'You probably want to clean up temp now.'
+echo 'Dump in spaces-in-path.svndump'
+exit 0
new file mode 100644
--- /dev/null
+++ b/tests/fixtures/spaces-in-path.svndump
@@ -0,0 +1,243 @@
+SVN-fs-dump-format-version: 2
+
+UUID: fbe42c69-30e8-40e8-8707-cf3ddc79d968
+
+Revision-number: 0
+Prop-content-length: 56
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2009-09-16T01:53:29.172947Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 102
+Content-length: 102
+
+K 7
+svn:log
+V 3
+btt
+K 10
+svn:author
+V 5
+augie
+K 8
+svn:date
+V 27
+2009-09-16T01:53:30.119780Z
+PROPS-END
+
+Node-path: branches
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: tags
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: tags/blah
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: tags/versions
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: trunk
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Revision-number: 2
+Prop-content-length: 110
+Content-length: 110
+
+K 7
+svn:log
+V 10
+Add files.
+K 10
+svn:author
+V 5
+augie
+K 8
+svn:date
+V 27
+2009-09-16T01:53:31.149862Z
+PROPS-END
+
+Node-path: trunk/alpha
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 6
+Text-content-md5: 9f9f90dbe3e5ee1218c86b8839db1995
+Text-content-sha1: d046cd9b7ffb7661e449683313d41f6fc33e3130
+Content-length: 16
+
+PROPS-END
+alpha
+
+
+Node-path: trunk/beta
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 5
+Text-content-md5: f0cf2a92516045024a0c99147b28f05b
+Text-content-sha1: 6c007a14875d53d9bf0ef5a6fc0257c817f0fb83
+Content-length: 15
+
+PROPS-END
+beta
+
+
+Node-path: trunk/delta
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 6
+Text-content-md5: d2840cc81bc032bd1141b56687d0f93c
+Text-content-sha1: 4bd6315d6d7824c4e376847ca7d116738ad2f29a
+Content-length: 16
+
+PROPS-END
+delta
+
+
+Node-path: trunk/gamma
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 6
+Text-content-md5: 303febb9068384eca46b5b6516843b35
+Text-content-sha1: 37f385b028bf2f93a4b497ca9ff44eea63945b7f
+Content-length: 16
+
+PROPS-END
+gamma
+
+
+Revision-number: 3
+Prop-content-length: 110
+Content-length: 110
+
+K 7
+svn:log
+V 10
+Add files.
+K 10
+svn:author
+V 5
+augie
+K 8
+svn:date
+V 27
+2009-09-16T01:53:32.079732Z
+PROPS-END
+
+Node-path: trunk/foo bar
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 8
+Text-content-md5: 5ceaa7ed396ccb8e959c02753cb4bd18
+Text-content-sha1: d53a205a336e07cf9eac45471b3870f9489288ec
+Content-length: 18
+
+PROPS-END
+foo bar
+
+
+Revision-number: 4
+Prop-content-length: 110
+Content-length: 110
+
+K 7
+svn:log
+V 10
+Add files.
+K 10
+svn:author
+V 5
+augie
+K 8
+svn:date
+V 27
+2009-09-16T01:53:33.091599Z
+PROPS-END
+
+Node-path: trunk/blah blah
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: trunk/blah blah/another file
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 13
+Text-content-md5: fb319cc56653b713a8c7a54aa92f6efd
+Text-content-sha1: 98f46145eb13fc9d662fb2d07fe9faf9969be54b
+Content-length: 23
+
+PROPS-END
+another file
+
+
+Revision-number: 5
+Prop-content-length: 113
+Content-length: 113
+
+K 7
+svn:log
+V 13
+Make a branch
+K 10
+svn:author
+V 5
+augie
+K 8
+svn:date
+V 27
+2009-09-16T01:53:36.062701Z
+PROPS-END
+
+Node-path: branches/dev_branch
+Node-kind: dir
+Node-action: add
+Node-copyfrom-rev: 4
+Node-copyfrom-path: trunk
+
+