Mercurial > hg
annotate contrib/wix/doc.wxs @ 17658:a02c1ffddae9 stable
largefiles: handle commit -A properly, after a --large commit (issue3542)
Previous to this, 'commit -A' would add as normal files, files that were already
committed as largefiles, resulting in files being listed twice by 'status -A'.
It also missed when (only) a largefile was deleted, even though status reported
it as '!'. This also has the side effect of properly reporting the state of the
affected largefiles in the post commit hook after a remove that also affected a
normal file (the largefiles used to be 'R', now are properly absent).
Since scmutil.addremove() is called both by the ui command (after some trivial
argument validation) and during the commit process when -A is specified, it
seems like a more appropriate method to wrap than the addremove command.
Currently, a repo is only enabled to use largefiles after an add that explicitly
identifies some file as large, and a subsequent commit. Therefore, this patch
only changes behavior after such a largefile enabling commit.
Note that in the test, if the final commit had a '-v', 'removing large8' would
be printed twice. Both of these originate in removelargefiles(). The first
print is in verbose mode after traversing remove + forget, the second is because
the '_isaddremove' attr is set and 'after' is not.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 30 Jul 2012 20:56:41 -0400 |
parents | bd9bc4123920 |
children |
rev | line source |
---|---|
10513
47838dee7d60
contrib/wix: switch *.wxs files to LF eol
Adrian Buehlmann <adrian@cadifra.com>
parents:
10502
diff
changeset
|
1 <?xml version="1.0" encoding="utf-8"?> |
47838dee7d60
contrib/wix: switch *.wxs files to LF eol
Adrian Buehlmann <adrian@cadifra.com>
parents:
10502
diff
changeset
|
2 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
10513
diff
changeset
|
3 |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
10513
diff
changeset
|
4 <?include guids.wxi ?> |
13042
bd9bc4123920
wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
10930
diff
changeset
|
5 <?include defines.wxi ?> |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
10513
diff
changeset
|
6 |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
10513
diff
changeset
|
7 <Fragment> |
10930 | 8 <ComponentGroup Id="docFolder"> |
9 <ComponentRef Id="doc.hg.1.html" /> | |
10 <ComponentRef Id="doc.hgignore.5.html" /> | |
11 <ComponentRef Id="doc.hgrc.5.html" /> | |
12 <ComponentRef Id="doc.style.css" /> | |
13 </ComponentGroup> | |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
10513
diff
changeset
|
14 </Fragment> |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
10513
diff
changeset
|
15 |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
10513
diff
changeset
|
16 <Fragment> |
10930 | 17 <DirectoryRef Id="INSTALLDIR"> |
18 <Directory Id="docdir" Name="doc" FileSource="$(var.SourceDir)"> | |
13042
bd9bc4123920
wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
10930
diff
changeset
|
19 <Component Id="doc.hg.1.html" Guid="$(var.doc.hg.1.html.guid)" Win64='$(var.IsX64)'> |
10930 | 20 <File Name="hg.1.html" KeyPath="yes"> |
21 <Shortcut Id="hg1StartMenu" Directory="ProgramMenuDir" | |
22 Name="Mercurial Command Reference" | |
23 Icon="hgIcon.ico" IconIndex="0" Advertise="yes" | |
24 /> | |
25 </File> | |
26 </Component> | |
13042
bd9bc4123920
wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
10930
diff
changeset
|
27 <Component Id="doc.hgignore.5.html" Guid="$(var.doc.hgignore.5.html.guid)" Win64='$(var.IsX64)'> |
10930 | 28 <File Name="hgignore.5.html" KeyPath="yes"> |
29 <Shortcut Id="hgignore5StartMenu" Directory="ProgramMenuDir" | |
30 Name="Mercurial Ignore Files" | |
31 Icon="hgIcon.ico" IconIndex="0" Advertise="yes" | |
32 /> | |
33 </File> | |
34 </Component> | |
13042
bd9bc4123920
wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
10930
diff
changeset
|
35 <Component Id="doc.hgrc.5.html" Guid="$(var.doc.hgrc.5.html)" Win64='$(var.IsX64)'> |
10930 | 36 <File Name="hgrc.5.html" KeyPath="yes"> |
37 <Shortcut Id="hgrc5StartMenu" Directory="ProgramMenuDir" | |
38 Name="Mercurial Configuration Files" | |
39 Icon="hgIcon.ico" IconIndex="0" Advertise="yes" | |
40 /> | |
41 </File> | |
42 </Component> | |
13042
bd9bc4123920
wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
10930
diff
changeset
|
43 <Component Id="doc.style.css" Guid="$(var.doc.style.css)" Win64='$(var.IsX64)'> |
10930 | 44 <File Name="style.css" KeyPath="yes" /> |
45 </Component> | |
46 </Directory> | |
47 </DirectoryRef> | |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
10513
diff
changeset
|
48 </Fragment> |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
10513
diff
changeset
|
49 |
10513
47838dee7d60
contrib/wix: switch *.wxs files to LF eol
Adrian Buehlmann <adrian@cadifra.com>
parents:
10502
diff
changeset
|
50 </Wix> |