Patchwork [Bug,3796] New: test-convert-hg-svn.t fails with svn 1.7.8

login
register
mail settings
Submitter mercurial-bugs@selenic.com
Date Jan. 31, 2013, 2:54 a.m.
Message ID <bug-3796-285@http.bz.selenic.com/>
Download mbox | patch
Permalink /patch/773/
State Not Applicable
Headers show

Comments

mercurial-bugs@selenic.com - Jan. 31, 2013, 2:54 a.m.
http://bz.selenic.com/show_bug.cgi?id=3796

          Priority: normal
            Bug ID: 3796
                CC: mercurial-devel@selenic.com
          Assignee: bugzilla@selenic.com
           Summary: test-convert-hg-svn.t fails with svn 1.7.8
          Severity: bug
    Classification: Unclassified
                OS: Mac OS
          Reporter: foozy@lares.dti.ne.jp
          Hardware: Macintosh
            Status: UNCONFIRMED
           Version: 2.5-rc
         Component: convert
           Product: Mercurial

On MacOS, test-convert-hg-svn.t fails with svn version
1.7.8 (r1419691) of Homebrew, even though it finishes
successfully with svn version 1.6.18 (r1303927) of XCode.

-  sorting...
-  converting...

ERROR: /Users/fujiwara/repos/hg/tests/test-convert-hg-svn.t output changed and
returned error code 1
!
Failed test-convert-hg-svn.t: output changed and returned error code 1
========================================

With --traceback, "hg convert" shows traceback below:

========================================
   $ hg --traceback convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg |
grep -v initializing
-  scanning source...
-  sorting...
-  converting...
-  0 added a
+  Traceback (most recent call last):
+    File
"/private/var/folders/lw/h270bqsd7gj04kb4t2b_cwk00000gn/T/hgtests.u1UHjE/install/lib/python/hgext/convert/subversion.py",
line 264, in __init__
+      self.transport = transport.SvnRaTransport(url=self.url)
+    File
"/private/var/folders/lw/h270bqsd7gj04kb4t2b_cwk00000gn/T/hgtests.u1UHjE/install/lib/python/hgext/convert/transport.py",
line 94, in __init__
+      raise NotBranchError(url)
+  NotBranchError: file://$TESTTMP/svn-repo-wc
+  Traceback (most recent call last):
+    File
"/private/var/folders/lw/h270bqsd7gj04kb4t2b_cwk00000gn/T/hgtests.u1UHjE/install/lib/python/mercurial/dispatch.py",
line 88, in _runcatch
+      return _dispatch(req)
+    File
"/private/var/folders/lw/h270bqsd7gj04kb4t2b_cwk00000gn/T/hgtests.u1UHjE/install/lib/python/mercurial/dispatch.py",
line 743, in _dispatch
+      cmdpats, cmdoptions)
+    File
"/private/var/folders/lw/h270bqsd7gj04kb4t2b_cwk00000gn/T/hgtests.u1UHjE/install/lib/python/mercurial/dispatch.py",
line 514, in runcommand
+      ret = _runcommand(ui, options, cmd, d)
+    File
"/private/var/folders/lw/h270bqsd7gj04kb4t2b_cwk00000gn/T/hgtests.u1UHjE/install/lib/python/mercurial/dispatch.py",
line 833, in _runcommand
+      return checkargs()
+    File
"/private/var/folders/lw/h270bqsd7gj04kb4t2b_cwk00000gn/T/hgtests.u1UHjE/install/lib/python/mercurial/dispatch.py",
line 804, in checkargs
+      return cmdfunc()
+    File
"/private/var/folders/lw/h270bqsd7gj04kb4t2b_cwk00000gn/T/hgtests.u1UHjE/install/lib/python/mercurial/dispatch.py",
line 740, in <lambda>
+      d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
+    File
"/private/var/folders/lw/h270bqsd7gj04kb4t2b_cwk00000gn/T/hgtests.u1UHjE/install/lib/python/mercurial/util.py",
line 475, in check
+      return func(*args, **kwargs)
+    File
"/private/var/folders/lw/h270bqsd7gj04kb4t2b_cwk00000gn/T/hgtests.u1UHjE/install/lib/python/hgext/convert/__init__.py",
line 279, in convert
+      return convcmd.convert(ui, src, dest, revmapfile, **opts)
+    File
"/private/var/folders/lw/h270bqsd7gj04kb4t2b_cwk00000gn/T/hgtests.u1UHjE/install/lib/python/hgext/convert/convcmd.py",
line 443, in convert
+      opts.get('rev'))
+    File
"/private/var/folders/lw/h270bqsd7gj04kb4t2b_cwk00000gn/T/hgtests.u1UHjE/install/lib/python/hgext/convert/convcmd.py",
line 62, in convertsource
+      raise util.Abort(_('%s: missing or unsupported repository') % path)
+  Abort: $TESTTMP/svn-repo-wc: missing or unsupported repository
+  abort: $TESTTMP/svn-repo-wc: missing or unsupported repository
+  file://$TESTTMP/svn-repo-wc does not look like a Subversion repository
========================================

Patch

========================================
--- /Users/fujiwara/repos/hg/tests/test-convert-hg-svn.t
+++ /Users/fujiwara/repos/hg/tests/test-convert-hg-svn.t.err
@@ -44,62 +44,30 @@ 
 initial roundtrip

   $ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg | grep -v
initializing
-  scanning source...
-  sorting...
-  converting...
-  0 added a
+  abort: $TESTTMP/svn-repo-wc: missing or unsupported repository
+  file://$TESTTMP/svn-repo-wc does not look like a Subversion repository
   $ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
-  scanning source...
-  sorting...
-  converting...
+  $TESTTMP/svn-repo-hg is not a local Mercurial repository
+  abort: $TESTTMP/svn-repo-hg: missing or unsupported repository
+  [255]

 second roundtrip should do nothing

   $ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg
-  scanning source...
-  sorting...
-  converting...
+  initializing destination $TESTTMP/svn-repo-hg repository
+  file://$TESTTMP/svn-repo-wc does not look like a Subversion repository
+  abort: $TESTTMP/svn-repo-wc: missing or unsupported repository
+  [255]
   $ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
-  scanning source...
-  sorting...
-  converting...
+  $TESTTMP/svn-repo-hg is not a local Mercurial repository
+  abort: $TESTTMP/svn-repo-hg: missing or unsupported repository
+  [255]

 new hg rev

   $ hg clone "$SVNREPOPATH"-hg "$SVNREPOPATH"-work
-  updating to branch default
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  abort: repository $TESTTMP/svn-repo-hg not found!
+  [255]
   $ cd "$SVNREPOPATH"-work
+  /var/folders/lw/h270bqsd7gj04kb4t2b_cwk00000gn/T/tmp5hH894hg-tst: line 57:
cd: $TESTTMP/svn-repo-work: No such file or directory
   $ echo b > b
-  $ hg add b
-  $ hg ci -mb
-
-adding an empty revision
-
-  $ hg qnew -m emtpy empty
-  $ hg qfinish -a
-  $ cd ..
-
-echo hg to svn
-
-  $ hg --cwd "$SVNREPOPATH"-hg pull -q "$SVNREPOPATH"-work
-  $ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
-  scanning source...
-  sorting...
-  converting...
-  1 b
-  0 emtpy
-
-svn back to hg should do nothing
-
-  $ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg
-  scanning source...
-  sorting...
-  converting...
-
-hg back to svn should do nothing
-
-  $ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
-  scanning source...