Add --force option to new

This option creates a new patch even if there are local changes in the
tree. It is useful if one starts modifying the tree but forgot to create
a patch for it.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/commands/new.py b/stgit/commands/new.py
index c018195865023769d7d3743d9f8b239bd343c532..c36e1099faac31f7253f34893c554d5cb5d6206b 100644 (file)
--- a/stgit/commands/new.py
+++ b/stgit/commands/new.py
@@ -29,6 +29,9 @@ usage = '%prog [options] <name>'
 
 options = [make_option('-m', '--message',
                        help = 'use MESSAGE as the patch description'),
 
 options = [make_option('-m', '--message',
                        help = 'use MESSAGE as the patch description'),

+           make_option('--force',
+                       help = 'proceed even if there are local changes',
+                       action = 'store_true'),

            make_option('-a', '--author', metavar = '"NAME <EMAIL>"',
                        help = 'use "NAME <EMAIL>" as the author details'),
            make_option('--authname',
            make_option('-a', '--author', metavar = '"NAME <EMAIL>"',
                        help = 'use "NAME <EMAIL>" as the author details'),
            make_option('--authname',


@@ -49,9 +52,10 @@ def func(parser, options, args):
     if len(args) != 1:
         parser.error('incorrect number of arguments')
 
     if len(args) != 1:
         parser.error('incorrect number of arguments')
 

-    check_local_changes()
-    check_conflicts()
-    check_head_top_equal()
+    if not options.force:
+        check_local_changes()
+        check_conflicts()
+        check_head_top_equal()

 
     if options.author:
         options.authname, options.authemail = name_email(options.author)
 
     if options.author:
         options.authname, options.authemail = name_email(options.author)