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

largefiles: avoid redundant "updatelfiles" invocation in "overridetransplant"...

largefiles: avoid redundant "updatelfiles" invocation in "overridetransplant" At "hg transplant --merge REV", largefiles newly coming from the 2nd parent (= REV) are marked as "a"(dded) by "patch.patch()", and have to be marked as "n"(ormal) after commit. But until changeset 3100d1cbce32, such largefiles were still marked as "a" unexpectedly even after commit, because no additional entry is added to filelog of such largefiles and they aren't listed in "repo[newnode].files()" in this case: "newnode" is one of newly committed changeset (= result of "repo.commit()"). "updatelfiles" invocation in "overridetransplant" shadows this problem by forcibly synchronizing lfdirstate to dirstate. Now, "updatelfiles" invocation in "overridetransplant" is redundant, because changeset made "markcommitted" use "ctx.files()" to get targets of "synclfdirstate" instead of "repo[newnode].files()".

David Soria Parra - - Load All Authors

File last commit:

r13387:0be2fe6a default


                r23273:236c978b

default

Download file

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

      header = '<?xml version="1.0"?>\n<log>\n'

      footer = '</log>\n'

      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'

      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'

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

      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

				header = '<?xml version="1.0"?>\n<log>\n'
				footer = '</log>\n'

				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'

				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'
				bookmark = '<bookmark>{bookmark\|xmlescape}</bookmark>\n'
				extra = '<extra key="{key\|xmlescape}">{value\|xmlescape}</extra>\n'