diff options
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Hg.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Hg.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Hg.py b/src/lib/Bcfg2/Server/Plugins/Hg.py index 3fd3918bd..3260908d8 100644 --- a/src/lib/Bcfg2/Server/Plugins/Hg.py +++ b/src/lib/Bcfg2/Server/Plugins/Hg.py @@ -1,5 +1,5 @@ -""" The Hg plugin provides a revision interface for Bcfg2 repos using -mercurial. """ +"""Revision interface for Bcfg2 repos using mercurial. +""" import sys from mercurial import ui, hg @@ -7,24 +7,25 @@ import Bcfg2.Server.Plugin class Hg(Bcfg2.Server.Plugin.Version): - """ The Hg plugin provides a revision interface for Bcfg2 repos - using mercurial. """ + """Revision interface for Bcfg2 repos using mercurial. + """ + __author__ = 'bcfg-dev@mcs.anl.gov' __vcs_metadata_path__ = ".hg" - def __init__(self, core, datastore): - Bcfg2.Server.Plugin.Version.__init__(self, core, datastore) + def __init__(self, core): + Bcfg2.Server.Plugin.Version.__init__(self, core) self.logger.debug("Initialized hg plugin with hg directory %s" % self.vcs_path) def get_revision(self): """Read hg revision information for the Bcfg2 repository.""" try: - repo_path = self.vcs_root + "/" + repo_path = Bcfg2.Options.setup.vcs_root + "/" repo = hg.repository(ui.ui(), repo_path) tip = repo.changelog.tip() return repo.changelog.rev(tip) - except: + except hg.error.RepoError: err = sys.exc_info()[1] msg = "Failed to read hg repository: %s" % err self.logger.error(msg) |