Mercurial > public > mercurial-scm > hg

comparison hgext/rebase.py @ 8241:dd1b47e17d7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix typeerror when specifying both --rebase and --pull
author Martijn Pieters <mj@zopatista.com>
date Wed, 29 Apr 2009 11:39:49 +0200
parents 46293a0c7e9f
children cb08c3765a02
comparison
equal deleted inserted replaced
8240:dc6f1c8e366d 8241:dd1b47e17d7e
424 424
425 def pullrebase(orig, ui, repo, *args, **opts): 425 def pullrebase(orig, ui, repo, *args, **opts):
426 'Call rebase after pull if the latter has been invoked with --rebase' 426 'Call rebase after pull if the latter has been invoked with --rebase'
427 if opts.get('rebase'): 427 if opts.get('rebase'):
428 if opts.get('update'): 428 if opts.get('update'):
429 del opts.get['update'] 429 del opts['update']
430 ui.debug(_('--update and --rebase are not compatible, ignoring ' 430 ui.debug(_('--update and --rebase are not compatible, ignoring '
431 'the update flag\n')) 431 'the update flag\n'))
432 432
433 cmdutil.bail_if_changed(repo) 433 cmdutil.bail_if_changed(repo)
434 revsprepull = len(repo) 434 revsprepull = len(repo)