Mercurial > hg
view mercurial/templates/map-cmdline.compact @ 44856:b7808443ed6a
mergestate: split out merge state handling code from main merge module
There's already some pretty reasonable encapsulation here, but I want
to make the mergestate storage a property of the context so memctx
instances can do a reasonable thing. This is the first step in a
reshuffle to make that easier.
Differential Revision: https://phab.mercurial-scm.org/D8550
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 18 May 2020 14:59:59 -0400 |
parents | f4aeb952ab77 |
children |
line wrap: on
line source
[templates] 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}")}' start_tags = '[' tag = '{label("log.tag", "{tag},")}' last_tag = '{tag}]' start_parents = ':' parent = '{lrev},' last_parent = '{lrev}' start_bookmarks = '[' bookmark = '{label("log.bookmark", "{bookmark},")}' last_bookmark = '{bookmark}]'