Changeset 1010 in tailor

Timestamp:

11/17/05 04:57:53 (8 years ago)

Author:

Brendan Cully <brendan@…>

Hash name:

20051117035753-0ae3a-f4cd98ed1e8331615044945055d7aaeb85b4e901

Message:

Don't crash on empty darcs changesets

The old guard code "if changeset" would never fail because the
expression being tested is a generator, which always exists even if it
never yields anything. Guard on the StopIteration? exception instead.

File:

• vcpx/darcs.py (modified) (1 diff)

vcpx/darcs.py

@@ -303 +303 @@
         changes = ExternalCommand(cwd=self.basedir, command=cmd)
         last = changesets_from_darcschanges(changes.execute(stdout=PIPE)[0])
-        if last:
+        try:
             changeset.entries.extend(last.next().entries)
+        except StopIteration:
+            pass
 
         return conflicts