upstream/mercurial-mirror Files · mercurial/templates/map-cmdline.xml

tests: test divergence created during interrupted rebase...

tests: test divergence created during interrupted rebase If a rebase runs into conflicts and the user somehow rewrites an unrebased commit in the rebase set while the rebase is interrupted, continuing it might result in divergence. It turns out that we decide to skip the commit. That seems to make sense, but it wasn't obvious to me that that's what we should do. Either way, this patch adds a test case for the current behavior. Differential Revision: https://phab.mercurial-scm.org/D10256

Yuya Nishihara - - Load All Authors

File last commit:

r34715:f4aeb952 default


                r47586:6648307d

default

Download file

             map-cmdline.xml
        
                    21 lines
            
             | 1.6 KiB
            
                | application/xml
            
             |
                XmlLexer
            
             / mercurial / templates / map-cmdline.xml
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Yuya Nishihara
    
templater: load template fragments from [templates] section in map file...

              r34715
            
      [templates]

        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'

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Yuya Nishihara templater: load template fragments from [templates] section in map file...	r34715	[templates]
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'