Use a default "hidden" argument in StackTransaction.reorder_patches

This argument is rarely used so adding a default value simplifies the
calling code.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Acked-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/commands/float.py b/stgit/commands/float.py
index 8410675ab968fec790cf0f1e78b566e084594b5a..e561c3995414240b623d5df6205dea86667b8bbd 100644 (file)
--- a/stgit/commands/float.py
+++ b/stgit/commands/float.py
@@ -71,7 +71,6 @@ def func(parser, options, args):
     applied = [p for p in stack.patchorder.applied if p not in patches] + \
             patches
     unapplied = [p for p in stack.patchorder.unapplied if not p in patches]
     applied = [p for p in stack.patchorder.applied if p not in patches] + \
             patches
     unapplied = [p for p in stack.patchorder.unapplied if not p in patches]

-    hidden = list(stack.patchorder.hidden)

 
     iw = stack.repository.default_iw
     clean_iw = (not options.keep and iw) or None
 
     iw = stack.repository.default_iw
     clean_iw = (not options.keep and iw) or None


@@ -79,7 +78,7 @@ def func(parser, options, args):
                                          check_clean_iw = clean_iw)
 
     try:
                                          check_clean_iw = clean_iw)
 
     try:

-        trans.reorder_patches(applied, unapplied, hidden, iw)
+        trans.reorder_patches(applied, unapplied, iw = iw)

     except transaction.TransactionHalted:
         pass
     return trans.run(iw)
     except transaction.TransactionHalted:
         pass
     return trans.run(iw)

diff --git a/stgit/commands/sink.py b/stgit/commands/sink.py
index b9b8c8a1a341189104c2532263dbc8ba36ca6846..4677a7569b359202df0911d5c7f19aea50bfdbc7 100644 (file)
--- a/stgit/commands/sink.py
+++ b/stgit/commands/sink.py
@@ -81,9 +81,7 @@ def func(parser, options, args):
     else:
         insert_idx = 0
     applied = applied[:insert_idx] + patches + applied[insert_idx:]
     else:
         insert_idx = 0
     applied = applied[:insert_idx] + patches + applied[insert_idx:]

-

     unapplied = [p for p in stack.patchorder.unapplied if p not in patches]
     unapplied = [p for p in stack.patchorder.unapplied if p not in patches]

-    hidden = list(stack.patchorder.hidden)

 
     iw = stack.repository.default_iw
     clean_iw = (not options.keep and iw) or None
 
     iw = stack.repository.default_iw
     clean_iw = (not options.keep and iw) or None


@@ -91,7 +89,7 @@ def func(parser, options, args):
                                          check_clean_iw = clean_iw)
 
     try:
                                          check_clean_iw = clean_iw)
 
     try:

-        trans.reorder_patches(applied, unapplied, hidden, iw)
+        trans.reorder_patches(applied, unapplied, iw = iw)

     except transaction.TransactionHalted:
         pass
     return trans.run(iw)
     except transaction.TransactionHalted:
         pass
     return trans.run(iw)

diff --git a/stgit/lib/transaction.py b/stgit/lib/transaction.py
index 4b5398a28782efe15930711fbf7cf038d2393bf9..b1466484a011c3c729777d5bee43dd717b8fbeea 100644 (file)
--- a/stgit/lib/transaction.py
+++ b/stgit/lib/transaction.py
@@ -365,8 +365,10 @@ class StackTransaction(object):
             # Update immediately.
             update()
 
             # Update immediately.
             update()
 

-    def reorder_patches(self, applied, unapplied, hidden, iw = None):
+    def reorder_patches(self, applied, unapplied, hidden = None, iw = None):

         """Push and pop patches to attain the given ordering."""
         """Push and pop patches to attain the given ordering."""

+        if hidden is None:
+            hidden = self.hidden

         common = len(list(it.takewhile(lambda (a, b): a == b,
                                        zip(self.applied, applied))))
         to_pop = set(self.applied[common:])
         common = len(list(it.takewhile(lambda (a, b): a == b,
                                        zip(self.applied, applied))))
         to_pop = set(self.applied[common:])