X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/6ad48e4898f40d58a236de38f0f49a9f8bfb7ab2..bc7ba6e9f41917dbac2061b2e726162099fea920:/stgit/commands/refresh.py

diff --git a/stgit/commands/refresh.py b/stgit/commands/refresh.py
index 48b406a..2949ecb 100644
--- a/stgit/commands/refresh.py
+++ b/stgit/commands/refresh.py
@@ -26,7 +26,7 @@ from stgit.config import config
 
 
 help = 'generate a new commit for the current patch'
-usage = """%prog [options]
+usage = """%prog [options] [<files...>]
 
 Include the latest tree changes in the current patch. This command
 generates a new GIT commit object with the patch details, the previous
@@ -47,6 +47,9 @@ options = [make_option('-f', '--force',
            make_option('-s', '--showpatch',
                        help = 'show the patch content in the editor buffer',
                        action = 'store_true'),
+           make_option('--undo',
+                       help = 'revert the commit generated by the last refresh',
+                       action = 'store_true'),
            make_option('-m', '--message',
                        help = 'use MESSAGE as the patch ' \
                        'description'),
@@ -62,17 +65,17 @@ options = [make_option('-f', '--force',
                        help = 'use COMMNAME as the committer name'),
            make_option('--commemail',
                        help = 'use COMMEMAIL as the committer ' \
-                       'e-mail')]
+                       'e-mail'),
+           make_option('--sign',
+                       help = 'add Signed-off-by line',
+                       action = 'store_true'),
+           make_option('--ack',
+                       help = 'add Acked-by line',
+                       action = 'store_true')]
 
 
 def func(parser, options, args):
-    if len(args) != 0:
-        parser.error('incorrect number of arguments')
-
-    if config.has_option('stgit', 'autoresolved'):
-        autoresolved = config.get('stgit', 'autoresolved')
-    else:
-        autoresolved = 'no'
+    autoresolved = config.get('stgit', 'autoresolved')
 
     if autoresolved != 'yes':
         check_conflicts()
@@ -84,27 +87,46 @@ def func(parser, options, args):
     if not options.force:
         check_head_top_equal()
 
+    if options.undo:
+        print 'Undoing the "%s" refresh...' % patch,
+        sys.stdout.flush()
+        crt_series.undo_refresh()
+        print 'done'
+        return
+
     if options.author:
         options.authname, options.authemail = name_email(options.author)
 
+    if options.sign:
+        sign_str = 'Signed-off-by'
+        if options.ack:
+            raise CmdException, '--ack and --sign were both specified'
+    elif options.ack:
+        sign_str = 'Acked-by'
+    else:
+        sign_str = None
+
     if git.local_changes() \
            or not crt_series.head_top_equal() \
            or options.edit or options.message \
            or options.authname or options.authemail or options.authdate \
-           or options.commname or options.commemail:
+           or options.commname or options.commemail \
+           or options.sign or options.ack:
         print 'Refreshing patch "%s"...' % patch,
         sys.stdout.flush()
 
         if autoresolved == 'yes':
             resolved_all()
-        crt_series.refresh_patch(message = options.message,
+        crt_series.refresh_patch(files = args,
+                                 message = options.message,
                                  edit = options.edit,
                                  show_patch = options.showpatch,
                                  author_name = options.authname,
                                  author_email = options.authemail,
                                  author_date = options.authdate,
                                  committer_name = options.commname,
-                                 committer_email = options.commemail)
+                                 committer_email = options.commemail,
+                                 backup = True, sign_str = sign_str)
 
         print 'done'
     else: