# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1378512737 18000
# Node ID 0c2eef37248342b9708dde57b251858fb99a17bd
# Parent  815e5cbc7ea7dee14ff270e2629687a2dab126a6
init: remove pre-1.6 revset code

diff --git a/hgsubversion/__init__.py b/hgsubversion/__init__.py
--- a/hgsubversion/__init__.py
+++ b/hgsubversion/__init__.py
@@ -34,13 +34,7 @@ demandimport.ignore.extend([
     ])
 
 from mercurial import templatekw
-
-try:
-    from mercurial import revset
-    # force demandimport to load revset
-    revset.methods
-except ImportError:
-    revset = None
+from mercurial import revset
 
 try:
     from mercurial import subrepo
@@ -161,8 +155,7 @@ def extsetup(ui):
 
     templatekw.keywords.update(util.templatekeywords)
 
-    if revset:
-        revset.symbols.update(util.revsets)
+    revset.symbols.update(util.revsets)
 
     if subrepo:
         subrepo.types['hgsubversion'] = svnexternals.svnsubrepo
@@ -173,7 +166,7 @@ def reposetup(ui, repo):
         for tunnel in ui.configlist('hgsubversion', 'tunnels'):
             hg.schemes['svn+' + tunnel] = svnrepo
 
-    if revset and ui.configbool('hgsubversion', 'nativerevs'):
+    if ui.configbool('hgsubversion', 'nativerevs'):
         extensions.wrapfunction(revset, 'stringset', util.revset_stringset)
 
 _old_local = hg.schemes['file']