Mercurial > hg
annotate contrib/wix/dist.wxs @ 13155:f02d7a562a21
subrepo: avoids empty commit when .hgsubstate is dirty (issue2403)
This patch avoids empty commit when .hgsubstate is dirty. Empty commit
was caused by .hgsubstate being updated back to the state of the
working copy parent when committing, if a user had changed it manually
and not made any changes in subrepositories.
The subrepository state from the working copies parent is compared
with the state calculated as a result of trying to commit the
subrepositories. If the two states are the same, then return None
otherwise the commit is just done.
The line: "committing subrepository x" will be written if there is
nothing committed, but .hgsubstate is dirty for x subrepository.
author | Erik Zielke <ez@aragost.com> |
---|---|
date | Mon, 29 Nov 2010 09:37:23 +0100 |
parents | bd9bc4123920 |
children | f1fa8f481c7c |
rev | line source |
---|---|
13041
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
1 <?xml version="1.0" encoding="utf-8"?> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
2 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
3 |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
4 <?include guids.wxi ?> |
13042
bd9bc4123920
wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
13041
diff
changeset
|
5 <?include defines.wxi ?> |
13041
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
6 |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
7 <Fragment> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
8 <DirectoryRef Id="INSTALLDIR" FileSource="$(var.SourceDir)"> |
13042
bd9bc4123920
wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
13041
diff
changeset
|
9 <Component Id="distOutput" Guid="$(var.dist.guid)" Win64='$(var.IsX64)'> |
13041
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
10 <File Name="library.zip" KeyPath="yes" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
11 <File Name="mercurial.base85.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
12 <File Name="mercurial.bdiff.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
13 <File Name="mercurial.diffhelpers.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
14 <File Name="mercurial.mpatch.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
15 <File Name="mercurial.osutil.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
16 <File Name="mercurial.parsers.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
17 <File Name="pyexpat.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
18 <File Name="python26.dll" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
19 <File Name="pythoncom26.dll" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
20 <File Name="pywintypes26.dll" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
21 <File Name="bz2.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
22 <File Name="select.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
23 <File Name="unicodedata.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
24 <File Name="win32api.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
25 <File Name="win32com.shell.shell.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
26 <File Name="win32console.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
27 <File Name="win32file.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
28 <File Name="win32gui.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
29 <File Name="win32pipe.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
30 <File Name="win32process.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
31 <File Name="_elementtree.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
32 <File Name="_hashlib.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
33 <File Name="_socket.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
34 <File Name="_ssl.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
35 <File Name="_win32sysloader.pyd" /> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
36 </Component> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
37 </DirectoryRef> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
38 </Fragment> |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
39 |
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
40 </Wix> |