Mercurial > hg

diff hgext/githelp.py @ 35720:b3cf58487731

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
githelp: improve help for "reset" The previous help referenced a `hg reset`, which is a Facebook-ism. We convert that to `hg update`. We also recognize --soft. Differential Revision: https://phab.mercurial-scm.org/D1728
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 18 Dec 2017 21:09:08 -0800
parents a4cd8f527a7f
children f50067fbeead
line wrap: on
line diff
--- a/hgext/githelp.py	Mon Dec 18 21:02:49 2017 -0800
+++ b/hgext/githelp.py	Mon Dec 18 21:09:08 2017 -0800
@@ -807,12 +807,16 @@
     hard = opts.get('hard')
 
     if opts.get('mixed'):
-        ui.status(_('NOTE: --mixed has no meaning since mercurial has no ' +
+        ui.status(_('NOTE: --mixed has no meaning since Mercurial has no '
+                    'staging area\n\n'))
+    if opts.get('soft'):
+        ui.status(_('NOTE: --soft has no meaning since Mercurial has no '
                     'staging area\n\n'))
 
-    cmd = Command('reset')
+    cmd = Command('update')
     if hard:
         cmd.append('--clean')
+
     cmd.append(commit)
 
     ui.status((str(cmd)), "\n")