upstream/mercurial-mirror Files · mercurial/templates/gitweb/filecomparison.tmpl

setup: conditionalize access to `sys.dllhandle` when building extensions...

setup: conditionalize access to `sys.dllhandle` when building extensions This code is only run on Windows, and was crashing PyOxidizer when running in `setup-py-install` mode. Now an oxidized binary can be built by simply pointing to setup.py. Something is slightly different now that it's not being built from a virtualenv. Previously, `hg version` could print to the screen, but now it aborts saying "Incorrect function". But I can see the output if redirected to a file, and it's not complaining about missing C extensions, so I think those are loading now (unlike from the virtualenv). The interesting this about this incorrect function output is that it failed when initially built. I then went back and did a `make clean` and `make local` with py3 and then py2 to ensure I didn't break the existing code. At that point I ran the oxidized executable again and it was able to print to the screen normally! So I ran `pyoxidizer build` again, it only output the following, and then running the executable failed to output again: (pyO2_venv) C:\Users\Matt\hg3\hg_pyO2>pyoxidizer build Finished dev [unoptimized + debuginfo] target(s) in 0.12s packaging application into C:/Users/Matt/hg3/hg_pyO2\build\apps\hg_pyO2\x86_64-pc-windows-msvc\debug purging C:/Users/Matt/hg3/hg_pyO2\build\apps\hg_pyO2\x86_64-pc-windows-msvc\debug copying C:/Users/Matt/hg3/hg_pyO2\build\target\x86_64-pc-windows-msvc\debug\hg_pyO2.exe to C:/Users/Matt/hg3/hg_pyO2\build\apps\hg_pyO2\x86_64-pc-windows-msvc\debug\hg_pyO2.exe resolving packaging state... writing license for [...] hg_pyO2 packaged into C:/Users/Matt/hg3/hg_pyO2\build\apps\hg_pyO2\x86_64-pc-windows-msvc\debug executable path: C:/Users/Matt/hg3/hg_pyO2\build\apps\hg_pyO2\x86_64-pc-windows-msvc\debug\hg_pyO2.exe Differential Revision: https://phab.mercurial-scm.org/D7444

Gregory Szorc - - Load All Authors

File last commit:

r32762:2d93d215 default


                r44073:52e4bfeb

default

Download file

             filecomparison.tmpl
        
                    75 lines
            
             | 2.6 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / filecomparison.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: comparison {file|escape}</title>

      <link rel="alternate" type="application/atom+xml"

         href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>

      <link rel="alternate" type="application/rss+xml"

         href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>

      </head>

      <body>

      <div class="page_header">

      <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>

      <a href="/">Mercurial</a> {pathdef%breadcrumb} / comparison

      </div>

      <div class="page_nav">

      <div>

      <a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a> |

      <a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> |

      <a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a> |

      <a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a> |

      <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> |

      <a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> |

      <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> |

      <a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a> |

      <a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a> |

      <a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file</a> |

      <a href="{url|urlescape}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a> |

      <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |

      <a href="{url|urlescape}annotate/{symrev}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |

      <a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |

      comparison |

      <a href="{url|urlescape}raw-diff/{symrev}/{file|urlescape}">raw</a> |

      <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>

      </div>

      {searchform}

      </div>

      <div class="title">{file|escape}</div>

      <table>

      {branch%filerevbranch}

      <tr>

       <td>changeset {rev}</td>

       <td style="font-family:monospace"><a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>

      </tr>

      {parent%filecompparent}

      {child%filecompchild}

      </table>

      <div class="list_head"></div>

      <div class="page_body">

      <div class="legend">

        <span class="legendinfo equal">equal</span>

        <span class="legendinfo delete">deleted</span>

        <span class="legendinfo insert">inserted</span>

        <span class="legendinfo replace">replaced</span>

      </div>

      <div class="comparison">

        <table style="border-collapse:collapse;">

          <thead class="header">

            <tr>

              <th>{leftrev}:{leftnode|short}</th>

              <th>{rightrev}:{rightnode|short}</th>

            </tr>

          </thead>

          {comparison}

        </table>

      </div>

      </div>

      {footer}

	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}
				<title>{repo\|escape}: comparison {file\|escape}</title>
				<link rel="alternate" type="application/atom+xml"
				href="{url\|urlescape}atom-log" title="Atom feed for {repo\|escape}"/>
				<link rel="alternate" type="application/rss+xml"
				href="{url\|urlescape}rss-log" title="RSS feed for {repo\|escape}"/>
				</head>
				<body>

				<div class="page_header">
				<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
				<a href="/">Mercurial</a> {pathdef%breadcrumb} / comparison
				</div>

				<div class="page_nav">
				<div>
				<a href="{url\|urlescape}summary{sessionvars%urlparameter}">summary</a> \|
				<a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> \|
				<a href="{url\|urlescape}log{sessionvars%urlparameter}">changelog</a> \|
				<a href="{url\|urlescape}graph{sessionvars%urlparameter}">graph</a> \|
				<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a> \|
				<a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> \|
				<a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a> \|
				<a href="{url\|urlescape}file/{symrev}{path\|urlescape}{sessionvars%urlparameter}">files</a> \|
				<a href="{url\|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a> \|
				<a href="{url\|urlescape}file/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">file</a> \|
				<a href="{url\|urlescape}file/tip/{file\|urlescape}{sessionvars%urlparameter}">latest</a> \|
				<a href="{url\|urlescape}log/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">revisions</a> \|
				<a href="{url\|urlescape}annotate/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">annotate</a> \|
				<a href="{url\|urlescape}diff/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">diff</a> \|
				comparison \|
				<a href="{url\|urlescape}raw-diff/{symrev}/{file\|urlescape}">raw</a> \|
				<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
				</div>
				{searchform}
				</div>

				<div class="title">{file\|escape}</div>

				<table>
				{branch%filerevbranch}
				<tr>
				<td>changeset {rev}</td>
				<td style="font-family:monospace"><a class="list" href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td>
				</tr>
				{parent%filecompparent}
				{child%filecompchild}
				</table>

				<div class="list_head"></div>

				<div class="page_body">

				<div class="legend">
				<span class="legendinfo equal">equal</span>
				<span class="legendinfo delete">deleted</span>
				<span class="legendinfo insert">inserted</span>
				<span class="legendinfo replace">replaced</span>
				</div>

				<div class="comparison">
				<table style="border-collapse:collapse;">
				<thead class="header">
				<tr>
				<th>{leftrev}:{leftnode\|short}</th>
				<th>{rightrev}:{rightnode\|short}</th>
				</tr>
				</thead>
				{comparison}
				</table>
				</div>

				</div>

				{footer}