Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 37778:f10cb49951e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
forget: rename --confirm to --interactive Differential Revision: https://phab.mercurial-scm.org/D3405
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Wed, 18 Apr 2018 19:25:35 +0530
parents 141017c7f7a9
children ea63a2004d09
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Apr 17 13:46:18 2018 +0200
+++ b/mercurial/commands.py	Wed Apr 18 19:25:35 2018 +0530
@@ -112,7 +112,6 @@
 ]
 
 dryrunopts = cmdutil.dryrunopts
-confirmopts = cmdutil.confirmopts
 remoteopts = cmdutil.remoteopts
 walkopts = cmdutil.walkopts
 commitopts = cmdutil.commitopts
@@ -2062,7 +2061,8 @@
 
 @command(
     '^forget',
-    walkopts + dryrunopts + confirmopts,
+    [('i', 'interactive', None, _('use interactive mode')),
+    ] + walkopts + dryrunopts,
     _('[OPTION]... FILE...'), inferrepo=True)
 def forget(ui, repo, *pats, **opts):
     """forget the specified files on the next commit
@@ -2098,10 +2098,10 @@
         raise error.Abort(_('no files specified'))
 
     m = scmutil.match(repo[None], pats, opts)
-    dryrun, confirm = opts.get('dry_run'), opts.get('confirm')
+    dryrun, interactive = opts.get('dry_run'), opts.get('interactive')
     rejected = cmdutil.forget(ui, repo, m, prefix="",
                               explicitonly=False, dryrun=dryrun,
-                              confirm=confirm)[0]
+                              interactive=interactive)[0]
     return rejected and 1 or 0
 
 @command(