##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: introduce hasconflicts() on mergeresult object...
merge: introduce hasconflicts() on mergeresult object This and upcoming patches will improve the mergeresult object making it more powerful and provide clean APIs for various things. Doing this will clean up the core merge code which is present in `update()` a bit. Differential Revision: https://phab.mercurial-scm.org/D8816
Yuya Nishihara - - Load All Authors

File last commit:

r34715:f4aeb952 default
r45835:0c849f01 default
Show More
map-cmdline.compact
31 lines | 1018 B | text/plain | TextLexer
/ mercurial / templates / map-cmdline.compact
History | Source | Raw |Copy content |Copy permalink
Yuya Nishihara
templater: load template fragments from [templates] section in map file...
 r34715 [templates]
timeless
compact: add color labels to -Tcompact
 r28827 ldate = '{label("log.date",
"{date|isodate}")}'
ldesc = '{label('ui.note log.description',
'{desc|strip}')}'
ldescfirst = '{label('ui.note log.description',
'{desc|firstline|strip}')}'
changeset = '{lrev}{tags}{bookmarks}{parents} {lnode} {ldate} {luser}\n {ldescfirst}\n\n'
changeset_quiet = '{lrev}:{lnode}\n'
changeset_verbose = '{lrev}{tags}{parents} {lnode} {ldate} {lauthor}\n {ldesc}\n\n'
lrev = '{label("log.changeset changeset.{phase}",
"{rev}")}'
lnode = '{label("log.node",
"{node|short}")}'
lauthor = '{label("log.user",
"{author}")}'
luser = '{label("log.user",
"{author|user}")}'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 start_tags = '['
timeless
compact: add color labels to -Tcompact
 r28827 tag = '{label("log.tag",
"{tag},")}'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 last_tag = '{tag}]'
start_parents = ':'
timeless
compact: add color labels to -Tcompact
 r28827 parent = '{lrev},'
last_parent = '{lrev}'
Augie Fackler
compact style: show bookmarks in the same manner as tags
 r13933 start_bookmarks = '['
timeless
compact: add color labels to -Tcompact
 r28827 bookmark = '{label("log.bookmark",
"{bookmark},")}'
Augie Fackler
compact style: show bookmarks in the same manner as tags
 r13933 last_bookmark = '{bookmark}]'