from optparse import OptionParser
import stgit.commands
+from stgit.utils import out
#
# The commands map
candidates = [cmd for cmd in self.keys() if cmd.startswith(key)]
if not candidates:
- print >> sys.stderr, 'Unknown command: %s' % key
- print >> sys.stderr, ' Try "%s help" for a list of ' \
- 'supported commands' % prog
+ out.error('Unknown command: %s' % key,
+ 'Try "%s help" for a list of supported commands' % prog)
sys.exit(1)
elif len(candidates) > 1:
- print >> sys.stderr, 'Ambiguous command: %s' % key
- print >> sys.stderr, ' Candidates are: %s' \
- % ', '.join(candidates)
+ out.error('Ambiguous command: %s' % key,
+ 'Candidates are: %s' % ', '.join(candidates))
sys.exit(1)
return candidates[0]
'clean': 'clean',
'clone': 'clone',
'commit': 'commit',
+ 'cp': 'copy',
'export': 'export',
'files': 'files',
'float': 'float',
'rm': 'rm',
'series': 'series',
'show': 'show',
+ 'sink': 'sink',
'status': 'status',
'sync': 'sync',
'top': 'top',
'push',
'rebase',
'series',
+ 'sink',
'top',
'unapplied',
'uncommit',
)
wccommands = (
'add',
+ 'cp',
'diff',
'resolved',
'rm',
if len(sys.argv) == 3 and not sys.argv[2] in ['-h', '--help']:
cmd = commands.canonical_cmd(sys.argv[2])
if not cmd in commands:
- print >> sys.stderr, '%s help: "%s" command unknown' \
- % (prog, cmd)
+ out.error('%s help: "%s" command unknown' % (prog, cmd))
sys.exit(1)
sys.argv[0] += ' %s' % cmd
from stgit.git import GitException
from stgit.commands.common import CmdException
from stgit.gitmergeonefile import GitMergeException
+ from stgit.utils import EditorException
try:
debug_level = int(os.environ['STGIT_DEBUG_LEVEL'])
except KeyError:
debug_level = 0
except ValueError:
- print >> sys.stderr, 'Invalid STGIT_DEBUG_LEVEL environment variable'
+ out.error('Invalid STGIT_DEBUG_LEVEL environment variable')
sys.exit(1)
try:
command.func(parser, options, args)
except (IOError, ParsingError, NoSectionError, CmdException,
- StackException, GitException, GitMergeException), err:
+ StackException, GitException, GitMergeException,
+ EditorException), err:
print >> sys.stderr, '%s %s: %s' % (prog, cmd, err)
if debug_level:
raise