from optparse import OptionParser, make_option
from stgit.utils import *
-from stgit import stack, git
+from stgit import stack, git, gitmergeonefile
from stgit.version import version
from stgit.config import config
from stgit.commands.common import *
import stgit.commands.export
import stgit.commands.files
import stgit.commands.fold
+import stgit.commands.goto
import stgit.commands.id
import stgit.commands.imprt
import stgit.commands.init
import stgit.commands.resolved
import stgit.commands.rm
import stgit.commands.series
+import stgit.commands.show
import stgit.commands.status
import stgit.commands.top
import stgit.commands.unapplied
'export': stgit.commands.export,
'files': stgit.commands.files,
'fold': stgit.commands.fold,
+ 'goto': stgit.commands.goto,
'id': stgit.commands.id,
'import': stgit.commands.imprt,
'init': stgit.commands.init,
'resolved': stgit.commands.resolved,
'rm': stgit.commands.rm,
'series': stgit.commands.series,
+ 'show': stgit.commands.show,
'status': stgit.commands.status,
'top': stgit.commands.top,
'unapplied':stgit.commands.unapplied,
stgit.commands.common.crt_series = command.crt_series
command.func(parser, options, args)
- except (IOError, CmdException, stack.StackException, git.GitException), \
- err:
+ except (IOError, CmdException, stack.StackException, git.GitException,
+ gitmergeonefile.GitMergeException), err:
print >> sys.stderr, '%s %s: %s' % (prog, cmd, err)
sys.exit(2)
except KeyboardInterrupt: