Add support for initializing a branch for stgit from Emacs.
[stgit] / stgit / commands / export.py
index 1010a88..fb373a9 100644 (file)
@@ -22,7 +22,7 @@ import os
 from optparse import make_option
 
 from stgit.commands import common
-from stgit import git, utils, templates
+from stgit import argparse, git, templates
 from stgit.out import out
 from stgit.lib import git as gitlib
 
@@ -66,7 +66,7 @@ options = [make_option('-d', '--dir',
            make_option('-s', '--stdout',
                        help = 'dump the patches to the standard output',
                        action = 'store_true')
-           ] + utils.make_diff_opts_option()
+           ] + argparse.diff_opts_option()
 
 def func(parser, options, args):
     """Export a range of patches.
@@ -91,7 +91,7 @@ def func(parser, options, args):
     applied = stack.patchorder.applied
     unapplied = stack.patchorder.unapplied
     if len(args) != 0:
-        patches = parse_patches(args, applied + unapplied, len(applied))
+        patches = common.parse_patches(args, applied + unapplied, len(applied))
     else:
         patches = applied