# HG changeset patch # User Christian Ebert # Date 2010-09-14 20:11:53 # Node ID 9e457c3f47d95cabddcac88b7642e8a3ff012893 # Parent d9cf0d1d0d0f9d3fd407e5150be36b411ecc426a mq: rename strip --nobackup option to --no-backup (issue2377) Same option name as for hg revert --no-backup. Deprecate strip --nobackup. diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -2435,13 +2435,13 @@ def strip(ui, repo, *revs, **opts): the local revision numbers will in general be different after the restore. - Use the --nobackup option to discard the backup bundle once the + Use the --no-backup option to discard the backup bundle once the operation completes. """ backup = 'all' if opts.get('backup'): backup = 'strip' - elif opts.get('nobackup'): + elif opts.get('no-backup') or opts.get('nobackup'): backup = 'none' cl = repo.changelog @@ -3087,7 +3087,8 @@ cmdtable = { ('b', 'backup', None, _('bundle only changesets with local revision' ' number greater than REV which are not' ' descendants of REV (DEPRECATED)')), - ('n', 'nobackup', None, _('no backups'))], + ('n', 'no-backup', None, _('no backups')), + ('', 'nobackup', None, _('no backups (DEPRECATED)'))], _('hg strip [-f] [-n] REV...')), "qtop": (top, [] + seriesopts, _('hg qtop [-s]')), "qunapplied":