From 1cd02476257a7673668f1bdcdeac2902f3f21adb Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sun, 13 Dec 2009 08:03:58 -0500 Subject: [PATCH] Adjust Hg._vcs_revision_id to bail cleanly on non-int revids --- libbe/storage/vcs/base.py | 1 + libbe/storage/vcs/hg.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/libbe/storage/vcs/base.py b/libbe/storage/vcs/base.py index 7d17b56..fffabf8 100644 --- a/libbe/storage/vcs/base.py +++ b/libbe/storage/vcs/base.py @@ -36,6 +36,7 @@ import tempfile import libbe import libbe.storage.base import libbe.util.encoding +from libbe.storage.base import EmptyCommit, InvalidRevision from libbe.util.utility import Dir, search_parent_directories from libbe.util.subproc import CommandError, invoke from libbe.util.plugin import import_by_name diff --git a/libbe/storage/vcs/hg.py b/libbe/storage/vcs/hg.py index f1a7eef..260f0c4 100644 --- a/libbe/storage/vcs/hg.py +++ b/libbe/storage/vcs/hg.py @@ -100,6 +100,10 @@ class Hg(base.VCS): return self._vcs_revision_id(-1) def _vcs_revision_id(self, index, style='id'): + try: + index = str(int(index)) + except ValueError: + return None args = ['identify', '--rev', str(int(index)), '--%s' % style] kwargs = {'expect': (0,255)} status,output,error = self._u_invoke_client(*args, **kwargs) -- 2.26.2