Remove the --committer options

As per bug #11977, these options should not be used directly. People
wanting a different committer should set the corresponding Git
environment variables.

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

diff --git a/stgit/argparse.py b/stgit/argparse.py
index 0adb8ffba566e358c6cb948520ba80d88f33c857..0a5f66a7f95fdd6ebb76dcb236bd4d733e4890ce 100644 (file)
--- a/stgit/argparse.py
+++ b/stgit/argparse.py
@@ -220,9 +220,6 @@ def _person_opts(person, short):
 def author_options():
     return _person_opts('author', 'auth')
 
 def author_options():
     return _person_opts('author', 'auth')
 

-def author_committer_options():
-    return _person_opts('author', 'auth') + _person_opts('committer', 'comm')
-

 class CompgenBase(object):
     def actions(self, var): return set()
     def words(self, var): return set()
 class CompgenBase(object):
     def actions(self, var): return set()
     def words(self, var): return set()

diff --git a/stgit/commands/edit.py b/stgit/commands/edit.py
index 4904f6807fcaed2aa4cdd1a8f3fac75fb2453e02..ed785aa12ad026d035301b21e54379ebab584935 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) +
         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()
 
 
 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,
 
     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:
         sign_str = options.sign_str)
 
     if options.save_template:

diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py
index 3eb29ba32dc5af41634d79a5a80894caf97a56cf..97a6a09d78d55bad5a22867602efc00055427c4a 100644 (file)
--- a/stgit/commands/imprt.py
+++ b/stgit/commands/imprt.py
@@ -77,10 +77,6 @@ options = [
         short = 'Use AUTHEMAIL as the author e-mail'),
     opt('--authdate',
         short = 'Use AUTHDATE as the author date'),
         short = 'Use AUTHEMAIL as the author e-mail'),
     opt('--authdate',
         short = 'Use AUTHDATE as the author date'),

-    opt('--commname',
-        short = 'Use COMMNAME as the committer name'),
-    opt('--commemail',
-        short = 'Use COMMEMAIL as the committer e-mail'),

     ] + argparse.sign_options()
 
 directory = DirectoryHasRepository(log = True)
     ] + argparse.sign_options()
 
 directory = DirectoryHasRepository(log = True)


@@ -130,8 +126,6 @@ def __create_patch(filename, message, author_name, author_email,
     if not message:
         can_edit = False
 
     if not message:
         can_edit = False
 

-    committer_name = committer_email = None
-

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


@@ -142,17 +136,11 @@ def __create_patch(filename, message, author_name, author_email,
         author_email = options.authemail
     if options.authdate:
         author_date = options.authdate
         author_email = options.authemail
     if options.authdate:
         author_date = options.authdate

-    if options.commname:
-        committer_name = options.commname
-    if options.commemail:
-        committer_email = options.commemail

 
     crt_series.new_patch(patch, message = message, can_edit = False,
                          author_name = author_name,
                          author_email = author_email,
 
     crt_series.new_patch(patch, message = message, can_edit = False,
                          author_name = author_name,
                          author_email = author_email,

-                         author_date = author_date,
-                         committer_name = committer_name,
-                         committer_email = committer_email)
+                         author_date = author_date)

 
     if not diff:
         out.warn('No diff found, creating empty patch')
 
     if not diff:
         out.warn('No diff found, creating empty patch')

diff --git a/stgit/commands/new.py b/stgit/commands/new.py
index 067882aa694ba8f9d0c1b826091232e91925c894..151cfe98ed5a7f559a746298f5a926649cfc0011 100644 (file)
--- a/stgit/commands/new.py
+++ b/stgit/commands/new.py
@@ -40,7 +40,7 @@ the patch, unless the '--message' flag already specified one. The
 editor."""
 
 args = []
 editor."""
 
 args = []

-options = (argparse.author_committer_options()
+options = (argparse.author_options()

            + argparse.message_options(save_template = True)
            + argparse.sign_options())
 
            + argparse.message_options(save_template = True)
            + argparse.sign_options())
 


@@ -72,9 +72,8 @@ def func(parser, options, args):
     if options.message != None:
         cd = cd.set_message(options.message)
 
     if options.message != None:
         cd = cd.set_message(options.message)
 

-    # Modify author and committer data.
-    cd = (cd.set_author(options.author(cd.author))
-            .set_committer(options.committer(cd.committer)))
+    # Modify author data.
+    cd = cd.set_author(options.author(cd.author))

 
     # Add Signed-off-by: or similar.
     if options.sign_str != None:
 
     # Add Signed-off-by: or similar.
     if options.sign_str != None: