Fix typeerror when specifying both --rebase and --pull

hgext/rebase.py

@@ -426,7 +426,7 b' def pullrebase(orig, ui, repo, *args, **'
     'Call rebase after pull if the latter has been invoked with --rebase'
     if opts.get('rebase'):
         if opts.get('update'):
-            del opts.get['update']
+            del opts['update']
             ui.debug(_('--update and --rebase are not compatible, ignoring '
                                         'the update flag\n'))
 

tests/test-rebase-pull

@@ -53,6 +53,10 b" hg pull --rebase 2>&1 | sed 's/\\(pulling"
 hg glog --template '{rev}\n' -l 1
 
 echo
+echo "% pull --rebase --update should ignore --update"
+hg pull --rebase --update 2>&1 | sed 's/\(pulling from \).*/\1/'
+
+echo
 echo "% pull --rebase doesn't update if nothing has been pulled"
 hg up 1
 hg pull --rebase 2>&1 | sed 's/\(pulling from \).*/\1/'

tests/test-rebase-pull.out

@@ -44,6 +44,11 b' nothing to rebase'
 @  2
 |
 
+% pull --rebase --update should ignore --update
+pulling from 
+searching for changes
+no changes found
+
 % pull --rebase doesn't update if nothing has been pulled
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 pulling from