robert_altman avatar robert_altman committed c028bac

Added revision ordinal to changes list and changed mess command description

Comments (0)

Files changed (2)

 # Commands:
 #  p, pick = use commit
 #  e, edit = use commit, but stop for amending
-#  f, fold = use commit, but fold into previous commit
+#  f, fold = use commit, but fold into previous commit (combines N and N-1)
 #  d, drop = remove commit from history
 #  m, mess = edit message without changing commit content
 #
     return newctx, [new], [], []
 
 
+def makedesc(c):
+    summary = c.description().splitlines()[0]
+    line = 'pick %s %d %s' % (c.hex()[:12], c.rev(), summary)
+    return line[:80]  # trim to 80 chars so it's not stupidly wide in my editor
 
 actiontable = {'p': pick,
                'pick': pick,
         existing = [r.node() for r in ctxs]
         rules = opts.get('commands', '')
         if not rules:
-            rules = '\n'.join([('pick %s %s' % (
-                c.hex()[:12], c.description().splitlines()[0]))[:80]
-                               for c in ctxs])
+            rules = '\n'.join([makedesc(c) for c in ctxs])
             rules += editcomment % (node.hex(parent)[:12], node.hex(tip)[:12], )
             rules = ui.edit(rules, ui.username())
             # Save edit rules in .hg/histedit-last-edit.txt in case

File contents unchanged.

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.