From: Karl Wiberg <kha@treskal.com>
Date: Mon, 17 Aug 2009 08:50:42 +0000 (+0200)
Subject: Merge branch 'proposed' of git://github.com/gustavh/stgit
X-Git-Tag: v0.15-rc2~11
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/58f09cf20b44f502fc56d56383461b71b7ae42fd?ds=inline;hp=-c

Merge branch 'proposed' of git://github.com/gustavh/stgit

* 'proposed' of git://github.com/gustavh/stgit: (71 commits)
  stgit.el: Add menu bar menu
  stgit.el: Add stgit-toggle-mark
  stgit.el: Verify we're in stgit-mode before running commands
  stgit.el: Allow toggle-index on index and work tree
  stgit.el: Allow revert on index and work tree
  stgit.el: Add +/- to expand/collapse selected patches
  stgit.el: Fix some incorrect indentation
  stgit.el: Add stgit-new-and-refresh command
  stgit.el: Bugfix "P" when point is not on a patch line
  stgit.el: Fix problem where standard-output isn't bound correctly
  stgit.el: Bugfix of stgit-move-patches to top of stack
  stgit.el: Improve use of def{group,custom,face}
  stgit.el: Add C-c C-b for stgit-rebase
  stgit.el: Add better help text for stgit-mode
  stgit.el: Bugfix mode change display
  stgit.el: Minor documentation corrections
  stgit.el: Allow moving ignored files to index
  stgit.el: Move point in sane way after stgit-file-toggle-index on renames
  stgit.el: Move point correctly after stgit-revert-file
  stgit.el: Abbreviate renames/copies with common prefix/suffix
  ...
---

58f09cf20b44f502fc56d56383461b71b7ae42fd
diff --combined stgit/commands/common.py
index c769266,d64cce1..d38d263
--- a/stgit/commands/common.py
+++ b/stgit/commands/common.py
@@@ -323,7 -323,7 +323,7 @@@ def post_rebase(crt_series, applied, no
  #
  def __end_descr(line):
      return re.match('---\s*$', line) or re.match('diff -', line) or \
 -            re.match('Index: ', line)
 +            re.match('Index: ', line) or re.match('--- \w', line)
  
  def __split_descr_diff(string):
      """Return the description and the diff from the given string
@@@ -405,8 -405,7 +405,8 @@@ def parse_mail(msg)
          authname = authemail = None
  
      # '\n\t' can be found on multi-line headers
 -    descr = __decode_header(msg['subject']).replace('\n\t', ' ')
 +    descr = __decode_header(msg['subject'])
 +    descr = re.sub('\n[ \t]*', ' ', descr)
      authdate = msg['date']
  
      # remove the '[*PATCH*]' expression in the subject
@@@ -463,7 -462,7 +463,7 @@@ def readonly_constant_property(f)
          return getattr(self, n)
      return property(new_f)
  
- def update_commit_data(cd, options, allow_edit = False):
+ def update_commit_data(cd, options):
      """Return a new CommitData object updated according to the command line
      options."""
      # Set the commit message from commandline.
@@@ -483,8 -482,9 +483,9 @@@
              add_sign_line(cd.message, sign_str,
                            cd.committer.name, cd.committer.email))
  
-     # Let user edit the commit message manually.
-     if allow_edit and not options.message:
+     # Let user edit the commit message manually, unless
+     # --save-template or --message was specified.
+     if not getattr(options, 'save_template', None) and not options.message:
          cd = cd.set_message(edit_string(cd.message, '.stgit-new.txt'))
  
      return cd
diff --combined stgit/commands/publish.py
index 9af89e1,cfd63a0..d829916
--- a/stgit/commands/publish.py
+++ b/stgit/commands/publish.py
@@@ -73,7 -73,7 +73,7 @@@ def __create_commit(repository, tree, p
      cd = git.CommitData(
          tree = tree, parents = parents, message = message,
          author = git.Person.author(), committer = git.Person.committer())
-     cd = common.update_commit_data(cd, options, allow_edit = True)
+     cd = common.update_commit_data(cd, options)
  
      return repository.commit(cd)
  
@@@ -110,7 -110,7 +110,7 @@@ def func(parser, options, args)
      # base by setting two parents.
      merge_bases = repository.get_merge_bases(public_head, stack.base)
      if not stack.base in merge_bases:
 -        message = 'Merge %s into %s' % (repository.describe(stack.base),
 +        message = 'Merge %s into %s' % (repository.describe(stack.base).strip(),
                                          utils.strip_prefix('refs/heads/',
                                                             public_ref))
          public_head = __create_commit(repository, stack.head.data.tree,