No undo-uncommit-unamend hint when --keep is provided

Summary: #193

Reviewed By: quark-zju

Differential Revision: D74723404

fbshipit-source-id: 7a193f12319899d50b799efd9022e0a411fdaa0a

Author: Liu Yang

eden/scm/sapling/ext/undo.py

@@ -1150,7 +1150,8 @@ def _undoto(ui, repo, reverseindex, keep=False, branch=None):
             command = "amend"
         oldcommithash = _readnode(repo, "workingparent.i", nodedict["workingparent"])
         shorthash = short(bin(oldcommithash))
-        hintutil.trigger("undo-uncommit-unamend", command, shorthash)
+        if not keep:
+            hintutil.trigger("undo-uncommit-unamend", command, shorthash)
     repo.ui.status(uimessage)
 
 

eden/scm/tests/test-undo.t

@@ -38,10 +38,35 @@
 
   undo to *, before commit -Aqm initial commit (glob)
 
-  $ hg undo
+  $ hg undo --keep
   undone to *, before commit -Aqm initial commit (glob)
+
+  $ hg log -r 'olddraft(0)'
+  commit:      79344ac2ab8b
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     initial commit
+
+  $ hg status
+  M file
+
+  $ hg commit -Aqm "recommit after undo --keep"
+  $ hg log -r 'olddraft(0)'
+  commit:      79344ac2ab8b
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     initial commit
+  
+  commit:      0109d94c2173
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     recommit after undo --keep
+
+
+  $ hg undo
+  undone to *, before commit -Aqm recommit after undo --keep (glob)
   hint[undo-uncommit-unamend]: undoing commits discards their changes.
-  to restore the changes to the working copy, run 'hg revert -r f5a897cc70a1 --all'
+  to restore the changes to the working copy, run 'hg revert -r 0109d94c2173 --all'
   in the future, you can use 'hg uncommit' instead of 'hg undo' to keep changes
   hint[hint-ack]: use 'hg hint --ack undo-uncommit-unamend' to silence these hints