From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Mon, 19 May 2008 21:56:31 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Tag: v0.15-rc1~236
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/9564af74822b276d435319fc271eda591e5125a6?ds=sidebyside;hp=-c

Merge branch 'stable'
---

9564af74822b276d435319fc271eda591e5125a6
diff --combined contrib/stgit-completion.bash
index b02eb64,8d49e21..1867e6b
--- a/contrib/stgit-completion.bash
+++ b/contrib/stgit-completion.bash
@@@ -18,7 -18,6 +18,7 @@@ _stg_commands=
      diff
      clean
      clone
 +    coalesce
      commit
      cp
      edit
@@@ -239,7 -238,6 +239,7 @@@ _stg (
          # repository commands
          id)     _stg_patches $command _all_patches ;;
          # stack commands
 +        coalesce) _stg_patches $command _applied_patches ;;
          float)  _stg_patches $command _all_patches ;;
          goto)   _stg_patches $command _all_other_patches ;;
          hide)   _stg_patches $command _unapplied_patches ;;
@@@ -251,7 -249,7 +251,7 @@@
          # patch commands
          delete) _stg_patches $command _all_patches ;;
          edit)   _stg_patches $command _applied_patches ;;
-         export) _stg_patches $command _applied_patches ;;
+         export) _stg_patches $command _all_patches ;;
          files)  _stg_patches $command _all_patches ;;
          log)    _stg_patches $command _all_patches ;;
          mail)   _stg_patches $command _all_patches ;;
diff --combined stgit/commands/export.py
index 50f6f67,4e52598..6ebfd2a
--- a/stgit/commands/export.py
+++ b/stgit/commands/export.py
@@@ -64,10 -64,11 +64,10 @@@ options = [make_option('-d', '--dir'
                         help = 'Use FILE as a template'),
             make_option('-b', '--branch',
                         help = 'use BRANCH instead of the default one'),
 -           make_option('-O', '--diff-opts',
 -                       help = 'options to pass to git-diff'),
             make_option('-s', '--stdout',
                         help = 'dump the patches to the standard output',
 -                       action = 'store_true')]
 +                       action = 'store_true')
 +           ] + make_diff_opts_option()
  
  
  def func(parser, options, args):
@@@ -88,9 -89,15 +88,10 @@@
              os.makedirs(dirname)
          series = file(os.path.join(dirname, 'series'), 'w+')
  
 -    if options.diff_opts:
 -        diff_flags = options.diff_opts.split()
 -    else:
 -        diff_flags = []
 -
      applied = crt_series.get_applied()
+     unapplied = crt_series.get_unapplied()
      if len(args) != 0:
-         patches = parse_patches(args, applied)
+         patches = parse_patches(args, applied + unapplied, len(applied))
      else:
          patches = applied
  
@@@ -138,13 -145,11 +139,13 @@@
          long_descr = reduce(lambda x, y: x + '\n' + y,
                              descr_lines[1:], '').strip()
  
 +        diff = git.diff(rev1 = patch.get_bottom(),
 +                        rev2 = patch.get_top(),
 +                        diff_flags = options.diff_flags)
          tmpl_dict = {'description': patch.get_description().rstrip(),
                       'shortdescr': short_descr,
                       'longdescr': long_descr,
 -                     'diffstat': git.diffstat(rev1 = patch.get_bottom(),
 -                                              rev2 = patch.get_top()),
 +                     'diffstat': git.diffstat(diff),
                       'authname': patch.get_authname(),
                       'authemail': patch.get_authemail(),
                       'authdate': patch.get_authdate(),
@@@ -174,7 -179,9 +175,7 @@@
              print '-'*79
  
          f.write(descr)
 -        f.write(git.diff(rev1 = patch.get_bottom(),
 -                         rev2 = patch.get_top(),
 -                         diff_flags = diff_flags))
 +        f.write(diff)
          if not options.stdout:
              f.close()
          patch_no += 1