| Submitter | Urs Rau |
|---|---|
| Date | Jan. 6, 2016, 5:16 p.m. |
| Message ID | <34853411-EA8A-42C2-BEDA-027BA1CA74D7@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/12573/ |
| State | Superseded |
| Headers | show |
Comments
This seems a reasonable change. can someone with some windows knownledge stamp this? On 01/06/2016 05:16 PM, Urs Rau wrote: > changeset: 27611:09c13d8ada6f > branch: stable > user: Urs Rau <urs.rau@gmail.com> > date: Wed Jan 06 16:46:05 2016 +0000 > summary: installer: add windows application version number to inno installer script > files: contrib/win32/mercurial.iss > description: > installer: add windows application version number to inno installer script > > Changeset 09c13d8ada6f this addition to the inno installer script means that the windows uninstaller registry key “DisplayVersion" is set to the application version number and will show in Add/Remove Programs. > > > # HG changeset patch > # User Urs Rau <urs.rau@gmail.com> > # Date 1452098765 0 > # Wed Jan 06 16:46:05 2016 +0000 > # Node ID 09c13d8ada6fe818a4067a790d731ce598758551 > # Parent b8405d739149cdd6d8d9bd5e3dd2ad8487b1f09a > installer: add windows application version number to inno installer script > > diff -r b8405d739149 -r 09c13d8ada6f contrib/win32/mercurial.iss > --- a/contrib/win32/mercurial.iss Sat Jan 02 02:13:56 2016 +0100 > +++ b/contrib/win32/mercurial.iss Wed Jan 06 16:46:05 2016 +0000 > @@ -23,6 +23,7 @@ > [Setup] > AppCopyright=Copyright 2005-2015 Matt Mackall and others > AppName=Mercurial > +AppVersion={#VERSION} > #if ARCH == "x64" > AppVerName=Mercurial {#VERSION} (64-bit) > OutputBaseFilename=Mercurial-{#VERSION}-x64 > > > > Hope this says it all and is in the right format? I've to admit I'm a bit puzzle by the way you formatted this email, but we should be able to get it in the repo as a patch. Can you explain to us how our wiki failed you? https://www.mercurial-scm.org/wiki/ContributingChanges#Emailing_patches
Not sure why you've got "hg email --flag stable" in your subject. That's supposed to be a Mercurial command that makes your subject start with "[PATCH stable]" when it properly formats and sends your patch. On Wed, 2016-01-06 at 17:16 +0000, Urs Rau wrote: > changeset: 27611:09c13d8ada6f > branch: stable > user: Urs Rau <urs.rau@gmail.com> > date: Wed Jan 06 16:46:05 2016 +0000 > summary: installer: add windows application version number to inno > installer script > files: contrib/win32/mercurial.iss > description: > installer: add windows application version number to inno installer script This appears to be hacked output from hg log -v. Not sure why you're sending it, we don't need anything but the "hg export" output. > Changeset 09c13d8ada6f Self-referential commit message? Either you've cracked SHA1 or you're just inserting the following description that should be in the commit into your email. > this addition to the inno installer script means that the windows uninstaller > registry key “DisplayVersion" is set to the application version number and > will show in Add/Remove Programs. > # HG changeset patch > # User Urs Rau <urs.rau@gmail.com> > # Date 1452098765 0 > # Wed Jan 06 16:46:05 2016 +0000 > # Node ID 09c13d8ada6fe818a4067a790d731ce598758551 > # Parent b8405d739149cdd6d8d9bd5e3dd2ad8487b1f09a > installer: add windows application version number to inno installer script This looks like what we're expecting. But the description from above is missing here. So it will probably not make it into the repository when we use "hg import" on your email. You should instead use "hg commit --amend" and put everything you want to say about the patch there. -- Mathematics is the supreme nostalgia of our time.
Patch
diff -r b8405d739149 -r 09c13d8ada6f contrib/win32/mercurial.iss --- a/contrib/win32/mercurial.iss Sat Jan 02 02:13:56 2016 +0100 +++ b/contrib/win32/mercurial.iss Wed Jan 06 16:46:05 2016 +0000 @@ -23,6 +23,7 @@ [Setup] AppCopyright=Copyright 2005-2015 Matt Mackall and others AppName=Mercurial +AppVersion={#VERSION} #if ARCH == "x64" AppVerName=Mercurial {#VERSION} (64-bit) OutputBaseFilename=Mercurial-{#VERSION}-x64