# HG changeset patch
# User Abderrahim Kitouni <a.kitouni@gmail.com>
# Date 1248337717 -3600
# Node ID e414c72d3ec902fa3da0a4733105c21bbc5ffb39
# Parent  4be68870dc44a8c6c3682535723d4e7a07dbbabc
fix compatibility with mercurial 1.1

diff --git a/git_handler.py b/git_handler.py
--- a/git_handler.py
+++ b/git_handler.py
@@ -5,8 +5,13 @@
 from hgext import bookmarks
 from mercurial.i18n import _
 from mercurial.node import hex, bin, nullid
-from mercurial import context
-from mercurial.error import RepoError
+from mercurial import context, util as hgutil
+
+try:
+    from mercurial.error import RepoError
+except ImportError:
+    from mercurial.repo import RepoError
+
 from dulwich.misc import make_sha
 from dulwich.objects import (
     Blob,