histedit: do not show revision numbers

Summary:
With segments backend, the revision numbers will be longer than commit hashes
and are confusing.

Reviewed By: DurhamG

Differential Revision: D23408971

fbshipit-source-id: e2057fa644fc7b6be4291f879eee3235bb4e687b

Author: quark-zju

eden/scm/edenscm/hgext/histedit.py

@@ -486,7 +486,7 @@ def torule(self):
         """
         ctx = self.repo[self.node]
         summary = _getsummary(ctx)
-        line = "%s %s %d %s" % (self.verb, ctx, ctx.rev(), summary)
+        line = "%s %s %s" % (self.verb, ctx, summary)
         # trim to 75 columns by default so it's not stupidly wide in my editor
         # (the 5 more are left for verb)
         maxlen = self.repo.ui.configint("histedit", "linelen")

eden/scm/tests/test-fb-hgext-fbhistedit-show-plan.t

@@ -71,7 +71,7 @@ show-plan should work
   histedit plan (call "histedit --continue/--retry" to resume it or "histedit --abort" to abort it):
       exec exit 1
       exec exit 2
-      pick 652413bf663e 5 f
+      pick 652413bf663e f
       exec exit 3
 
 continue should work
@@ -86,7 +86,7 @@ show-plan after consecutive failed execs
   $ hg histedit --show-plan
   histedit plan (call "histedit --continue/--retry" to resume it or "histedit --abort" to abort it):
       exec exit 2
-      pick 652413bf663e 5 f
+      pick 652413bf663e f
       exec exit 3
 
 continue after consecutive failed execs

eden/scm/tests/test-histedit-arguments.t

@@ -53,9 +53,9 @@ Run a dummy edit to make sure we get tip^^ correctly via revsingle.
 --------------------------------------------------------------------
 
   $ HGEDITOR=cat hg histedit "tip^^"
-  pick eb57da33312f 2 three
-  pick c8e68270e35a 3 four
-  pick 08d98a8350f3 4 five
+  pick eb57da33312f three
+  pick c8e68270e35a four
+  pick 08d98a8350f3 five
 
   # Edit history between eb57da33312f and 08d98a8350f3
   #
@@ -287,7 +287,7 @@ Test that trimming description using multi-byte characters
   $ hg --encoding utf-8 commit --logfile logfile
 
   $ HGEDITOR=cat hg --encoding utf-8 histedit tip
-  pick 3d3ea1f3a10b 8 1234567890123456789012345678901234567890123456789012345\xe3\x81\x82... (esc)
+  pick 3d3ea1f3a10b 1234567890123456789012345678901234567890123456789012345\xe3\x81\x82\xe3\x81\x84... (esc)
 
   # Edit history between 3d3ea1f3a10b and 3d3ea1f3a10b
   #
@@ -504,9 +504,9 @@ Test autoverb feature
 Check that 'roll' is selected by default
 
   $ HGEDITOR=cat hg histedit 6058cbb6cfd78cfdef42aa56faa272ee45d4b7dc --config experimental.histedit.autoverb=True
-  pick 6058cbb6cfd7 0 one
-  roll 4f34d0f8b5fa 2 roll! one
-  pick 579e40513370 1 two
+  pick 6058cbb6cfd7 one
+  roll 4f34d0f8b5fa roll! one
+  pick 579e40513370 two
 
   # Edit history between 6058cbb6cfd7 and 4f34d0f8b5fa
   #

eden/scm/tests/test-histedit-bookmark-motion.t

@@ -57,11 +57,11 @@
      summary:     a
 
   $ HGEDITOR=cat hg histedit 'max(desc(b))'
-  pick d2ae7f538514 1 b
-  pick 177f92b77385 2 c
-  pick 055a42cdd887 3 d
-  pick e860deea161a 4 e
-  pick 652413bf663e 5 f
+  pick d2ae7f538514 b
+  pick 177f92b77385 c
+  pick 055a42cdd887 d
+  pick e860deea161a e
+  pick 652413bf663e f
 
   # Edit history between d2ae7f538514 and 652413bf663e
   #
@@ -117,9 +117,9 @@
      summary:     a
 
   $ HGEDITOR=cat hg histedit 'max(desc(c))'
-  pick b346ab9a313d 6 c
-  pick 59d9f330561f 9 d
-  pick cacdfd884a93 10 f
+  pick b346ab9a313d c
+  pick 59d9f330561f d
+  pick cacdfd884a93 f
 
   # Edit history between b346ab9a313d and cacdfd884a93
   #

eden/scm/tests/test-histedit-commute.t

@@ -52,10 +52,10 @@ log before edit
 
 show the edit commands offered
   $ HGEDITOR=cat hg histedit 177f92b77385
-  pick 177f92b77385 2 c
-  pick 055a42cdd887 3 d
-  pick e860deea161a 4 e
-  pick 652413bf663e 5 f
+  pick 177f92b77385 c
+  pick 055a42cdd887 d
+  pick e860deea161a e
+  pick 652413bf663e f
 
   # Edit history between 177f92b77385 and 652413bf663e
   #
@@ -332,9 +332,9 @@ Verify that revsetalias entries work with histedit:
   $ echo extra commit >> c
   $ hg ci -m 'extra commit to c'
   $ HGEDITOR=cat hg histedit 'grandparent(.)'
-  pick ece0b8d93dda 16 c
-  pick 803ef1c6fcfd 17 e
-  pick 9c863c565126 18 extra commit to c
+  pick ece0b8d93dda c
+  pick 803ef1c6fcfd e
+  pick 9c863c565126 extra commit to c
 
   # Edit history between ece0b8d93dda and 9c863c565126
   #

eden/scm/tests/test-histedit-edit.t

@@ -394,7 +394,7 @@ Attempting to fold a change into a public change should not work:
   hg: parse error: first changeset cannot use verb "fold"
   [255]
   $ cat .hg/histedit-last-edit.txt
-  fold 0012be4a27ea 3 extend a
+  fold 0012be4a27ea extend a
 
   # Edit history between 0012be4a27ea and 0012be4a27ea
   #

eden/scm/tests/test-histedit-fold.t

@@ -237,8 +237,8 @@ tip before edit
   > pick 1ddb6c90f2ee e
   > fold 10c36dd37515 f
   > EOF
-  progress: editing: pick 1ddb6c90f2ee 4 e 1/2 changes (50.00%)
-  progress: editing: fold 10c36dd37515 6 f 2/2 changes (100.00%)
+  progress: editing: pick 1ddb6c90f2ee e 1/2 changes (50.00%)
+  progress: editing: fold 10c36dd37515 f 2/2 changes (100.00%)
   progress: editing (end)
 
 tip after edit, which should use the later date, from the second changeset

eden/scm/tests/test-histedit-mutation.t

@@ -144,11 +144,11 @@ Base setup for the rest of the testing
 
 
   $ HGEDITOR=cat hg histedit 1
-  pick d2ae7f538514 1 b
-  pick 177f92b77385 2 c
-  pick 055a42cdd887 3 d
-  pick e860deea161a 4 e
-  pick 652413bf663e 5 f
+  pick d2ae7f538514 b
+  pick 177f92b77385 c
+  pick 055a42cdd887 d
+  pick e860deea161a e
+  pick 652413bf663e f
 
   # Edit history between d2ae7f538514 and 652413bf663e
   #

eden/scm/tests/test-histedit-no-change.t

@@ -86,9 +86,9 @@ editing a changeset without any actual change would corrupt the repository
 
   $ startediting 2 3 "(not changing anything)" # edit the 2nd of 3 changesets
   % start editing the history (not changing anything)
-  | pick 055a42cdd887 3 d
-  | edit e860deea161a 4 e
-  | pick 652413bf663e 5 f
+  | pick 055a42cdd887 d
+  | edit e860deea161a e
+  | pick 652413bf663e f
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   Editing (e860deea161a), you may commit or record as needed now.
   (hg histedit --continue to resume)
@@ -137,9 +137,9 @@ check state of working copy
 
   $ startediting 1,2 3 "(not changing anything)" # edit the 1st two of 3 changesets
   % start editing the history (not changing anything)
-  | edit 055a42cdd887 3 d
-  | edit e860deea161a 4 e
-  | pick 652413bf663e 5 f
+  | edit 055a42cdd887 d
+  | edit e860deea161a e
+  | pick 652413bf663e f
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   Editing (055a42cdd887), you may commit or record as needed now.
   (hg histedit --continue to resume)
@@ -207,7 +207,7 @@ aborting and not changing files can skip mentioning updating (no) files
   $ hg commit -m 'closebranch' --config ui.allowemptycommit=1
   $ startediting 1 1 "(not changing anything)" # edit the 3rd of 3 changesets
   % start editing the history (not changing anything)
-  | edit 663c31f74acc 7 closebranch
+  | edit 663c31f74acc closebranch
   Editing (663c31f74acc), you may commit or record as needed now.
   (hg histedit --continue to resume)
   $ hg histedit --abort

eden/scm/tests/test-histedit-outgoing.t

@@ -36,9 +36,9 @@
 show the edit commands offered by outgoing
   $ cd r2
   $ HGEDITOR=cat hg histedit --outgoing ../r | grep -v comparing | grep -v searching
-  pick 055a42cdd887 3 d
-  pick e860deea161a 4 e
-  pick 652413bf663e 5 f
+  pick 055a42cdd887 d
+  pick e860deea161a e
+  pick 652413bf663e f
 
   # Edit history between 055a42cdd887 and 652413bf663e
   #
@@ -71,9 +71,9 @@ show the error from unrelated repos
   comparing with ../r
   searching for changes
   warning: repository is unrelated
-  pick 2a4042b45417 0 g
-  pick 68c46b4927ce 1 h
-  pick 51281e65ba79 2 i
+  pick 2a4042b45417 g
+  pick 68c46b4927ce h
+  pick 51281e65ba79 i
 
   # Edit history between 2a4042b45417 and 51281e65ba79
   #