summaryrefslogtreecommitdiff
path: root/usr/src/tools/scripts/hg-active.py
diff options
context:
space:
mode:
authorRichard Lowe <richlowe@richlowe.net>2010-10-08 22:44:45 -0400
committerRichard Lowe <richlowe@richlowe.net>2010-10-08 22:44:45 -0400
commit8703921742d9c7d4d3724f89a39ff0e2725cbe7b (patch)
tree6f3873ab9088bc2eecbbce211374a0fb0514b01c /usr/src/tools/scripts/hg-active.py
parent53a3dbbbad58b810bf04c5f94c0ac119a1d8d348 (diff)
downloadillumos-joyent-8703921742d9c7d4d3724f89a39ff0e2725cbe7b.tar.gz
259 SCM tools should work with wider range of Mercurial versions
Reviewed by: garrett@nexenta.com Approved by: gwr@nexenta.com --HG-- extra : rebase_source : 226d476ba44d6290017d6774aab7ea3b07dce615
Diffstat (limited to 'usr/src/tools/scripts/hg-active.py')
-rw-r--r--usr/src/tools/scripts/hg-active.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/tools/scripts/hg-active.py b/usr/src/tools/scripts/hg-active.py
index 05b67ffcc1..7e49a18db5 100644
--- a/usr/src/tools/scripts/hg-active.py
+++ b/usr/src/tools/scripts/hg-active.py
@@ -44,8 +44,8 @@ except Version.VersionMismatch, versionerror:
import getopt, binascii
-from mercurial import hg, ui, util
-from onbld.Scm.WorkSpace import WorkSpace, HgRepoError
+from mercurial import error, hg, ui, util
+from onbld.Scm.WorkSpace import WorkSpace
def usage():
@@ -78,7 +78,7 @@ def main(argv):
try:
repository = hg.repository(ui.ui(), wspath)
- except HgRepoError, e:
+ except error.RepoError, e:
sys.stderr.write("failed to open repository: %s\n" % e)
sys.exit(1)