Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib/macosx/Welcome.html
author Matt Harbison <matt_harbison@yahoo.com>
Sun, 11 Feb 2018 20:59:35 -0500
changeset 36092 fe5c4b795999
parent 29534 7794e13c6a7e
permissions -rw-r--r--
test-merge-tools: stabilize for Windows This masks the Windows argument parsing insanity[1], so it needs a bit of explanation. (The security reference in the footnote is probably useful to keep in mind if we ever whitelist certain in-repo config settings.) 9037c29e9f53 introduced tests that were failing on Windows with an unbalanced double quote[2]. What ends up happening here is util.shellquote() is double quoting the file path, but the shell script is placing this ->": "<- right next to it. So cmd.exe gets launched with 'lb:base": ""c:\...\f~base.xyz"', which got interpreted as 'lb:base: "c:\...\f~base.xyz'. If the test is adjusted to quote like "lb:$labelbase: $base", then MSYS runs interference and strips the '\' characters. I was able to get the expected result by dropping the quotes from '": "', and changing the space to underscore. But since we need to glob away the C: part anyway, just glob away the quote and leave the test unchanged. [1] https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/ [2] https://buildbot.mercurial-scm.org/builders/Win7%20x86_64%20hg%20tests/builds/441/steps/run-tests.py%20%28python%202.7.13%29/logs/stdio
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1686
dd5085897010 make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     1
 
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
29534
7794e13c6a7e osx: correct comment about ordering of welcome page
Augie Fackler <augie@google.com>
parents: 26421
diff changeset 
     2
 
<!-- This is the first screen displayed during the install. -->
1686
dd5085897010 make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     3
 
<html>
dd5085897010 make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     4
 
<head>
dd5085897010 make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     5
 
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
dd5085897010 make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     6
 
  <meta http-equiv="Content-Style-Type" content="text/css">
dd5085897010 make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     7
 
  <title></title>
dd5085897010 make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     8
 
  <style type="text/css">
2681
259acfb963d1 Update Windows and Mac installers to 0.9.1 release
Lee Cantey <lcantey@gmail.com>
parents: 2516
diff changeset 
     9
 
    p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica}
1686
dd5085897010 make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    10
 
    p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px}
dd5085897010 make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    11
 
  </style>
dd5085897010 make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    12
 
</head>
dd5085897010 make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    13
 
<body>
26421
4b0fc75f9403 urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents: 8936
diff changeset 
    14
 
<p class="p1">This is a prepackaged release of <a href="https://mercurial-scm.org/">Mercurial</a> for Mac OS X.</p>
1686
dd5085897010 make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    15
 
<p class="p2"><br></p>
2681
259acfb963d1 Update Windows and Mac installers to 0.9.1 release
Lee Cantey <lcantey@gmail.com>
parents: 2516
diff changeset 
    16
 
<br>
3863
1ef8ada4370f Remove hard-coded version numbers and release notes from packaging
Matt Mackall <mpm@selenic.com>
parents: 2681
diff changeset 
    17
 
<p>
26421
4b0fc75f9403 urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents: 8936
diff changeset 
    18
 
Please be sure to read the latest <a href="https://mercurial-scm.org/wiki/WhatsNew">release notes</a>.</p>
1686
dd5085897010 make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    19
 
</body>
dd5085897010 make stuff for macos x binary package.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    20
 
</html>
hg-stable