##// END OF EJS Templates
merge.applyupdates: use counters from mergestate...
merge.applyupdates: use counters from mergestate This eliminates a whole bunch of duplicate code and allows us to update the removed count for change/delete conflicts where the delete action was chosen.

File last commit:

r26222:3095b102 default
r27078:a421deba default
Show More
map-cmdline.xml
20 lines | 1.6 KiB | application/xml | XmlLexer
Matt Mackall
templater: add new docheader/footer components for XML (issue4135)...
r26222 docheader = '<?xml version="1.0"?>\n<log>\n'
docfooter = '</log>\n'
Robert Bachmann
Added XML output for hg log...
r10153
David Soria Parra
templates: add bookmarks to command line styles
r13387 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'
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'
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'
Robert Bachmann
Added XML output for hg log...
r10153
file_add = '<path action="A">{file_add|xmlescape}</path>\n'
file_mod = '<path action="M">{file_mod|xmlescape}</path>\n'
file_del = '<path action="R">{file_del|xmlescape}</path>\n'
start_file_copies = '<copies>\n'
file_copy = '<copy source="{source|xmlescape}">{name|xmlescape}</copy>\n'
end_file_copies = '</copies>\n'
parent = '<parent revision="{rev}" node="{node}" />\n'
branch = '<branch>{branch|xmlescape}</branch>\n'
tag = '<tag>{tag|xmlescape}</tag>\n'
David Soria Parra
templates: add bookmarks to command line styles
r13387 bookmark = '<bookmark>{bookmark|xmlescape}</bookmark>\n'
Robert Bachmann
Added output of "extras" to hg log XML output
r10159 extra = '<extra key="{key|xmlescape}">{value|xmlescape}</extra>\n'