Add automatic git-mergetool invocation to the new infrastructure

[stgit] / stgit / commands / edit.py

diff --git a/stgit/commands/edit.py b/stgit/commands/edit.py
index 4904f68..42eb792 100644 (file)
--- a/stgit/commands/edit.py
+++ b/stgit/commands/edit.py
@@ -63,7 +63,7 @@ options = [
         short = 'Invoke interactive editor'),
     ] + (argparse.sign_options() +
          argparse.message_options(save_template = True) +
-         argparse.author_committer_options() + argparse.diff_opts_option())
+         argparse.author_options() + argparse.diff_opts_option())
 
 directory = common.DirectoryHasRepositoryLib()
 
@@ -88,7 +88,7 @@ def func(parser, options, args):
 
     cd, failed_diff = edit.auto_edit_patch(
         stack.repository, cd, msg = options.message, contains_diff = True,
-        author = options.author, committer = options.committer,
+        author = options.author, committer = lambda p: p,
         sign_str = options.sign_str)
 
     if options.save_template:
@@ -128,7 +128,7 @@ def func(parser, options, args):
     trans.patches[patchname] = stack.repository.commit(cd)
     try:
         for pn in popped:
-            trans.push_patch(pn, iw)
+            trans.push_patch(pn, iw, allow_interactive = True)
     except transaction.TransactionHalted:
         pass
     try: