Patchwork D1723: githelp: improve help for `git add`

login
register
mail settings
Submitter phabricator
Date Dec. 19, 2017, 5:36 a.m.
Message ID <differential-rev-PHID-DREV-wkpw4qmxzxqzk6pdddxj-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/26349/
State Superseded
Headers show

Comments

phabricator - Dec. 19, 2017, 5:36 a.m.
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The old code was referencing record and crecord, which are
  deprecated. `hg commit --interactive` is the preferred mechanism
  to use.
  
  In addition, there was duplicate code in this function. It has
  been removed.
  
  Tests have been added to cover this function.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1723

AFFECTED FILES
  hgext/githelp.py
  tests/test-githelp.t

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-githelp.t b/tests/test-githelp.t
--- a/tests/test-githelp.t
+++ b/tests/test-githelp.t
@@ -256,3 +256,18 @@ 
 githelp for git blame
   $ hg githelp -- git blame
   hg annotate -udl
+
+githelp for add
+
+  $ hg githelp -- git add
+  hg add
+
+  $ hg githelp -- git add -p
+  note: Mercurial will commit when complete, as there is no staging area in Mercurial
+  
+  hg commit --interactive
+
+  $ hg githelp -- git add --all
+  note: use hg addremove to remove files that have been deleted.
+  
+  hg add
diff --git a/hgext/githelp.py b/hgext/githelp.py
--- a/hgext/githelp.py
+++ b/hgext/githelp.py
@@ -156,23 +156,17 @@ 
     args, opts = parseoptions(ui, cmdoptions, args)
 
     if (opts.get('patch')):
-        ui.status(_("note: hg crecord has a better UI to record changes\n"))
-        ui.status(_("note: record and crecord will commit when complete, "
-                    "as there is no staging area in mercurial\n\n"))
-        cmd = Command('record')
+        ui.status(_("note: Mercurial will commit when complete, "
+                    "as there is no staging area in Mercurial\n\n"))
+        cmd = Command('commit --interactive')
     else:
         cmd = Command("add")
 
         if not opts.get('all'):
             cmd.extend(args)
         else:
             ui.status(_("note: use hg addremove to remove files that have "
                         "been deleted.\n\n"))
-        if not opts.get('all'):
-            cmd.extend(args)
-        else:
-            ui.status(_("note: use hg addremove to remove files that have "
-                        "been deleted.\n\n"))
 
     ui.status((str(cmd)), "\n")