Mercurial > hg

changeset 12282:9e457c3f47d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: rename strip --nobackup option to --no-backup (issue2377) Same option name as for hg revert --no-backup. Deprecate strip --nobackup.
author Christian Ebert <blacktrash@gmx.net>
date Tue, 14 Sep 2010 22:11:53 +0200
parents d9cf0d1d0d0f
children 850e089eb41c
files hgext/mq.py
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/mq.py	Tue Sep 14 22:11:46 2010 +0200
+++ b/hgext/mq.py	Tue Sep 14 22:11:53 2010 +0200
@@ -2435,13 +2435,13 @@
     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 @@
           ('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":