Allow python optimization, repair bad asserts

Since assert statements are removed when using `python -O`, it is not okay
to wrap any statements or expressions which have required side-effects with
assert.

The edit, goto, refresh, and squash commands all had problematic
assert-wrapped statements.

Signed-off-by: Peter Grayson <[email protected]>

Author: jpgrayson

stgit/commands/edit.py

@@ -178,7 +178,8 @@ def failed(reason='Edited patch did not apply.'):
     trans = transaction.StackTransaction(stack, 'edit', allow_conflicts=True)
     if patchname in trans.applied:
         popped = trans.applied[trans.applied.index(patchname) + 1:]
-        assert not trans.pop_patches(lambda pn: pn in popped)
+        popped_extra = trans.pop_patches(lambda pn: pn in popped)
+        assert not popped_extra
     else:
         popped = []
     trans.patches[patchname] = stack.repository.commit(cd)

stgit/commands/goto.py

@@ -59,7 +59,8 @@ def func(parser, options, args):
 
     if patch in trans.applied:
         to_pop = set(trans.applied[trans.applied.index(patch) + 1:])
-        assert not trans.pop_patches(lambda pn: pn in to_pop)
+        popped_extra = trans.pop_patches(lambda pn: pn in to_pop)
+        assert not popped_extra
     elif patch in trans.unapplied:
         try:
             to_push = trans.unapplied[:trans.unapplied.index(patch) + 1]

stgit/commands/refresh.py

@@ -221,18 +221,21 @@ def absorb_applied(trans, iw, patch_name, temp_name, edit_fun):
         # Pop any patch on top of the patch we're refreshing.
         to_pop = trans.applied[trans.applied.index(patch_name) + 1:]
         if len(to_pop) > 1:
-            popped = trans.pop_patches(lambda pn: pn in to_pop)
-            assert not popped  # no other patches were popped
+            popped_extra = trans.pop_patches(lambda pn: pn in to_pop)
+            assert not popped_extra  # no other patches were popped
             trans.push_patch(temp_name, iw)
-        assert to_pop.pop() == temp_name
+        top_name = to_pop.pop()
+        assert top_name == temp_name
 
         # Absorb the temp patch.
         temp_cd = trans.patches[temp_name].data
         assert trans.patches[patch_name] == temp_cd.parent
         trans.patches[patch_name] = trans.stack.repository.commit(
             edit_fun(trans.patches[patch_name].data.set_tree(temp_cd.tree)))
-        popped = trans.delete_patches(lambda pn: pn == temp_name, quiet=True)
-        assert not popped  # the temp patch was topmost
+        popped_extra = trans.delete_patches(
+            lambda pn: pn == temp_name, quiet=True
+        )
+        assert not popped_extra  # the temp patch was topmost
         temp_absorbed = True
 
         # Push back any patch we were forced to pop earlier.
@@ -255,8 +258,8 @@ def absorb_unapplied(trans, iw, patch_name, temp_name, edit_fun):
              if we had to leave it for the user to deal with."""
 
     # Pop the temp patch.
-    popped = trans.pop_patches(lambda pn: pn == temp_name)
-    assert not popped  # the temp patch was topmost
+    popped_extra = trans.pop_patches(lambda pn: pn == temp_name)
+    assert not popped_extra  # the temp patch was topmost
 
     # Try to create the new tree of the refreshed patch. (This is the
     # same operation as pushing the temp patch onto the patch we're
@@ -275,8 +278,10 @@ def absorb_unapplied(trans, iw, patch_name, temp_name, edit_fun):
         # the temp patch.
         trans.patches[patch_name] = trans.stack.repository.commit(
             edit_fun(patch_cd.set_tree(new_tree)))
-        popped = trans.delete_patches(lambda pn: pn == temp_name, quiet=True)
-        assert not popped  # the temp patch was not applied
+        popped_extra = trans.delete_patches(
+            lambda pn: pn == temp_name, quiet=True
+        )
+        assert not popped_extra  # the temp patch was not applied
         return True
     else:
         # Nope, we couldn't create the new tree, so we'll just have to

stgit/commands/squash.py

@@ -133,7 +133,8 @@ def make_squashed_patch(trans, new_commit_data):
             new_commit_data = _squash_patches(
                 trans, patches, msg, save_template, no_verify
             )
-            assert not trans.delete_patches(lambda pn: pn in patches)
+            popped_extra = trans.delete_patches(lambda pn: pn in patches)
+            assert not popped_extra
         make_squashed_patch(trans, new_commit_data)
 
         # Push the new patch if necessary, and any unrelated patches we've