Add "stg bury" command, with the functionality of contrib/stg-sink.

[stgit] / stgit / main.py

diff --git a/stgit/main.py b/stgit/main.py
index f77fba8..9c319c6 100644 (file)
--- a/stgit/main.py
+++ b/stgit/main.py
@@ -63,11 +63,13 @@ commands = Commands({
     'applied':          'applied',
     'assimilate':       'assimilate',
     'branch':           'branch',
+    'bury':             'bury',
     'delete':           'delete',
     'diff':             'diff',
     'clean':            'clean',
     'clone':            'clone',
     'commit':           'commit',
+    'cp':              'copy',
     'export':           'export',
     'files':            'files',
     'float':            'float',
@@ -109,6 +111,7 @@ stackcommands = (
     'applied',
     'assimilate',
     'branch',
+    'bury',
     'clean',
     'commit',
     'float',
@@ -143,6 +146,7 @@ patchcommands = (
     )
 wccommands = (
     'add',
+    'cp',
     'diff',
     'resolved',
     'rm',
@@ -256,6 +260,7 @@ def main():
     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'])
@@ -279,7 +284,8 @@ def main():
 
         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