Merges kinda working

3 files changed, 57 insertions, 19 deletions

diff --git a/libbe/bzr.py b/libbe/bzr.py
index 80b9e9b..b8d1c8c 100644
--- a/libbe/bzr.py
+++ b/libbe/bzr.py
@@ -14,27 +14,26 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-from subprocess import Popen, PIPE
 import os
-import config
-
-def invoke(args):
-    q = Popen(args, stdin=PIPE, stdout=PIPE, stderr=PIPE)
-    output = q.stdout.read()
-    error = q.stderr.read()
-    status = q.wait()
-    if status >= 0:
-        return status, output, error
-    raise Exception("Command failed: %s" % error)
+import tempfile
 
+import config
+from rcs import invoke, CommandError
 
 def invoke_client(*args, **kwargs):
+    directory = kwargs.get('directory')
+    expect = kwargs.get('expect', (0, 1))
     cl_args = ["bzr"]
     cl_args.extend(args)
-    status,output,error = invoke(cl_args)
-    if status not in (0,):
-        raise Exception("Command failed: %s" % error)
-    return output
+    if directory:
+        old_dir = os.getcwd()
+        os.chdir(directory)
+    try:
+        status,output,error = invoke(cl_args, expect)
+    finally:
+        if directory:
+            os.chdir(old_dir)
+    return status, output
 
 def add_id(filename, paranoid=False):
     invoke_client("add", filename)
@@ -53,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)
@@ -70,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)
@@ -101,5 +100,23 @@ def detect(path):
         old_path = path
         path = os.path.dirname(path)
 
+def precommit(directory):
+    pass
 
+def commit(directory, summary, body=None):
+    if body is not None:
+        summary += '\n' + body
+    descriptor, filename = tempfile.mkstemp()
+    try:
+        temp_file = os.fdopen(descriptor, 'wb')
+        temp_file.write(summary)
+        temp_file.close()
+        try:
+            invoke_client('commit', '--unchanged', '--file', filename, 
+                          directory=directory)
+    finally:
+        os.unlink(filename)
+
+def postcommit(directory):
+    pass
 name = "bzr"
diff --git a/libbe/names.py b/libbe/names.py
index 19bc2a4..cbcfbf8 100644
--- a/libbe/names.py
+++ b/libbe/names.py
@@ -16,9 +16,14 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 import commands
 import os
+import sys
+
 
 def uuid():
     return commands.getoutput('uuidgen')
 
 def creator():
-    return os.environ["LOGNAME"]
+    if sys.platform != "win32":
+        return os.environ["LOGNAME"]
+    else:
+        return os.environ["USERNAME"]
diff --git a/libbe/rcs.py b/libbe/rcs.py
index c0966f8..ac96734 100644
--- a/libbe/rcs.py
+++ b/libbe/rcs.py
@@ -14,6 +14,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+from subprocess import Popen, PIPE
 def rcs_by_name(rcs_name):
     """Return the module for the RCS with the given name"""
     if rcs_name == "Arch":
@@ -36,3 +37,18 @@ def detect(dir):
         return bzr
     import no_rcs
     return no_rcs
+
+class CommandError(Exception):
+    def __init__(self, err_str, status):
+        Exception.__init__(self, "Command failed (%d): %s" % (status, err_str))
+        self.err_str = err_str
+        self.status = status
+
+def invoke(args, expect=(0,)):
+    q = Popen(args, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+    output = q.stdout.read()
+    error = q.stderr.read()
+    status = q.wait()
+    if status not in expect:
+        raise CommandError(error, status)
+    return status, output, error