Fix "stg branch --delete" on a nonexistent branch
authorToby Allsopp <Toby.Allsopp@navman.co.nz>
Wed, 13 Feb 2008 22:25:29 +0000 (11:25 +1300)
committerKarl Hasselström <kha@treskal.com>
Thu, 14 Feb 2008 00:01:34 +0000 (01:01 +0100)
commitfe79e94b3a3710235bf88bb8ec25cbe90d53985d
tree1893c39cfd10bb0f80840b246e7949663598f9a2
parentb4d7f9ae065dbe45b19026e0950394a3b7092064
Fix "stg branch --delete" on a nonexistent branch

Before this patch, I get the following:

 $ stg branch --delete tmp
 Deleting branch "tmp" ... Traceback (most recent call last):
   File "/usr/bin/stg", line 43, in ?
     main()
   File "/var/lib/python-support/python2.4/stgit/main.py", line 281, in main
     command.func(parser, options, args)
   File "/var/lib/python-support/python2.4/stgit/commands/branch.py", line 190, in func
     __delete_branch(args[0], options.force)
   File "/var/lib/python-support/python2.4/stgit/commands/branch.py", line 100, in __delete_branch
     doomed.delete(force)
   File "/var/lib/python-support/python2.4/stgit/stack.py", line 758, in delete
     except GitException:
 NameError: global name 'GitException' is not defined

After it, I get:

 Deleting branch "tmp" ...
   Warning: Could not delete branch "tmp"
 done

Signed-off-by: Toby Allsopp <toby.allsopp@navman.co.nz>
Signed-off-by: Karl Hasselström <kha@treskal.com>
stgit/stack.py
t/t1005-branch-delete.sh