Mercurial > hgsubversion

changeset 541:d380e7e4175a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Extend issue119 to full original weirdness
author Patrick Mezard <pmezard@gmail.com>
date Tue, 02 Feb 2010 21:36:08 +0100
parents 8dc759dc9ca9
children bb00f7ca5b8c
files tests/fixtures/renametagdir.sh tests/fixtures/renametagdir.svndump tests/test_tags.py
diffstat 3 files changed, 116 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/tests/fixtures/renametagdir.sh
+++ b/tests/fixtures/renametagdir.sh
@@ -23,6 +23,9 @@ svn up
 cd ..
 svn cp -m 'First tag.' $REPO/branches/test@3 $REPO/tags/test-0.1
 svn cp -m 'Weird tag.' $REPO/branches/test@3 $REPO/tags/test-0.1/test
+svn mv -m 'Fix tag pt 1.' $REPO/tags/test-0.1/test $REPO/tags/test-0.1-real
+svn rm -m 'Remove weird.' $REPO/tags/test-0.1
+svn mv -m 'Fix tag pt 2.' $REPO/tags/test-0.1-real $REPO/tags/test-0.1
 
 cd ..
 svnadmin dump temp/repo > renametagdir.svndump
--- a/tests/fixtures/renametagdir.svndump
+++ b/tests/fixtures/renametagdir.svndump
@@ -1,6 +1,6 @@
 SVN-fs-dump-format-version: 2
 
-UUID: a0c6ec72-28b3-4974-bd95-6d36963afc51
+UUID: b3e24de6-f874-406f-9561-e48db081ff5e
 
 Revision-number: 0
 Prop-content-length: 56
@@ -9,7 +9,7 @@ Content-length: 56
 K 8
 svn:date
 V 27
-2010-01-16T19:26:17.747443Z
+2010-01-20T12:58:05.107637Z
 PROPS-END
 
 Revision-number: 1
@@ -27,7 +27,7 @@ pmezard
 K 8
 svn:date
 V 27
-2010-01-16T19:26:18.096428Z
+2010-01-20T12:58:06.111903Z
 PROPS-END
 
 Node-path: branches
@@ -72,7 +72,7 @@ pmezard
 K 8
 svn:date
 V 27
-2010-01-16T19:26:19.083966Z
+2010-01-20T12:58:07.088858Z
 PROPS-END
 
 Node-path: trunk/a
@@ -103,7 +103,7 @@ pmezard
 K 8
 svn:date
 V 27
-2010-01-16T19:26:22.053451Z
+2010-01-20T12:58:10.062719Z
 PROPS-END
 
 Node-path: branches/test
@@ -128,7 +128,7 @@ pmezard
 K 8
 svn:date
 V 27
-2010-01-16T19:26:24.099798Z
+2010-01-20T12:58:12.060717Z
 PROPS-END
 
 Node-path: tags/test-0.1
@@ -153,7 +153,7 @@ pmezard
 K 8
 svn:date
 V 27
-2010-01-16T19:26:24.191458Z
+2010-01-20T12:58:12.110400Z
 PROPS-END
 
 Node-path: tags/test-0.1/test
@@ -163,3 +163,83 @@ Node-copyfrom-rev: 3
 Node-copyfrom-path: branches/test
 
 
+Revision-number: 6
+Prop-content-length: 115
+Content-length: 115
+
+K 7
+svn:log
+V 13
+Fix tag pt 1.
+K 10
+svn:author
+V 7
+pmezard
+K 8
+svn:date
+V 27
+2010-01-20T12:58:12.169328Z
+PROPS-END
+
+Node-path: tags/test-0.1/test
+Node-action: delete
+
+
+Node-path: tags/test-0.1-real
+Node-kind: dir
+Node-action: add
+Node-copyfrom-rev: 5
+Node-copyfrom-path: tags/test-0.1/test
+
+
+Revision-number: 7
+Prop-content-length: 115
+Content-length: 115
+
+K 7
+svn:log
+V 13
+Remove weird.
+K 10
+svn:author
+V 7
+pmezard
+K 8
+svn:date
+V 27
+2010-01-20T12:58:12.212355Z
+PROPS-END
+
+Node-path: tags/test-0.1
+Node-action: delete
+
+
+Revision-number: 8
+Prop-content-length: 115
+Content-length: 115
+
+K 7
+svn:log
+V 13
+Fix tag pt 2.
+K 10
+svn:author
+V 7
+pmezard
+K 8
+svn:date
+V 27
+2010-01-20T12:58:12.317421Z
+PROPS-END
+
+Node-path: tags/test-0.1
+Node-kind: dir
+Node-action: add
+Node-copyfrom-rev: 7
+Node-copyfrom-path: tags/test-0.1-real
+
+
+Node-path: tags/test-0.1-real
+Node-action: delete
+
+
--- a/tests/test_tags.py
+++ b/tests/test_tags.py
@@ -211,9 +211,9 @@ rename a tag
             return 'hg=%s@%d:svn=%s@%s' % (branch, ctx.rev(), path, rev)
 
         w = fp.write
+        desc = ctx.description().splitlines()[0].strip()
         if '.hgtags' not in ctx or not ctx['.hgtags'].data().strip():
             return
-        desc = ctx.description().splitlines()[0].strip()
         w('node: %s\n' % formatnode(ctx))
         w('%s\n' % desc)
         for line in ctx['.hgtags'].data().splitlines(False):
@@ -245,6 +245,31 @@ node: hg=test@3:svn=branches/test@5
 Weird tag.
   test-0.1: hg=test@1:svn=branches/test@3
   test-0.1/test: hg=test@1:svn=branches/test@3
+
+node: hg=test@4:svn=branches/test@6
+Fix tag pt 1.
+  test-0.1: hg=test@1:svn=branches/test@3
+  test-0.1/test: hg=test@1:svn=branches/test@3
+  test-0.1/test: hg=default@-1:svn=unk@unk
+  test-0.1-real: hg=test@1:svn=branches/test@3
+
+node: hg=test@5:svn=branches/test@7
+Remove weird.
+  test-0.1: hg=test@1:svn=branches/test@3
+  test-0.1/test: hg=test@1:svn=branches/test@3
+  test-0.1/test: hg=default@-1:svn=unk@unk
+  test-0.1-real: hg=test@1:svn=branches/test@3
+  test-0.1: hg=default@-1:svn=unk@unk
+
+node: hg=test@6:svn=branches/test@8
+Fix tag pt 2.
+  test-0.1: hg=test@1:svn=branches/test@3
+  test-0.1/test: hg=test@1:svn=branches/test@3
+  test-0.1/test: hg=default@-1:svn=unk@unk
+  test-0.1-real: hg=test@1:svn=branches/test@3
+  test-0.1: hg=default@-1:svn=unk@unk
+  test-0.1-real: hg=default@-1:svn=unk@unk
+  test-0.1: hg=test@1:svn=branches/test@3
 """
         self._test_tags('renametagdir.svndump', expected, stupid=stupid)