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.xml
author Pulkit Goyal <7895pulkit@gmail.com>
Thu, 03 Sep 2020 13:44:06 +0530
changeset 45584 4c8a93ec6908
parent 34714 f4aeb952ab77
permissions -rw-r--r--
merge: store commitinfo if these is a dc or cd conflict delete-changed or changed-delete conflicts can either be resolved by mergetool, if some tool is passed and using or by user choose something on prompt or user doing some `hg revert` after choosing the file to remain conflicted. If the user decides to keep the changed side, on commit we just reuse the parent filenode. This is mostly fine unless we are in a distributed environment and people are doing criss-cross merges. Since, we don't have recursive merges or any other way of describing the end result of the merge was an explicit choice and it should be differentiated from it's ancestors, merge algo during criss-cross merges fails to take in account the explicit choice made by user and end up with a what-can-be-said-wrong-merge. The solution which we are trying to fix this is by creating a filenode on commit instead of reusing the parent filenode. This helps differentiate between pre-merged filenode and post-merge filenode and kind of tells about the choice user made. To implement creating new filenode functionality, we store info about these files in mergestate so that we can read them on commit and force create a new filenode. Differential Revision: https://phab.mercurial-scm.org/D8988
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
34714
f4aeb952ab77 templater: load template fragments from [templates] section in map file
Yuya Nishihara <yuya@tcha.org>
parents: 26222
diff changeset 
     1
 
[templates]
26222
3095b1027661 templater: add new docheader/footer components for XML (issue4135)
Matt Mackall <mpm@selenic.com>
parents: 13387
diff changeset 
     2
 
docheader = '<?xml version="1.0"?>\n<log>\n'
3095b1027661 templater: add new docheader/footer components for XML (issue4135)
Matt Mackall <mpm@selenic.com>
parents: 13387
diff changeset 
     3
 
docfooter = '</log>\n'
10153
000546ec7ced Added XML output for hg log
Robert Bachmann <rbachm@gmail.com>
parents:
diff changeset 
     4
 







13387






0be2fe6a0843
templates: add bookmarks to command line styles



David Soria Parra <dsp@php.net>


parents: 
10159

diff
changeset




     5


changeset = '<logentry revision="{rev}" node="{node}">\n{branches}{bookmarks}{tags}{parents}<author email="{author|email|xmlescape}">{author|person|xmlescape}</author>\n<date>{date|rfc3339date}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n</logentry>\n'












0be2fe6a0843
templates: add bookmarks to command line styles



David Soria Parra <dsp@php.net>


parents: 
10159

diff
changeset




     6


changeset_verbose = '<logentry revision="{rev}" node="{node}">\n{branches}{bookmarks}{tags}{parents}<author email="{author|email|xmlescape}">{author|person|xmlescape}</author>\n<date>{date|rfc3339date}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n<paths>\n{file_adds}{file_dels}{file_mods}</paths>\n{file_copies}</logentry>\n'












0be2fe6a0843
templates: add bookmarks to command line styles



David Soria Parra <dsp@php.net>


parents: 
10159

diff
changeset




     7


changeset_debug = '<logentry revision="{rev}" node="{node}">\n{branches}{bookmarks}{tags}{parents}<author email="{author|email|xmlescape}">{author|person|xmlescape}</author>\n<date>{date|rfc3339date}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n<paths>\n{file_adds}{file_dels}{file_mods}</paths>\n{file_copies}{extras}</logentry>\n'







10153






000546ec7ced
Added XML output for hg log



Robert Bachmann <rbachm@gmail.com>


parents: 

diff
changeset




     8














000546ec7ced
Added XML output for hg log



Robert Bachmann <rbachm@gmail.com>


parents: 

diff
changeset




     9


file_add  = '<path action="A">{file_add|xmlescape}</path>\n'












000546ec7ced
Added XML output for hg log



Robert Bachmann <rbachm@gmail.com>


parents: 

diff
changeset




    10


file_mod  = '<path action="M">{file_mod|xmlescape}</path>\n'












000546ec7ced
Added XML output for hg log



Robert Bachmann <rbachm@gmail.com>


parents: 

diff
changeset




    11


file_del  = '<path action="R">{file_del|xmlescape}</path>\n'












000546ec7ced
Added XML output for hg log



Robert Bachmann <rbachm@gmail.com>


parents: 

diff
changeset




    12














000546ec7ced
Added XML output for hg log



Robert Bachmann <rbachm@gmail.com>


parents: 

diff
changeset




    13


start_file_copies = '<copies>\n'












000546ec7ced
Added XML output for hg log



Robert Bachmann <rbachm@gmail.com>


parents: 

diff
changeset




    14


file_copy = '<copy source="{source|xmlescape}">{name|xmlescape}</copy>\n'












000546ec7ced
Added XML output for hg log



Robert Bachmann <rbachm@gmail.com>


parents: 

diff
changeset




    15


end_file_copies = '</copies>\n'












000546ec7ced
Added XML output for hg log



Robert Bachmann <rbachm@gmail.com>


parents: 

diff
changeset




    16














000546ec7ced
Added XML output for hg log



Robert Bachmann <rbachm@gmail.com>


parents: 

diff
changeset




    17


parent = '<parent revision="{rev}" node="{node}" />\n'












000546ec7ced
Added XML output for hg log



Robert Bachmann <rbachm@gmail.com>


parents: 

diff
changeset




    18


branch = '<branch>{branch|xmlescape}</branch>\n'












000546ec7ced
Added XML output for hg log



Robert Bachmann <rbachm@gmail.com>


parents: 

diff
changeset




    19


tag = '<tag>{tag|xmlescape}</tag>\n'







13387






0be2fe6a0843
templates: add bookmarks to command line styles



David Soria Parra <dsp@php.net>


parents: 
10159

diff
changeset




    20


bookmark = '<bookmark>{bookmark|xmlescape}</bookmark>\n'







10159






182416227722
Added output of "extras" to hg log XML output



Robert Bachmann <rbachm@gmail.com>


parents: 
10153

diff
changeset




    21


extra = '<extra key="{key|xmlescape}">{value|xmlescape}</extra>\n'














mercurial