# HG changeset patch
# User Martijn Pieters <mj@zopatista.com>
# Date 1240997989 -7200
# Node ID dd1b47e17d7eba4aaa2cce2e442669bb80528b51
# Parent  dc6f1c8e366dc653d7e7fd656636205e7d6e5d13
Fix typeerror when specifying both --rebase and --pull

diff -r dc6f1c8e366d -r dd1b47e17d7e hgext/rebase.py
--- a/hgext/rebase.py	Tue Apr 28 23:43:58 2009 +0200
+++ b/hgext/rebase.py	Wed Apr 29 11:39:49 2009 +0200
@@ -426,7 +426,7 @@
     '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'))
 
diff -r dc6f1c8e366d -r dd1b47e17d7e tests/test-rebase-pull
--- a/tests/test-rebase-pull	Tue Apr 28 23:43:58 2009 +0200
+++ b/tests/test-rebase-pull	Wed Apr 29 11:39:49 2009 +0200
@@ -53,6 +53,10 @@
 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/'
diff -r dc6f1c8e366d -r dd1b47e17d7e tests/test-rebase-pull.out
--- a/tests/test-rebase-pull.out	Tue Apr 28 23:43:58 2009 +0200
+++ b/tests/test-rebase-pull.out	Wed Apr 29 11:39:49 2009 +0200
@@ -44,6 +44,11 @@
 @  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