Show More
@@ -5,8 +5,14 b'' | |||||
5 | # map-cmdline.default. |
|
5 | # map-cmdline.default. | |
6 | showbookmarks = '{if(active, "*", " ")} {pad(bookmark, longestbookmarklen + 4)}{shortest(node, 5)}\n' |
|
6 | showbookmarks = '{if(active, "*", " ")} {pad(bookmark, longestbookmarklen + 4)}{shortest(node, 5)}\n' | |
7 |
|
7 | |||
8 | showwork = '{cset_shortnode}{cset_names} {cset_shortdesc}' |
|
8 | showwork = '{cset_shortnode}{namespaces % cset_namespace} {cset_shortdesc}' | |
9 |
|
9 | |||
10 | cset_shortnode = '{label("log.changeset changeset.{phase}", shortest(node, 5))}' |
|
10 | cset_shortnode = '{label("log.changeset changeset.{phase}", shortest(node, 5))}' | |
11 | cset_names = '{if(branches, " ({label("log.branch", branch)})")}{if(bookmarks, " ({label("log.bookmarks", bookmarks)})")}' |
|
11 | ||
|
12 | # Treat branch and tags specially so we don't display "default" or "tip" | |||
|
13 | cset_namespace = '{ifeq(namespace, "branches", names_branches, ifeq(namespace, "tags", names_tags, names_others))}' | |||
|
14 | names_branches = '{ifeq(branch, "default", "", " ({label('log.{colorname}', branch)})")}' | |||
|
15 | names_tags = '{if(names % "{ifeq(name, 'tip', '', name)}", " ({label('log.{colorname}', join(names % "{ifeq(name, 'tip', '', name)}", ' '))})")}' | |||
|
16 | names_others = '{if(names, " ({label('log.{colorname}', join(names, ' '))})")}' | |||
|
17 | ||||
12 | cset_shortdesc = '{label("log.description", desc|firstline)}' |
|
18 | cset_shortdesc = '{label("log.description", desc|firstline)}' |
@@ -181,10 +181,9 b' Tags are rendered' | |||||
181 | $ hg commit -m 'commit 3' |
|
181 | $ hg commit -m 'commit 3' | |
182 | $ hg tag 0.2 |
|
182 | $ hg tag 0.2 | |
183 |
|
183 | |||
184 | TODO tags aren't yet rendered |
|
|||
185 | $ hg show work |
|
184 | $ hg show work | |
186 | @ 37582 Added tag 0.2 for changeset 6379c25b76f1 |
|
185 | @ 37582 Added tag 0.2 for changeset 6379c25b76f1 | |
187 | o 6379c commit 3 |
|
186 | o 6379c (0.2) commit 3 | |
188 | o a2ad9 Added tag 0.1 for changeset 6a75536ea0b1 |
|
187 | o a2ad9 Added tag 0.1 for changeset 6a75536ea0b1 | |
189 | | |
|
188 | | | |
190 | ~ |
|
189 | ~ | |
@@ -206,14 +205,14 b' Multiple names on same changeset render ' | |||||
206 |
$ hg commit |
|
205 | $ hg commit -m 'commit 2' | |
207 |
|
206 | |||
208 | $ hg show work |
|
207 | $ hg show work | |
209 |
@ 34834 (myb |
|
208 | @ 34834 (mybook) (mybranch) commit 2 | |
210 | o 97fcc commit 1 |
|
209 | o 97fcc commit 1 | |
211 |
|
210 | |||
212 | Multiple bookmarks on same changeset render properly |
|
211 | Multiple bookmarks on same changeset render properly | |
213 |
|
212 | |||
214 | $ hg book mybook2 |
|
213 | $ hg book mybook2 | |
215 | $ hg show work |
|
214 | $ hg show work | |
216 |
@ 34834 (myb |
|
215 | @ 34834 (mybook mybook2) (mybranch) commit 2 | |
217 | o 97fcc commit 1 |
|
216 | o 97fcc commit 1 | |
218 |
|
217 | |||
219 | $ cd .. |
|
218 | $ cd .. | |
@@ -230,10 +229,9 b' Extra namespaces are rendered' | |||||
230 | $ echo 2 > foo |
|
229 | $ echo 2 > foo | |
231 |
$ hg commit |
|
230 | $ hg commit -m 'commit 3' | |
232 |
|
231 | |||
233 | TODO don't yet render extra namespaces |
|
|||
234 | $ hg --config extensions.revnames=$TESTDIR/revnamesext.py show work |
|
232 | $ hg --config extensions.revnames=$TESTDIR/revnamesext.py show work | |
235 | @ 32f3e commit 3 |
|
233 | @ 32f3e (r2) commit 3 | |
236 | o 6a755 commit 2 |
|
234 | o 6a755 (r1) commit 2 | |
237 | o 97fcc commit 1 |
|
235 | o 97fcc (r0) commit 1 | |
238 |
|
236 | |||
239 | $ cd .. |
|
237 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now