Correctly handle refs/patches on series rename

[stgit] / stgit / main.py

diff --git a/stgit/main.py b/stgit/main.py
index 008912bff4b03df04c68c0cf32830ccc6309cc4f..a0569457816c345e8c7fa92135fd664dd67ea97c 100644 (file)
--- a/stgit/main.py
+++ b/stgit/main.py
@@ -22,7 +22,7 @@ import sys, os
 from optparse import OptionParser, make_option
 
 from stgit.utils import *
 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 *
 from stgit.version import version
 from stgit.config import config
 from stgit.commands.common import *


@@ -54,6 +54,7 @@ import stgit.commands.rename
 import stgit.commands.resolved
 import stgit.commands.rm
 import stgit.commands.series
 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
 import stgit.commands.status
 import stgit.commands.top
 import stgit.commands.unapplied


@@ -90,6 +91,7 @@ commands = {
     'resolved': stgit.commands.resolved,
     'rm':       stgit.commands.rm,
     'series':   stgit.commands.series,
     '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,
     'status':   stgit.commands.status,
     'top':      stgit.commands.top,
     'unapplied':stgit.commands.unapplied,


@@ -183,8 +185,8 @@ def main():
             stgit.commands.common.crt_series = command.crt_series
 
         command.func(parser, options, args)
             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:
         print >> sys.stderr, '%s %s: %s' % (prog, cmd, err)
         sys.exit(2)
     except KeyboardInterrupt: