Changeset 786 in tailor for vcpx/git.py

Timestamp:

09/06/05 19:44:39 (8 years ago)

Author:

Todd Mokros <tmokros@…>

Hash name:

20050906174439-4e4b6-2ae409ae098e6f3b9213a05c1b66df09ee22996c

Message:

Update git backend to handle empty changesets

git-core doesn't support commits that don't change any files,
so just skip them.

File:

• vcpx/git.py (modified) (2 diffs)

vcpx/git.py

@@ -12 +12 @@
 __docformat__ = 'reStructuredText'
 
-from shwrap import ExternalCommand, ReopenableNamedTemporaryFile
+from shwrap import ExternalCommand, ReopenableNamedTemporaryFile, PIPE
 from target import SyncronizableTargetWorkingDir, TargetInitializationFailure
 from source import ChangesetApplicationFailure
@@ -86 +86 @@
         c = ExternalCommand(cwd=self.basedir, command=cmd)
 
-        c.execute(env=env, input='\n'.join(logmessage))
+        (out, _) = c.execute(stdout=PIPE, env=env, input='\n'.join(logmessage))
         if c.exit_status:
-            raise ChangesetApplicationFailure("%s returned status %d" %
-                                              (str(c), c.exit_status))
+            if out is None or out.readline().strip() != 'nothing to commit':
+                raise ChangesetApplicationFailure("%s returned status %d" %
+                                                  (str(c), c.exit_status))
+            else:
+                # empty changeset, which git-core doesn't support
+                pass
 
     def _removePathnames(self, names):