From dcf12ba8f3b31eead602c530a9fbfd5579c64630 Mon Sep 17 00:00:00 2001
From: Nicolas Cavigneaux <nico@bounga.org>
Date: Fri, 16 Jan 2015 15:59:52 +0100
Subject: fix(mercurial): show author name in `hgsl` alias log alias (#3500)

Closes #3500
---
 plugins/mercurial/README.md            | 43 +++++++++++++++++-----------------
 plugins/mercurial/mercurial.plugin.zsh |  2 +-
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/plugins/mercurial/README.md b/plugins/mercurial/README.md
index 4beee0a95..a362de4ce 100644
--- a/plugins/mercurial/README.md
+++ b/plugins/mercurial/README.md
@@ -11,27 +11,28 @@ plugins=(... mercurial)
 
 ## Aliases
 
-| Alias  | Command                                                                                                     |
-|--------|-------------------------------------------------------------------------------------------------------------|
-| `hga`  | `hg add`                                                                                                    |
-| `hgc`  | `hg commit`                                                                                                 |
-| `hgca` | `hg commit --amend`                                                                                         |
-| `hgb`  | `hg branch`                                                                                                 |
-| `hgba` | `hg branches`                                                                                               |
-| `hgbk` | `hg bookmarks`                                                                                              |
-| `hgco` | `hg checkout`                                                                                               |
-| `hgd`  | `hg diff`                                                                                                   |
-| `hged` | `hg diffmerge`                                                                                              |
-| `hgp`  | `hg push`                                                                                                   |
-| `hgs`  | `hg status`                                                                                                 |
-| `hgsl` | `hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n"` |
-| `hgun` | `hg resolve --list`                                                                                         |
-| `hgi`  | `hg incoming`                                                                                               |
-| `hgl`  | `hg pull -u`                                                                                                |
-| `hglr` | `hg pull --rebase`                                                                                          |
-| `hgo`  | `hg outgoing`                                                                                               |
-| `hglg` | `hg log --stat -v`                                                                                          |
-| `hglgp`| `hg log --stat -p -v`                                                                                       |
+| Alias   | Command                                     |
+| ------- | ------------------------------------------- |
+| `hga`   | `hg add`                                    |
+| `hgc`   | `hg commit`                                 |
+| `hgca`  | `hg commit --amend`                         |
+| `hgb`   | `hg branch`                                 |
+| `hgba`  | `hg branches`                               |
+| `hgbk`  | `hg bookmarks`                              |
+| `hgco`  | `hg checkout`                               |
+| `hgd`   | `hg diff`                                   |
+| `hged`  | `hg diffmerge`                              |
+| `hgp`   | `hg push`                                   |
+| `hgs`   | `hg status`                                 |
+| `hgsl`  | `hg log --limit 20 --template "<template>"` |
+| `hgun`  | `hg resolve --list`                         |
+| `hgi`   | `hg incoming`                               |
+| `hgl`   | `hg pull -u`                                |
+| `hglr`  | `hg pull --rebase`                          |
+| `hgo`   | `hg outgoing`                               |
+| `hglg`  | `hg log --stat -v`                          |
+| `hglgp` | `hg log --stat -p -v`                       |
+
 ## Prompt usage
 
 - Switch to a theme which uses `hg_prompt_info`
diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index e098664c0..68a3d9a5c 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -10,7 +10,7 @@ alias hgd='hg diff'
 alias hged='hg diffmerge'
 alias hgp='hg push'
 alias hgs='hg status'
-alias hgsl='hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n"'
+alias hgsl='hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|person}: {desc|strip|firstline}\n" '
 alias hgun='hg resolve --list'
 # pull and update
 alias hgi='hg incoming'
-- 
cgit v1.2.3-70-g09d2