# HG changeset patch # User Dan Villiom Podlaski Christiansen # Date 1281549454 -7200 # Node ID 5c94a86ddd73bef81f1a87c5694b0f2c8b29b7b5 # Parent 1086bd6f6aa4f2c357567cae7c52982fe0ffa24e version: mention bindings type in version In addition, the version output has been rejiggered a bit to mention the version of hgsubversion first. While at it, `svn' is changed to `Subversion', as this is its the proper name. Before: % hg version --svn ... svn bindings: 1.6.12 hgsubversion: 1.1.2+45-123ac53a6343 After: % hg version --svn ... hgsubversion: 1.1.2+45-123ac53a6343 Subversion: 1.6.12 bindings: SWIG diff --git a/hgsubversion/svnwrap/svn_swig_wrapper.py b/hgsubversion/svnwrap/svn_swig_wrapper.py --- a/hgsubversion/svnwrap/svn_swig_wrapper.py +++ b/hgsubversion/svnwrap/svn_swig_wrapper.py @@ -34,7 +34,7 @@ if current_bindings < required_bindings: (required_bindings + current_bindings)) def version(): - return '%d.%d.%d' % current_bindings + return '%d.%d.%d' % current_bindings, 'SWIG' class SubversionRepoCanNotReplay(Exception): """Exception raised when the svn server is too old to have replay. diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py --- a/hgsubversion/wrappers.py +++ b/hgsubversion/wrappers.py @@ -31,8 +31,11 @@ def version(orig, ui, *args, **opts): svn = opts.pop('svn', None) orig(ui, *args, **opts) if svn: - ui.status('\nsvn bindings: %s\n' % svnwrap.version()) + svnversion, bindings = svnwrap.version() + ui.status('\n') ui.status('hgsubversion: %s\n' % util.version(ui)) + ui.status('Subversion: %s\n' % svnversion) + ui.status('bindings: %s\n' % bindings) def parents(orig, ui, repo, *args, **opts):