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

manifest: avoid corruption by dropping removed files with pure (issue5801)...

manifest: avoid corruption by dropping removed files with pure (issue5801) Previously, removed files would simply be marked by overwriting the first byte with NUL and dropping their entry in `self.position`. But no effort was made to ignore them when compacting the dictionary into text form. This allowed them to slip into the manifest revision, since the code seems to be trying to minimize the string operations by copying as large a chunk as possible. As part of this, compact() walks the existing text based on entries in the `positions` list, and consumed everything up to the next position entry. This typically resulted in a ValueError complaining about unsorted manifest entries. Sometimes it seems that files do get dropped in large repos- it seems to correspond to there being a new entry that would take the same slot. A much more trivial problem is that if the only changes were removals, `_compact()` didn't even run because `__delitem__` doesn't add anything to `self.extradata`. Now there's an explicit variable to flag this, both to allow `_compact()` to run, and to avoid searching the manifest in cases where there are no removals. In practice, this behavior was mostly obscured by the check in fastdelta() which takes a different path that explicitly drops removed files if there are fewer than 1000 changes. However, timeless has a repo where after rebasing tens of commits, a totally different path[1] is taken that bypasses the change count check and hits this problem. [1] https://www.mercurial-scm.org/repo/hg/file/2338bdea4474/mercurial/manifest.py#l1511

Yuya Nishihara - - Load All Authors

File last commit:

r34715:f4aeb952 default


                r42569:0546ead3

stable

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'