##// END OF EJS Templates
plain: ignore [commands] config...
Martin von Zweigbergk -
r31588:37a0ad66 default
parent child Browse files
Show More
@@ -686,7 +686,7 b' def rebase(ui, repo, **opts):'
686 # Validate input and define rebasing points
686 # Validate input and define rebasing points
687 destf = opts.get('dest', None)
687 destf = opts.get('dest', None)
688
688
689 if ui.config('commands', 'rebase.requiredest', False):
689 if ui.config('commands', 'rebase.requiredest'):
690 if not destf:
690 if not destf:
691 raise error.Abort(_('you must specify a destination'),
691 raise error.Abort(_('you must specify a destination'),
692 hint=_('use: hg rebase -d REV'))
692 hint=_('use: hg rebase -d REV'))
@@ -5349,7 +5349,7 b' def update(ui, repo, node=None, rev=None'
5349 if rev and node:
5349 if rev and node:
5350 raise error.Abort(_("please specify just one revision"))
5350 raise error.Abort(_("please specify just one revision"))
5351
5351
5352 if ui.configbool('commands', 'update.requiredest', False):
5352 if ui.configbool('commands', 'update.requiredest'):
5353 if not node and not rev and not date:
5353 if not node and not rev and not date:
5354 raise error.Abort(_('you must specify a destination'),
5354 raise error.Abort(_('you must specify a destination'),
5355 hint=_('for example: hg update ".::"'))
5355 hint=_('for example: hg update ".::"'))
@@ -284,6 +284,8 b' class ui(object):'
284 del cfg['ui'][k]
284 del cfg['ui'][k]
285 for k, v in cfg.items('defaults'):
285 for k, v in cfg.items('defaults'):
286 del cfg['defaults'][k]
286 del cfg['defaults'][k]
287 for k, v in cfg.items('commands'):
288 del cfg['commands'][k]
287 # Don't remove aliases from the configuration if in the exceptionlist
289 # Don't remove aliases from the configuration if in the exceptionlist
288 if self.plain('alias'):
290 if self.plain('alias'):
289 for k, v in cfg.items('alias'):
291 for k, v in cfg.items('alias'):
@@ -413,3 +413,7 b' Require a destination'
413 $ hg rebase -d 1
413 $ hg rebase -d 1
414 rebasing 2:5db65b93a12b "cc" (tip)
414 rebasing 2:5db65b93a12b "cc" (tip)
415 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-backup.hg (glob)
415 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-backup.hg (glob)
416 $ hg rebase -d 0 -r . -q
417 $ HGPLAIN=1 hg rebase
418 rebasing 2:889b0bc6a730 "cc" (tip)
419 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-backup.hg (glob)
@@ -104,3 +104,5 b' Test that warning is printed if cwd is d'
104 [255]
104 [255]
105 $ hg up .
105 $ hg up .
106 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
106 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
107 $ HGPLAIN=1 hg up
108 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
General Comments 0
You need to be logged in to leave comments. Login now