subrepo/svn: make rev number retrieval compatible with svn 1.5 (issue2968) stable
authorThomas Arendsen Hein <thomas@intevation.de>
Tue, 26 Jun 2012 14:27:33 +0200
branchstable
changeset 17035 ba0286e149aa
parent 17034 75fd9d1cf638
child 17036 ab4644c3064f
child 17041 86a3bb9c5f5c
subrepo/svn: make rev number retrieval compatible with svn 1.5 (issue2968) ae2664ee0223 introduced "svn info TARGET@REV" to determine if a certain path exists in the specified revision, but in svn 1.5 the error message "Not a valid URL" yields exit code 0 so the error is not caught. Use "svn list TARGET@REV" instead which works with svn 1.5 and is even faster in some situations.
mercurial/subrepo.py
--- a/mercurial/subrepo.py	Tue Jun 26 12:17:40 2012 +0200
+++ b/mercurial/subrepo.py	Tue Jun 26 14:27:33 2012 +0200
@@ -730,7 +730,7 @@
             # URL exists at lastrev.  Test it and fallback to rev it
             # is not there.
             try:
-                self._svncommand(['info', '%s@%s' % (self._state[0], lastrev)])
+                self._svncommand(['list', '%s@%s' % (self._state[0], lastrev)])
                 return lastrev
             except error.Abort:
                 pass