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

unshelve: disable unshelve during merge (issue5123)...

unshelve: disable unshelve during merge (issue5123) As stated in the issue5123, unshelve can destroy the second parent of the context when tried to unshelve with an uncommitted merge. This patch makes unshelve to abort when called with an uncommitted merge. See how shelve.mergefiles works. Commit structure looks like this: ``` ... -> pctx -> tmpwctx -> shelvectx / / second merge parent pctx = parent before merging working context(first merge parent) tmpwctx = commited working directory after merge(with two parents) shelvectx = shelved context ``` shelve.mergefiles first updates to pctx then it reverts shelvectx to pctx with: ``` cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), *pathtofiles(repo, files), **{'no_backup': True}) ``` Reverting tmpwctx files that were merged from second parent to pctx makes them added because they are not in pctx. Changing this revert operation is crucial to restore parents after unshelve. This is a complicated issue as this is not fixing a regression. Thus, for the time being, unshelve during an uncommitted merge can be aborted. (Details taken from http://mercurial.808500.n3.nabble.com/PATCH-V3-shelve-restore-parents-after-unshelve-issue5123-tt4036858.html#a4037408) Differential Revision: https://phab.mercurial-scm.org/D6169

Yuya Nishihara - - Load All Authors

File last commit:

r34715:f4aeb952 default


                r42217:03f6480b

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'