b57ddd6a6798a03e0302811e27edb82735280f67

Author
WeeBull <psarge@Gmail.com>
Committer
WeeBull <psarge@Gmail.com>
Date

Message

Use actual `commit --amend` command for Mercurial

Rather than trying to emulate `git commit --amend` using mercurial queues (which might have side effects if you're using MQ for other things) use the `commit --amend` command which was introduced in Mercurial 2.2 (2012-05-01).

Diff

 1diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
 2index 86200ccf6389829afeab01ad95689f6419d792f0..3ae59496e5eea2872ac8d98d91b8de3dd29dce82 100644
 3--- a/plugins/mercurial/mercurial.plugin.zsh
 4+++ b/plugins/mercurial/mercurial.plugin.zsh
 5@@ -14,8 +14,7 @@ alias hgo='hg outgoing'
 6 alias hgp='hg push'
 7 alias hgs='hg status'
 8 alias hgsl='hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n" '
 9-# this is the 'git commit --amend' equivalent
10-alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip'
11+alias hgca='hg commit --amend'
12 # list unresolved files (since hg does not list unmerged files in the status command)
13 alias hgun='hg resolve --list'
14