Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/convert/darcs.py
changeset 5520 cc3af86ab6fe
parent 5481 003d1f174fe1
child 5521 03496d4fa509 
--- a/hgext/convert/darcs.py	Fri Nov 09 20:21:35 2007 -0200
+++ b/hgext/convert/darcs.py	Fri Nov 09 20:21:35 2007 -0200
@@ -21,12 +21,17 @@
     def __init__(self, ui, path, rev=None):
         super(darcs_source, self).__init__(ui, path, rev=rev)
 
-        if not os.path.exists(os.path.join(path, '_darcs', 'inventory')):
+        # check for _darcs, ElementTree, _darcs/inventory so that we can
+        # easily skip test-convert-darcs if ElementTree is not around
+        if not os.path.exists(os.path.join(path, '_darcs')):
             raise NoRepo("couldn't open darcs repo %s" % path)
 
         if ElementTree is None:
             raise util.Abort(_("Python ElementTree module is not available"))
 
+        if not os.path.exists(os.path.join(path, '_darcs', 'inventory')):
+            raise NoRepo("couldn't open darcs repo %s" % path)
+
         self.path = os.path.realpath(path)
 
         self.lastrev = None
mercurial