Merge large rework from W. Trevor King.

1 files changed, 26 insertions, 25 deletions

diff --git a/libbe/darcs.py b/libbe/darcs.py
index 43af99a..e7132c0 100644
--- a/libbe/darcs.py
+++ b/libbe/darcs.py
@@ -1,18 +1,18 @@
 # Copyright (C) 2009 W. Trevor King <wking@drexel.edu>
 #
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
 #
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-#    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
+# 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.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 import codecs
 import os
@@ -131,24 +131,25 @@ class Darcs(RCS):
             RCS._rcs_duplicate_repo(self, directory, revision)
         else:
             self._u_invoke_client("put", "--to-patch", revision, directory)
-    def _rcs_commit(self, commitfile):
+    def _rcs_commit(self, commitfile, allow_empty=False):
         id = self.get_user_id()
         if '@' not in id:
             id = "%s <%s@invalid.com>" % (id, id)
-        # Darcs doesn't like commitfiles without trailing endlines.
-        f = codecs.open(commitfile, 'r', self.encoding)
-        contents = f.read()
-        f.close()
-        if contents[-1] != '\n':
-            f = codecs.open(commitfile, 'a', self.encoding)
-            f.write('\n')
-            f.close()
-        status,output,error = self._u_invoke_client('record', '--all',
-                                                    '--author', id,
-                                                    '--logfile', commitfile)
+        args = ['record', '--all', '--author', id, '--logfile', commitfile]
+        status,output,error = self._u_invoke_client(*args)
+        empty_strings = ["No changes!"]
         revision = None
-
-        revline = re.compile("Finished recording patch '(.*)'")
+        if self._u_any_in_string(empty_strings, output) == True:
+            if allow_empty == False:
+                raise rcs.EmptyCommit()
+            else: # we need a extra call to get the current revision
+                args = ["changes", "--last=1", "--xml"]
+                status,output,error = self._u_invoke_client(*args)
+                revline = re.compile("[ \t]*<name>(.*)</name>")
+                # note that darcs does _not_ make an empty revision.
+                # this returns the last non-empty revision id...
+        else:
+            revline = re.compile("Finished recording patch '(.*)'")
         match = revline.search(output)
         assert match != None, output+error
         assert len(match.groups()) == 1