aboutsummaryrefslogtreecommitdiffstats
path: root/libbe
diff options
context:
space:
mode:
authorAaron Bentley <abentley@panoramicfeedback.com>2006-02-03 15:24:58 -0500
committerAaron Bentley <abentley@panoramicfeedback.com>2006-02-03 15:24:58 -0500
commit747c77daa54d0701d3f62ffe80d5bab9efe4c0b9 (patch)
tree8d80b7a48375422bfe4cef60e0bc7df4ed06cd80 /libbe
parentd4b7a0a07db702a80c279b5c92a999cd91dfc1bc (diff)
downloadbugseverywhere-747c77daa54d0701d3f62ffe80d5bab9efe4c0b9.tar.gz
Fixed up last commit
Diffstat (limited to 'libbe')
-rw-r--r--libbe/bzr.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/libbe/bzr.py b/libbe/bzr.py
index ac1a8c4..b8d1c8c 100644
--- a/libbe/bzr.py
+++ b/libbe/bzr.py
@@ -52,7 +52,7 @@ def set_file_contents(path, contents):
add_id(path)
def lookup_revision(revno):
- return invoke_client("lookup-revision", str(revno)).rstrip('\n')
+ return invoke_client("lookup-revision", str(revno)).rstrip('\n')[1]
def export(revno, revision_dir):
invoke_client("export", "-r", str(revno), revision_dir)
@@ -69,11 +69,11 @@ def find_or_make_export(revno):
return revision_dir
def bzr_root(path):
- return invoke_client("root", path).rstrip('\r')
+ return invoke_client("root", path).rstrip('\r')[1]
def path_in_reference(bug_dir, spec):
if spec is None:
- spec = int(invoke_client("revno"))
+ spec = int(invoke_client("revno")[1])
rel_bug_dir = bug_dir[len(bzr_root(bug_dir)):]
export_root = find_or_make_export(spec)
return os.path.join(export_root, rel_bug_dir)
@@ -114,8 +114,6 @@ def commit(directory, summary, body=None):
try:
invoke_client('commit', '--unchanged', '--file', filename,
directory=directory)
- except:
- raise invoke_client('status', directory=directory)[1]
finally:
os.unlink(filename)