##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

dummysmtpd: don't die on client connection errors...
dummysmtpd: don't die on client connection errors The connection refused error in test-patchbomb-tls.t[1] is sporadic, but one of the more often seen errors on Windows. I added enough logging to a file and dumped it out at the end to make the following observations: - The listening socket is successfully created and bound to the port, and the "listening at..." message is always logged. - Generally, the following is the entire log output, with the "accepted ..." message having been added after `sslutil.wrapserversocket`: listening at localhost:$HGPORT $LOCALIP ssl error accepted connect accepted connect $LOCALIP from=quux to=foo, bar $LOCALIP ssl error - In the cases that fail, asyncore.loop() in the run() method is exiting, but not with an exception. - In the cases that fail, the following is logged right after "listening ...": Traceback (most recent call last): File "c:\\Python27\\lib\\asyncore.py", line 83, in read obj.handle_read_event() File "c:\\Python27\\lib\\asyncore.py", line 443, in handle_read_event self.handle_accept() File "../tests/dummysmtpd.py", line 80, in handle_accept conn = sslutil.wrapserversocket(conn, ui, certfile=self._certfile) File "..\\mercurial\\sslutil.py", line 570, in wrapserversocket return sslcontext.wrap_socket(sock, server_side=True) File "c:\\Python27\\lib\\ssl.py", line 363, in wrap_socket _context=self) File "c:\\Python27\\lib\\ssl.py", line 611, in __init__ self.do_handshake() File "c:\\Python27\\lib\\ssl.py", line 840, in do_handshake self._sslobj.do_handshake() error: [Errno 10054] $ECONNRESET$ - If the base class handler is overridden completely, the the first "ssl error" line is replaced by the stacktrace, but the other lines are unchanged. The client behaves no differently, whether or not the server stacktraced. In general, `./run-tests.py --local -j9 -t9000 test-patchbomb-tls.t --runs-per-test 20` would show the issue after a run or two. With this change, `./run-tests.py --local -j9 -t9000 test-patchbomb-tls.t --loop` ran 800 times without a hiccup. This makes me wonder if the other connection refused messages that bubble up on occasion are caused by a similar issue. It seems a bit drastic to kill the whole server on account of a single communication failure with a client. # no-check-commit because of handle_error() [1] https://buildbot.mercurial-scm.org/builders/Win7%20x86_64%20hg%20tests/builds/421/steps/run-tests.py%20%28python%202.7.13%29/logs/stdio
av6 - - Load All Authors

File last commit:

r35623:45a81636 default
r35794:75bae697 default
Show More
templates.wxs
251 lines | 14.4 KiB | text/plain | TextLexer
/ contrib / wix / templates.wxs
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <?xml version="1.0" encoding="utf-8"?>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
 r10513 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828
<?include guids.wxi ?>
Steve Borho
wix: add support for x64 native MSI packages
 r13042 <?include defines.wxi ?>
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828
<Fragment>
<ComponentGroup Id="templatesFolder">
<ComponentRef Id="templates.root" />
<ComponentRef Id="templates.atom" />
<ComponentRef Id="templates.coal" />
<ComponentRef Id="templates.gitweb" />
Steve Borho
wix: add new json templates folder to MSI installers
 r24989 <ComponentRef Id="templates.json" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <ComponentRef Id="templates.monoblue" />
<ComponentRef Id="templates.paper" />
<ComponentRef Id="templates.raw" />
<ComponentRef Id="templates.rss" />
<ComponentRef Id="templates.spartan" />
<ComponentRef Id="templates.static" />
</ComponentGroup>
</Fragment>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
<Directory Id="templatesdir" Name="templates" FileSource="$(var.SourceDir)">
Steve Borho
wix: add support for x64 native MSI packages
 r13042 <Component Id="templates.root" Guid="$(var.templates.root.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Name="map-cmdline.changelog" KeyPath="yes" />
<File Name="map-cmdline.compact" />
<File Name="map-cmdline.default" />
Gregory Szorc
show: new extension for displaying various repository data...
 r31765 <File Name="map-cmdline.show" />
Steve Borho
wix: add map-commandline.bisect
 r15764 <File Name="map-cmdline.bisect" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Name="map-cmdline.xml" />
Matt Mackall
wix: add missing template
 r27384 <File Name="map-cmdline.status" />
Steve Borho
wix: pull in new templates
 r20315 <File Name="map-cmdline.phases" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 </Component>
Steve Borho
wix: add new json templates folder to MSI installers
 r24989 <Directory Id="templates.jsondir" Name="json">
<Component Id="templates.json" Guid="$(var.templates.json.guid)" Win64='$(var.IsX64)'>
<File Id="json.changelist.tmpl" Name="changelist.tmpl" KeyPath="yes" />
av6
hgweb: implement json-graph...
 r35390 <File Id="json.graph.tmpl" Name="graph.tmpl" />
Steve Borho
wix: add new json templates folder to MSI installers
 r24989 <File Id="json.map" Name="map" />
</Component>
</Directory>
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <Directory Id="templates.atomdir" Name="atom">
Steve Borho
wix: add support for x64 native MSI packages
 r13042 <Component Id="templates.atom" Guid="$(var.templates.atom.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="atom.changelog.tmpl" Name="changelog.tmpl" KeyPath="yes" />
<File Id="atom.changelogentry.tmpl" Name="changelogentry.tmpl" />
<File Id="atom.error.tmpl" Name="error.tmpl" />
<File Id="atom.filelog.tmpl" Name="filelog.tmpl" />
<File Id="atom.header.tmpl" Name="header.tmpl" />
<File Id="atom.map" Name="map" />
<File Id="atom.tagentry.tmpl" Name="tagentry.tmpl" />
<File Id="atom.tags.tmpl" Name="tags.tmpl" />
Steve Borho
wix: pull in new templates
 r20315 <File Id="atom.branchentry.tmpl" Name="branchentry.tmpl" />
<File Id="atom.branches.tmpl" Name="branches.tmpl" />
Steve Borho
wix: catch up with more added files...
 r14819 <File Id="atom.bookmarks.tmpl" Name="bookmarks.tmpl" />
<File Id="atom.bookmarkentry.tmpl" Name="bookmarkentry.tmpl" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 </Component>
</Directory>
<Directory Id="templates.coaldir" Name="coal">
Steve Borho
wix: add support for x64 native MSI packages
 r13042 <Component Id="templates.coal" Guid="$(var.templates.coal.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="coal.header.tmpl" Name="header.tmpl" KeyPath="yes" />
<File Id="coal.map" Name="map" />
</Component>
</Directory>
<Directory Id="templates.gitwebdir" Name="gitweb">
Steve Borho
wix: add support for x64 native MSI packages
 r13042 <Component Id="templates.gitweb" Guid="$(var.templates.gitweb.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="gitweb.branches.tmpl" Name="branches.tmpl" KeyPath="yes" />
Steve Borho
wix: catch up with more added files...
 r14819 <File Id="gitweb.bookmarks.tmpl" Name="bookmarks.tmpl" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="gitweb.changelog.tmpl" Name="changelog.tmpl" />
<File Id="gitweb.changelogentry.tmpl" Name="changelogentry.tmpl" />
<File Id="gitweb.changeset.tmpl" Name="changeset.tmpl" />
<File Id="gitweb.error.tmpl" Name="error.tmpl" />
<File Id="gitweb.fileannotate.tmpl" Name="fileannotate.tmpl" />
Steve Borho
wix: pick up new template files
 r17420 <File Id="gitweb.filecomparison.tmpl" Name="filecomparison.tmpl" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="gitweb.filediff.tmpl" Name="filediff.tmpl" />
<File Id="gitweb.filelog.tmpl" Name="filelog.tmpl" />
<File Id="gitweb.filerevision.tmpl" Name="filerevision.tmpl" />
<File Id="gitweb.footer.tmpl" Name="footer.tmpl" />
<File Id="gitweb.graph.tmpl" Name="graph.tmpl" />
av6
gitweb: render changesets server-side on /graph page
 r35220 <File Id="gitweb.graphentry.tmpl" Name="graphentry.tmpl" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="gitweb.header.tmpl" Name="header.tmpl" />
<File Id="gitweb.index.tmpl" Name="index.tmpl" />
<File Id="gitweb.manifest.tmpl" Name="manifest.tmpl" />
<File Id="gitweb.map" Name="map" />
<File Id="gitweb.notfound.tmpl" Name="notfound.tmpl" />
<File Id="gitweb.search.tmpl" Name="search.tmpl" />
<File Id="gitweb.shortlog.tmpl" Name="shortlog.tmpl" />
<File Id="gitweb.summary.tmpl" Name="summary.tmpl" />
<File Id="gitweb.tags.tmpl" Name="tags.tmpl" />
Steve Borho
wix: add new help page templates
 r12791 <File Id="gitweb.help.tmpl" Name="help.tmpl" />
<File Id="gitweb.helptopics.tmpl" Name="helptopics.tmpl" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 </Component>
</Directory>
<Directory Id="templates.monobluedir" Name="monoblue">
Steve Borho
wix: add support for x64 native MSI packages
 r13042 <Component Id="templates.monoblue" Guid="$(var.templates.monoblue.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="monoblue.branches.tmpl" Name="branches.tmpl" KeyPath="yes" />
Steve Borho
wix: catch up with more added files...
 r14819 <File Id="monoblue.bookmarks.tmpl" Name="bookmarks.tmpl" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="monoblue.changelog.tmpl" Name="changelog.tmpl" />
<File Id="monoblue.changelogentry.tmpl" Name="changelogentry.tmpl" />
<File Id="monoblue.changeset.tmpl" Name="changeset.tmpl" />
<File Id="monoblue.error.tmpl" Name="error.tmpl" />
<File Id="monoblue.fileannotate.tmpl" Name="fileannotate.tmpl" />
Steve Borho
wix: pick up new template files
 r17420 <File Id="monoblue.filecomparison.tmpl" Name="filecomparison.tmpl" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="monoblue.filediff.tmpl" Name="filediff.tmpl" />
<File Id="monoblue.filelog.tmpl" Name="filelog.tmpl" />
<File Id="monoblue.filerevision.tmpl" Name="filerevision.tmpl" />
<File Id="monoblue.footer.tmpl" Name="footer.tmpl" />
<File Id="monoblue.graph.tmpl" Name="graph.tmpl" />
av6
monoblue: render changesets server-side on /graph page
 r35221 <File Id="monoblue.graphentry.tmpl" Name="graphentry.tmpl" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="monoblue.header.tmpl" Name="header.tmpl" />
<File Id="monoblue.index.tmpl" Name="index.tmpl" />
<File Id="monoblue.manifest.tmpl" Name="manifest.tmpl" />
<File Id="monoblue.map" Name="map" />
<File Id="monoblue.notfound.tmpl" Name="notfound.tmpl" />
<File Id="monoblue.search.tmpl" Name="search.tmpl" />
<File Id="monoblue.shortlog.tmpl" Name="shortlog.tmpl" />
<File Id="monoblue.summary.tmpl" Name="summary.tmpl" />
<File Id="monoblue.tags.tmpl" Name="tags.tmpl" />
Steve Borho
wix: add new help page templates
 r12791 <File Id="monoblue.help.tmpl" Name="help.tmpl" />
<File Id="monoblue.helptopics.tmpl" Name="helptopics.tmpl" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 </Component>
</Directory>
<Directory Id="templates.paperdir" Name="paper">
Steve Borho
wix: add support for x64 native MSI packages
 r13042 <Component Id="templates.paper" Guid="$(var.templates.paper.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="paper.branches.tmpl" Name="branches.tmpl" KeyPath="yes" />
Steve Borho
wix: add new file templates/paper/bookmarks.tmpl...
 r13695 <File Id="paper.bookmarks.tmpl" Name="bookmarks.tmpl" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="paper.changeset.tmpl" Name="changeset.tmpl" />
Adrian Buehlmann
wix: add missing templates/paper/diffstat.tmpl
 r14772 <File Id="paper.diffstat.tmpl" Name="diffstat.tmpl" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="paper.error.tmpl" Name="error.tmpl" />
<File Id="paper.fileannotate.tmpl" Name="fileannotate.tmpl" />
Steve Borho
wix: pick up new template files
 r17420 <File Id="paper.filecomparison.tmpl" Name="filecomparison.tmpl" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="paper.filediff.tmpl" Name="filediff.tmpl" />
<File Id="paper.filelog.tmpl" Name="filelog.tmpl" />
<File Id="paper.filelogentry.tmpl" Name="filelogentry.tmpl" />
<File Id="paper.filerevision.tmpl" Name="filerevision.tmpl" />
<File Id="paper.footer.tmpl" Name="footer.tmpl" />
<File Id="paper.graph.tmpl" Name="graph.tmpl" />
av6
paper: render changesets server-side on /graph page
 r35219 <File Id="paper.graphentry.tmpl" Name="graphentry.tmpl" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="paper.header.tmpl" Name="header.tmpl" />
<File Id="paper.index.tmpl" Name="index.tmpl" />
<File Id="paper.manifest.tmpl" Name="manifest.tmpl" />
<File Id="paper.map" Name="map" />
<File Id="paper.notfound.tmpl" Name="notfound.tmpl" />
<File Id="paper.search.tmpl" Name="search.tmpl" />
<File Id="paper.shortlog.tmpl" Name="shortlog.tmpl" />
<File Id="paper.shortlogentry.tmpl" Name="shortlogentry.tmpl" />
<File Id="paper.tags.tmpl" Name="tags.tmpl" />
Steve Borho
wix: add new help page templates
 r12791 <File Id="paper.help.tmpl" Name="help.tmpl" />
<File Id="paper.helptopics.tmpl" Name="helptopics.tmpl" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 </Component>
</Directory>
<Directory Id="templates.rawdir" Name="raw">
Steve Borho
wix: add support for x64 native MSI packages
 r13042 <Component Id="templates.raw" Guid="$(var.templates.raw.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="raw.changeset.tmpl" Name="changeset.tmpl" KeyPath="yes" />
<File Id="raw.error.tmpl" Name="error.tmpl" />
<File Id="raw.fileannotate.tmpl" Name="fileannotate.tmpl" />
<File Id="raw.filediff.tmpl" Name="filediff.tmpl" />
Steve Borho
wix: pick up new template files
 r17420 <File Id="raw.graph.tmpl" Name="graph.tmpl" />
<File Id="raw.graphedge.tmpl" Name="graphedge.tmpl" />
<File Id="raw.graphnode.tmpl" Name="graphnode.tmpl" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="raw.index.tmpl" Name="index.tmpl" />
<File Id="raw.manifest.tmpl" Name="manifest.tmpl" />
<File Id="raw.map" Name="map" />
<File Id="raw.notfound.tmpl" Name="notfound.tmpl" />
Steve Borho
wix: pull in new templates
 r20315 <File Id="raw.search.tmpl" Name="search.tmpl" />
<File Id="raw.logentry.tmpl" Name="logentry.tmpl" />
<File Id="raw.changelog.tmpl" Name="changelog.tmpl" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 </Component>
</Directory>
<Directory Id="templates.rssdir" Name="rss">
Steve Borho
wix: add support for x64 native MSI packages
 r13042 <Component Id="templates.rss" Guid="$(var.templates.rss.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="rss.changelog.tmpl" Name="changelog.tmpl" KeyPath="yes" />
<File Id="rss.changelogentry.tmpl" Name="changelogentry.tmpl" />
<File Id="rss.error.tmpl" Name="error.tmpl" />
<File Id="rss.filelog.tmpl" Name="filelog.tmpl" />
<File Id="rss.filelogentry.tmpl" Name="filelogentry.tmpl" />
<File Id="rss.header.tmpl" Name="header.tmpl" />
<File Id="rss.map" Name="map" />
<File Id="rss.tagentry.tmpl" Name="tagentry.tmpl" />
<File Id="rss.tags.tmpl" Name="tags.tmpl" />
Steve Borho
wix: catch up with more added files...
 r14819 <File Id="rss.bookmarks.tmpl" Name="bookmarks.tmpl" />
<File Id="rss.bookmarkentry.tmpl" Name="bookmarkentry.tmpl" />
Steve Borho
wix: pull in new templates
 r20315 <File Id="rss.branchentry.tmpl" Name="branchentry.tmpl" />
<File Id="rss.branches.tmpl" Name="branches.tmpl" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 </Component>
</Directory>
<Directory Id="templates.spartandir" Name="spartan">
Steve Borho
wix: add support for x64 native MSI packages
 r13042 <Component Id="templates.spartan" Guid="$(var.templates.spartan.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="spartan.branches.tmpl" Name="branches.tmpl" KeyPath="yes" />
<File Id="spartan.changelog.tmpl" Name="changelog.tmpl" />
<File Id="spartan.changelogentry.tmpl" Name="changelogentry.tmpl" />
<File Id="spartan.changeset.tmpl" Name="changeset.tmpl" />
<File Id="spartan.error.tmpl" Name="error.tmpl" />
<File Id="spartan.fileannotate.tmpl" Name="fileannotate.tmpl" />
<File Id="spartan.filediff.tmpl" Name="filediff.tmpl" />
<File Id="spartan.filelog.tmpl" Name="filelog.tmpl" />
<File Id="spartan.filelogentry.tmpl" Name="filelogentry.tmpl" />
<File Id="spartan.filerevision.tmpl" Name="filerevision.tmpl" />
<File Id="spartan.footer.tmpl" Name="footer.tmpl" />
<File Id="spartan.graph.tmpl" Name="graph.tmpl" />
av6
spartan: render changesets server-side on /graph page
 r35222 <File Id="spartan.graphentry.tmpl" Name="graphentry.tmpl" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="spartan.header.tmpl" Name="header.tmpl" />
<File Id="spartan.index.tmpl" Name="index.tmpl" />
<File Id="spartan.manifest.tmpl" Name="manifest.tmpl" />
<File Id="spartan.map" Name="map" />
<File Id="spartan.notfound.tmpl" Name="notfound.tmpl" />
<File Id="spartan.search.tmpl" Name="search.tmpl" />
<File Id="spartan.shortlog.tmpl" Name="shortlog.tmpl" />
<File Id="spartan.shortlogentry.tmpl" Name="shortlogentry.tmpl" />
<File Id="spartan.tags.tmpl" Name="tags.tmpl" />
</Component>
</Directory>
<Directory Id="templates.staticdir" Name="static">
Steve Borho
wix: add support for x64 native MSI packages
 r13042 <Component Id="templates.static" Guid="$(var.templates.static.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="static.background.png" Name="background.png" KeyPath="yes" />
<File Id="static.coal.file.png" Name="coal-file.png" />
<File Id="static.coal.folder.png" Name="coal-folder.png" />
Denis Laxalde
hgweb: rename linerangelog.js as followlines.js...
 r31785 <File Id="static.followlines.js" Name="followlines.js" />
Steve Borho
wix: a new mercurial.js has replaced graph.js
 r14078 <File Id="static.mercurial.js" Name="mercurial.js" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="static.hgicon.png" Name="hgicon.png" />
<File Id="static.hglogo.png" Name="hglogo.png" />
Steve Borho
wix: style-coal.css has been renamed
 r26886 <File Id="static.style.coal.css" Name="style-extra-coal.css" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Id="static.style.gitweb.css" Name="style-gitweb.css" />
<File Id="static.style.monoblue.css" Name="style-monoblue.css" />
<File Id="static.style.paper.css" Name="style-paper.css" />
<File Id="static.style.css" Name="style.css" />
Steve Borho
wix: pull in new templates
 r20315 <File Id="static.feed.icon" Name="feed-icon-14x14.png" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 </Component>
</Directory>
</Directory>
</DirectoryRef>
</Fragment>
</Wix>