hgsubversion: tests/test_util.py comparison

Merge with stable. This includes the force-disabling of stupid mode on Subversion 1.9 and later.

comparison

equal deleted inserted replaced

-:a279eb7185d4
+:5ddb35c31097
 from mercurial import ui
 from mercurial import util as hgutil
 from mercurial import extensions
 from hgsubversion import compathacks
+from hgsubversion import svnwrap
 try:
 from mercurial import obsolete
 obsolete._enabled
 except ImportError:
 args = ['svn', 'propget', '-r', str(rev), prop, path]
 p = subprocess.Popen(args,
 stdout=subprocess.PIPE,
 stderr=subprocess.STDOUT)
 stdout, stderr = p.communicate()
-if p.returncode:
+if p.returncode and stderr:
 raise Exception('svn ls failed on %s: %r' % (path, stderr))
+if 'W200017' in stdout:
+# subversion >= 1.9 changed 'no properties' to be an error, so let's
+# avoid that
+return ''
 return stdout.strip()
 def _obsolete_wrap(cls, name):
 origfunc = getattr(cls, name)
 def __init__(cls, *args, **opts):
 if cls.obsolete_mode_tests:
 for origname in dir(cls):
 _obsolete_wrap(cls, origname)
-if cls.stupid_mode_tests:
+if cls.stupid_mode_tests and svnwrap.subversion_version < (1, 9, 0):
 for origname in dir(cls):
 _stupid_wrap(cls, origname)
 return super(TestMeta, cls).__init__(*args, **opts)
 summary:   {desc|firstline}
 files:     {files}
 """
 _ui.pushbuffer()
-graphlog.graphlog(_ui, repo, rev=None, template=templ)
+try:
+graphlog.graphlog(_ui, repo, rev=None, template=templ)
+except AttributeError:
+from mercurial import commands
+commands.log(_ui, repo, rev=None, template=templ, graph=True)
 return _ui.popbuffer()
 def draw(self, repo):
 sys.stdout.write(self.getgraph(repo))

Mercurial > hgsubversion