Convert "push" to the lib infrastructure

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

diff --git a/stgit/commands/push.py b/stgit/commands/push.py
index 818e02df3d73241096d1a42b798cd23438d0ca60..0d25a65d4039cbd5e2b08a72d7b9c3572851bdc2 100644 (file)
--- a/stgit/commands/push.py
+++ b/stgit/commands/push.py
@@ -16,12 +16,10 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 

-import sys, os
+from stgit.commands import common
+from stgit.lib import transaction
+from stgit import argparse

 from stgit.argparse import opt
 from stgit.argparse import opt

-from stgit.commands.common import *
-from stgit.utils import *
-from stgit.out import *
-from stgit import argparse, stack, git

 
 help = 'Push one or more patches onto the stack'
 kind = 'stack'
 
 help = 'Push one or more patches onto the stack'
 kind = 'stack'


@@ -45,39 +43,45 @@ options = [
     opt('-n', '--number', type = 'int',
         short = 'Push the specified number of patches'),
     opt('--reverse', action = 'store_true',
     opt('-n', '--number', type = 'int',
         short = 'Push the specified number of patches'),
     opt('--reverse', action = 'store_true',

-        short = 'Push the patches in reverse order'),
-    opt('-m', '--merged', action = 'store_true',
-        short = 'Check for patches merged upstream')]
+        short = 'Push the patches in reverse order')
+    ] + argparse.keep_option() + argparse.merged_option()

 
 

-directory = DirectoryGotoToplevel(log = True)
+directory = common.DirectoryHasRepositoryLib()

 
 def func(parser, options, args):
 
 def func(parser, options, args):

-    """Pushes the given patch or all onto the series
-    """
-
-    check_local_changes()
-    check_conflicts()
-    check_head_top_equal(crt_series)
-
-    unapplied = crt_series.get_unapplied()
-    if not unapplied:
-        raise CmdException, 'No more patches to push'
-
-    if options.number:
-        patches = unapplied[:options.number]
-    elif options.all:
-        patches = unapplied
-    elif len(args) == 0:
-        patches = [unapplied[0]]
+    """Pushes the given patches or the first unapplied onto the stack."""
+    stack = directory.repository.current_stack
+    iw = stack.repository.default_iw
+    clean_iw = (not options.keep and iw) or None
+    trans = transaction.StackTransaction(stack, 'pop',
+                                         check_clean_iw = clean_iw)
+
+    if not trans.unapplied:
+        raise common.CmdException('No patches to push')
+
+    if options.all:
+        patches = list(trans.unapplied)
+    elif options.number:
+        patches = trans.unapplied[:options.number]
+    elif not args:
+        patches = [trans.unapplied[0]]

     else:
     else:

-        patches = parse_patches(args, unapplied)
+        patches = common.parse_patches(args, trans.unapplied)

 
 

-    if patches == []:
-        raise CmdException, 'No patches to push'
+    if not patches:
+        raise common.CmdException('No patches to push')

 
     if options.reverse:
         patches.reverse()
 
 
     if options.reverse:
         patches.reverse()
 

-    push_patches(crt_series, patches, options.merged)
-
-    print_crt_patch(crt_series)
+    try:
+        if options.merged:
+            merged = set(trans.check_merged(patches))
+        else:
+            merged = set()
+        for pn in patches:
+            trans.push_patch(pn, iw, allow_interactive = True,
+                             already_merged = pn in merged)
+    except transaction.TransactionHalted:
+        pass
+    return trans.run(iw)

diff --git a/t/t0002-status.sh b/t/t0002-status.sh
index d95a83b64e438adda1fe526d01d340d83d142455..ffcad7752f7d56a35de377e0108b8cc79e72c29f 100755 (executable)
--- a/t/t0002-status.sh
+++ b/t/t0002-status.sh
@@ -111,7 +111,7 @@ A fie
 C foo/bar
 EOF
 test_expect_success 'Status after conflicting push' '
 C foo/bar
 EOF
 test_expect_success 'Status after conflicting push' '

-    conflict_old stg push &&
+    conflict stg push &&

     stg status > output.txt &&
     test_cmp expected.txt output.txt
 '
     stg status > output.txt &&
     test_cmp expected.txt output.txt
 '

diff --git a/t/t1200-push-modified.sh b/t/t1200-push-modified.sh
index a591124b97d07a5fd8fd437edfe6413c903493a6..2077492fbb9f9ec6821fc60ace0fbe340a2057de 100755 (executable)
--- a/t/t1200-push-modified.sh
+++ b/t/t1200-push-modified.sh
@@ -49,7 +49,7 @@ test_expect_success \
 
 test_expect_success \
     'Attempt to push the first of those patches without --merged' \
 
 test_expect_success \
     'Attempt to push the first of those patches without --merged' \

-    "(cd bar && conflict_old stg push
+    "(cd bar && conflict stg push

      )
 "
 
      )
 "
 

diff --git a/t/t1202-push-undo.sh b/t/t1202-push-undo.sh
index 79439deae584099c5dad527c660c0eee4eca8ca7..14a3d6d0d684e9a07501c9198bf9880f8dbd307d 100755 (executable)
--- a/t/t1202-push-undo.sh
+++ b/t/t1202-push-undo.sh
@@ -43,7 +43,7 @@ test_expect_success \
 test_expect_success \
        'Push the second patch with conflict' \
        '
 test_expect_success \
        'Push the second patch with conflict' \
        '

-       conflict_old stg push bar
+       conflict stg push bar

        '
 
 test_expect_success \
        '
 
 test_expect_success \


@@ -55,7 +55,7 @@ test_expect_success \
 test_expect_success \
        'Check the push after undo fails as well' \
        '
 test_expect_success \
        'Check the push after undo fails as well' \
        '

-       conflict_old stg push bar
+       conflict stg push bar

        '
 
 test_expect_success \
        '
 
 test_expect_success \

diff --git a/t/t1203-push-conflict.sh b/t/t1203-push-conflict.sh
index 96fee15a8340534e7f22cca3c232c1101252cd11..8027e6c1349781c044d52575cf7d2d9f0b6329be 100755 (executable)
--- a/t/t1203-push-conflict.sh
+++ b/t/t1203-push-conflict.sh
@@ -38,7 +38,7 @@ test_expect_success \
 test_expect_success \
        'Push the first patch with conflict' \
        '
 test_expect_success \
        'Push the first patch with conflict' \
        '

-       conflict_old stg push foo
+       conflict stg push foo

        '
 
 test_expect_success \
        '
 
 test_expect_success \

diff --git a/t/t1205-push-subdir.sh b/t/t1205-push-subdir.sh
index f852762c2efa4a2317c1ee3a99d16036a826d10f..2d5918bf6469fc58a6f2aad295b73f17a2b274bb 100755 (executable)
--- a/t/t1205-push-subdir.sh
+++ b/t/t1205-push-subdir.sh
@@ -47,7 +47,7 @@ test_expect_success 'Conflicting push from subdir' '
     [ "$(echo $(cat x.txt))" = "x0" ] &&
     [ "$(echo $(cat foo/y.txt))" = "y0" ] &&
     cd foo &&
     [ "$(echo $(cat x.txt))" = "x0" ] &&
     [ "$(echo $(cat foo/y.txt))" = "y0" ] &&
     cd foo &&

-    conflict_old stg push p2 &&
+    conflict stg push p2 &&

     cd .. &&
     [ "$(echo $(stg status --conflict))" = "foo/y.txt x.txt" ]
 '
     cd .. &&
     [ "$(echo $(stg status --conflict))" = "foo/y.txt x.txt" ]
 '

diff --git a/t/t2500-clean.sh b/t/t2500-clean.sh
index 99fd29ff1ecc32924997efcb511a5764608ef5cc..7f821f5710a5a275cfdca51f24546d599a548f1f 100755 (executable)
--- a/t/t2500-clean.sh
+++ b/t/t2500-clean.sh
@@ -32,7 +32,7 @@ test_expect_success 'Create a conflict' '
     stg new p2 -m p2
     echo quux > foo.txt &&
     stg refresh &&
     stg new p2 -m p2
     echo quux > foo.txt &&
     stg refresh &&

-    conflict_old stg push
+    conflict stg push

 '
 
 test_expect_success 'Make sure conflicting patches are preserved' '
 '
 
 test_expect_success 'Make sure conflicting patches are preserved' '