record: omit meaningless 'qnew' suggestion at 'hg qnew -i'

Before this patch, 'hg qnew -i' under non-interactive mode suggests
'use qnew instead', and it obviously meaningless.

To omit meaningless 'qnew' suggestion at 'hg qnew -i', this patch adds
internal function '_qrecord()' and specifies 'cmdsuggest' for each of
'qrecord' and 'qnew' separately.

hgext/record.py

@@ -1,141 +1,143 b''
 # record.py
 #
 # Copyright 2007 Bryan O'Sullivan <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 '''commands to interactively select changes for commit/qrefresh'''
 
 from mercurial.i18n import _
 from mercurial import cmdutil, commands, extensions
 from mercurial import util
 
 cmdtable = {}
 command = cmdutil.command(cmdtable)
 # Note for extension authors: ONLY specify testedwith = 'internal' for
 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
 # be specifying the version(s) of Mercurial they are tested with, or
 # leave the attribute unspecified.
 testedwith = 'internal'
 
 
 @command("record",
          # same options as commit + white space diff options
         [c for c in commands.table['^commit|ci'][1][:]
             if c[1] != "interactive"] + commands.diffwsopts,
           _('hg record [OPTION]... [FILE]...'))
 def record(ui, repo, *pats, **opts):
     '''interactively select changes to commit
 
     If a list of files is omitted, all changes reported by :hg:`status`
     will be candidates for recording.
 
     See :hg:`help dates` for a list of formats valid for -d/--date.
 
     You will be prompted for whether to record changes to each
     modified file, and for files with multiple changes, for each
     change to use. For each query, the following responses are
     possible::
 
       y - record this change
       n - skip this change
       e - edit this change manually
 
       s - skip remaining changes to this file
       f - record remaining changes to this file
 
       d - done, skip remaining changes and files
       a - record all changes to all remaining files
       q - quit, recording no changes
 
       ? - display help
 
     This command is not available when committing a merge.'''
 
     if not ui.interactive():
         raise util.Abort(_('running non-interactively, use %s instead') %
                          'commit')
 
     opts["interactive"] = True
     backup = ui.backupconfig('experimental', 'crecord')
     try:
         ui.setconfig('experimental', 'crecord', False, 'record')
         commands.commit(ui, repo, *pats, **opts)
     finally:
         ui.restoreconfig(backup)
 
 def qrefresh(origfn, ui, repo, *pats, **opts):
     if not opts['interactive']:
         return origfn(ui, repo, *pats, **opts)
 
     mq = extensions.find('mq')
 
     def committomq(ui, repo, *pats, **opts):
         # At this point the working copy contains only changes that
         # were accepted. All other changes were reverted.
         # We can't pass *pats here since qrefresh will undo all other
         # changed files in the patch that aren't in pats.
         mq.refresh(ui, repo, **opts)
 
     # backup all changed files
     cmdutil.dorecord(ui, repo, committomq, 'qrefresh', True,
                     cmdutil.recordfilter, *pats, **opts)
 
 # This command registration is replaced during uisetup().
 @command('qrecord',
     [],
     _('hg qrecord [OPTION]... PATCH [FILE]...'),
     inferrepo=True)
 def qrecord(ui, repo, patch, *pats, **opts):
     '''interactively record a new patch
 
     See :hg:`help qnew` & :hg:`help record` for more information and
     usage.
     '''
+    return _qrecord('qnew', ui, repo, patch, *pats, **opts)
 
+def _qrecord(cmdsuggest, ui, repo, patch, *pats, **opts):
     try:
         mq = extensions.find('mq')
     except KeyError:
         raise util.Abort(_("'mq' extension not loaded"))
 
     repo.mq.checkpatchname(patch)
 
     def committomq(ui, repo, *pats, **opts):
         opts['checkname'] = False
         mq.new(ui, repo, patch, *pats, **opts)
 
     backup = ui.backupconfig('experimental', 'crecord')
     try:
         ui.setconfig('experimental', 'crecord', False, 'record')
-        cmdutil.dorecord(ui, repo, committomq, 'qnew', False,
+        cmdutil.dorecord(ui, repo, committomq, cmdsuggest, False,
                          cmdutil.recordfilter, *pats, **opts)
     finally:
         ui.restoreconfig(backup)
 
 def qnew(origfn, ui, repo, patch, *args, **opts):
     if opts['interactive']:
-        return qrecord(ui, repo, patch, *args, **opts)
+        return _qrecord(None, ui, repo, patch, *args, **opts)
     return origfn(ui, repo, patch, *args, **opts)
 
 
 def uisetup(ui):
     try:
         mq = extensions.find('mq')
     except KeyError:
         return
 
     cmdtable["qrecord"] = \
         (qrecord,
          # same options as qnew, but copy them so we don't get
          # -i/--interactive for qrecord and add white space diff options
          mq.cmdtable['^qnew'][1][:] + commands.diffwsopts,
          _('hg qrecord [OPTION]... PATCH [FILE]...'))
 
     _wrapcmd('qnew', mq.cmdtable, qnew, _("interactively record a new patch"))
     _wrapcmd('qrefresh', mq.cmdtable, qrefresh,
              _("interactively select changes to refresh"))
 
 def _wrapcmd(cmd, table, wrapfn, msg):
     entry = extensions.wrapcommand(table, cmd, wrapfn)
     entry[1].append(('i', 'interactive', None, msg))

tests/test-mq-qrefresh-interactive.t

@@ -1,356 +1,362 b''
 Create configuration
 
   $ echo "[ui]" >> $HGRCPATH
   $ echo "interactive=true" >> $HGRCPATH
 
 help qrefresh (no record)
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
   $ hg help qrefresh
   hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...
   
   update the current patch
   
       If any file patterns are provided, the refreshed patch will contain only
       the modifications that match those patterns; the remaining modifications
       will remain in the working directory.
   
       If -s/--short is specified, files currently included in the patch will be
       refreshed just like matched files and remain in the patch.
   
       If -e/--edit is specified, Mercurial will start your configured editor for
       you to enter a message. In case qrefresh fails, you will find a backup of
       your message in ".hg/last-message.txt".
   
       hg add/remove/copy/rename work as usual, though you might want to use git-
       style patches (-g/--git or [diff] git=1) to track copies and renames. See
       the diffs help topic for more information on the git diff format.
   
       Returns 0 on success.
   
   options ([+] can be repeated):
   
    -e --edit                invoke editor on commit messages
    -g --git                 use git extended diff format
    -s --short               refresh only files already in the patch and
                             specified files
    -U --currentuser         add/update author field in patch with current user
    -u --user USER           add/update author field in patch with given user
    -D --currentdate         add/update date field in patch with current date
    -d --date DATE           add/update date field in patch with given date
    -I --include PATTERN [+] include names matching the given patterns
    -X --exclude PATTERN [+] exclude names matching the given patterns
    -m --message TEXT        use text as commit message
    -l --logfile FILE        read commit message from file
   
   (some details hidden, use --verbose to show complete help)
 
 help qrefresh (record)
 
   $ echo "record=" >> $HGRCPATH
   $ hg help qrefresh
   hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...
   
   update the current patch
   
       If any file patterns are provided, the refreshed patch will contain only
       the modifications that match those patterns; the remaining modifications
       will remain in the working directory.
   
       If -s/--short is specified, files currently included in the patch will be
       refreshed just like matched files and remain in the patch.
   
       If -e/--edit is specified, Mercurial will start your configured editor for
       you to enter a message. In case qrefresh fails, you will find a backup of
       your message in ".hg/last-message.txt".
   
       hg add/remove/copy/rename work as usual, though you might want to use git-
       style patches (-g/--git or [diff] git=1) to track copies and renames. See
       the diffs help topic for more information on the git diff format.
   
       Returns 0 on success.
   
   options ([+] can be repeated):
   
    -e --edit                invoke editor on commit messages
    -g --git                 use git extended diff format
    -s --short               refresh only files already in the patch and
                             specified files
    -U --currentuser         add/update author field in patch with current user
    -u --user USER           add/update author field in patch with given user
    -D --currentdate         add/update date field in patch with current date
    -d --date DATE           add/update date field in patch with given date
    -I --include PATTERN [+] include names matching the given patterns
    -X --exclude PATTERN [+] exclude names matching the given patterns
    -m --message TEXT        use text as commit message
    -l --logfile FILE        read commit message from file
    -i --interactive         interactively select changes to refresh
   
   (some details hidden, use --verbose to show complete help)
 
   $ hg init a
   $ cd a
 
 Base commit
 
   $ cat > 1.txt <<EOF
   > 1
   > 2
   > 3
   > 4
   > 5
   > EOF
   $ cat > 2.txt <<EOF
   > a
   > b
   > c
   > d
   > e
   > f
   > EOF
 
   $ mkdir dir
   $ cat > dir/a.txt <<EOF
   > hello world
   > 
   > someone
   > up
   > there
   > loves
   > me
   > EOF
 
   $ hg add 1.txt 2.txt dir/a.txt
   $ hg commit -m aaa
+  $ hg qrecord --config ui.interactive=false patch
+  abort: running non-interactively, use qnew instead
+  [255]
+  $ hg qnew -i --config ui.interactive=false patch
+  abort: running non-interactively
+  [255]
   $ hg qnew -d '0 0' patch
 
 Changing files
 
   $ sed -e 's/2/2 2/;s/4/4 4/' 1.txt > 1.txt.new
   $ sed -e 's/b/b b/' 2.txt > 2.txt.new
   $ sed -e 's/hello world/hello world!/' dir/a.txt > dir/a.txt.new
 
   $ mv -f 1.txt.new 1.txt
   $ mv -f 2.txt.new 2.txt
   $ mv -f dir/a.txt.new dir/a.txt
 
 Whole diff
 
   $ hg diff --nodates
   diff -r ed27675cb5df 1.txt
   --- a/1.txt
   +++ b/1.txt
   @@ -1,5 +1,5 @@
    1
   -2
   +2 2
    3
   -4
   +4 4
    5
   diff -r ed27675cb5df 2.txt
   --- a/2.txt
   +++ b/2.txt
   @@ -1,5 +1,5 @@
    a
   -b
   +b b
    c
    d
    e
   diff -r ed27675cb5df dir/a.txt
   --- a/dir/a.txt
   +++ b/dir/a.txt
   @@ -1,4 +1,4 @@
   -hello world
   +hello world!
    
    someone
    up
 
 partial qrefresh
 
   $ hg qrefresh -i -d '0 0' <<EOF
   > y
   > y
   > n
   > y
   > y
   > n
   > EOF
   diff --git a/1.txt b/1.txt
   2 hunks, 2 lines changed
   examine changes to '1.txt'? [Ynesfdaq?] y
   
   @@ -1,3 +1,3 @@
    1
   -2
   +2 2
    3
   record change 1/4 to '1.txt'? [Ynesfdaq?] y
   
   @@ -3,3 +3,3 @@
    3
   -4
   +4 4
    5
   record change 2/4 to '1.txt'? [Ynesfdaq?] n
   
   diff --git a/2.txt b/2.txt
   1 hunks, 1 lines changed
   examine changes to '2.txt'? [Ynesfdaq?] y
   
   @@ -1,5 +1,5 @@
    a
   -b
   +b b
    c
    d
    e
   record change 3/4 to '2.txt'? [Ynesfdaq?] y
   
   diff --git a/dir/a.txt b/dir/a.txt
   1 hunks, 1 lines changed
   examine changes to 'dir/a.txt'? [Ynesfdaq?] n
   
 
 After partial qrefresh 'tip'
 
   $ hg tip -p
   changeset:   1:0738af1a8211
   tag:         patch
   tag:         qbase
   tag:         qtip
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     [mq]: patch
   
   diff -r 1fd39ab63a33 -r 0738af1a8211 1.txt
   --- a/1.txt	Thu Jan 01 00:00:00 1970 +0000
   +++ b/1.txt	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,5 +1,5 @@
    1
   -2
   +2 2
    3
    4
    5
   diff -r 1fd39ab63a33 -r 0738af1a8211 2.txt
   --- a/2.txt	Thu Jan 01 00:00:00 1970 +0000
   +++ b/2.txt	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,5 +1,5 @@
    a
   -b
   +b b
    c
    d
    e
   
 After partial qrefresh 'diff'
 
   $ hg diff --nodates
   diff -r 0738af1a8211 1.txt
   --- a/1.txt
   +++ b/1.txt
   @@ -1,5 +1,5 @@
    1
    2 2
    3
   -4
   +4 4
    5
   diff -r 0738af1a8211 dir/a.txt
   --- a/dir/a.txt
   +++ b/dir/a.txt
   @@ -1,4 +1,4 @@
   -hello world
   +hello world!
    
    someone
    up
 
 qrefresh interactively everything else
 
   $ hg qrefresh -i -d '0 0' <<EOF
   > y
   > y
   > y
   > y
   > EOF
   diff --git a/1.txt b/1.txt
   1 hunks, 1 lines changed
   examine changes to '1.txt'? [Ynesfdaq?] y
   
   @@ -1,5 +1,5 @@
    1
    2 2
    3
   -4
   +4 4
    5
   record change 1/2 to '1.txt'? [Ynesfdaq?] y
   
   diff --git a/dir/a.txt b/dir/a.txt
   1 hunks, 1 lines changed
   examine changes to 'dir/a.txt'? [Ynesfdaq?] y
   
   @@ -1,4 +1,4 @@
   -hello world
   +hello world!
    
    someone
    up
   record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] y
   
 
 After final qrefresh 'tip'
 
   $ hg tip -p
   changeset:   1:2c3f66afeed9
   tag:         patch
   tag:         qbase
   tag:         qtip
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     [mq]: patch
   
   diff -r 1fd39ab63a33 -r 2c3f66afeed9 1.txt
   --- a/1.txt	Thu Jan 01 00:00:00 1970 +0000
   +++ b/1.txt	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,5 +1,5 @@
    1
   -2
   +2 2
    3
   -4
   +4 4
    5
   diff -r 1fd39ab63a33 -r 2c3f66afeed9 2.txt
   --- a/2.txt	Thu Jan 01 00:00:00 1970 +0000
   +++ b/2.txt	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,5 +1,5 @@
    a
   -b
   +b b
    c
    d
    e
   diff -r 1fd39ab63a33 -r 2c3f66afeed9 dir/a.txt
   --- a/dir/a.txt	Thu Jan 01 00:00:00 1970 +0000
   +++ b/dir/a.txt	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,4 +1,4 @@
   -hello world
   +hello world!
    
    someone
    up
   
 
 After qrefresh 'diff'
 
   $ hg diff --nodates
 
   $ cd ..