Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/templates/map-cmdline.compact
author Siddharth Agarwal <sid0@fb.com>
Wed, 16 Sep 2015 12:36:21 -0700
changeset 26292 007ac1acfcac
parent 13933 3d83c7d70a98
child 28827 1e184241de51
permissions -rw-r--r--
merge: move merge step to the end Resolving other conflicts before merge ones is better because the state before the merge is as consistent as possible. It will also help with future work involving automatic resolution of merge conflicts with an external merge driver. There are no ordering issues here because it is easy to verify that the same file is never in both the dg/dm and the m sets.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13933
3d83c7d70a98 compact style: show bookmarks in the same manner as tags
Augie Fackler <durin42@gmail.com>
parents: 9999
diff changeset 
     1
 
changeset = '{rev}{tags}{bookmarks}{parents}   {node|short}   {date|isodate}   {author|user}\n  {desc|firstline|strip}\n\n'
1919
8f565af14095 add changeset_quiet to templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1914
diff changeset 
     2
 
changeset_quiet = '{rev}:{node|short}\n'
8342
b24290c72a1d add verbose output to compact template style
Alexander Solovyov <piranha@piranha.org.ua>
parents: 1919
diff changeset 
     3
 
changeset_verbose = '{rev}{tags}{parents}   {node|short}   {date|isodate}   {author}\n  {desc|strip}\n\n'
1908
be71c04d62c0 print tags in compact template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1907
diff changeset 
     4
 
start_tags = '['
be71c04d62c0 print tags in compact template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1907
diff changeset 
     5
 
tag = '{tag},'
be71c04d62c0 print tags in compact template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1907
diff changeset 
     6
 
last_tag = '{tag}]'
1907
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     7
 
start_parents = ':'
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     8
 
parent = '{rev},'
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     9
 
last_parent = '{rev}'
13933
3d83c7d70a98 compact style: show bookmarks in the same manner as tags
Augie Fackler <durin42@gmail.com>
parents: 9999
diff changeset 
    10
 
start_bookmarks = '['
3d83c7d70a98 compact style: show bookmarks in the same manner as tags
Augie Fackler <durin42@gmail.com>
parents: 9999
diff changeset 
    11
 
bookmark = '{bookmark},'
3d83c7d70a98 compact style: show bookmarks in the same manner as tags
Augie Fackler <durin42@gmail.com>
parents: 9999
diff changeset 
    12
 
last_bookmark = '{bookmark}]'
mercurial