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

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

outgoing: pay attention to `default:pushurl` for bookmarks and subrepos...
outgoing: pay attention to `default:pushurl` for bookmarks and subrepos The problem here was that `default:pushurl` and `default` get translated to a single entry in `ui.paths` named 'default', with an attribute for 'pushloc', 'loc', and 'rawloc'. ui.expandpath() then always takes the `rawloc` attribute. Maybe the ui.expandpath() API is busted and should be removed? Or maybe getpath() should return a copy that adds an attribute reflecting the URL of the path chosen? I thought that I could remove the code in hg._outgoing() and pass the location resolved in commands.py as `dest`, but unfortunately that code is needed there to resolve #branch type URLs. Maybe that should be pulled up to commands.py, because I can't see any reasonable behavior for a subrepo path that's constructed out of that type of URL. The push command already resolves this early, so that works properly. But it looks like bundle, histedit, largefiles, patchbomb, and summary use a similar pattern, so they are likely similarly affected.
Steve Borho - - Load All Authors

File last commit:

r22445:5716d10e default
r38188:dfb888aa default
Show More
contrib.wxs
43 lines | 1.4 KiB | text/plain | TextLexer
/ contrib / wix / contrib.wxs
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
 r10513 <?xml version="1.0" encoding="utf-8"?>
<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="contribFolder">
<ComponentRef Id="contrib" />
<ComponentRef Id="contrib.vim" />
</ComponentGroup>
</Fragment>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
<Directory Id="contribdir" Name="contrib" FileSource="$(var.SourceDir)">
Steve Borho
wix: add support for x64 native MSI packages
 r13042 <Component Id="contrib" Guid="$(var.contrib.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Name="bash_completion" KeyPath="yes" />
<File Name="hgk" />
Steve Borho
wix: hgweb file renames
 r11006 <File Name="hgweb.fcgi" />
<File Name="hgweb.wsgi" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Name="logo-droplets.svg" />
<File Name="mercurial.el" />
<File Name="tcsh_completion" />
<File Name="tcsh_completion_build.sh" />
<File Name="xml.rnc" />
<File Name="zsh_completion" />
</Component>
<Directory Id="vimdir" Name="vim">
Steve Borho
wix: add support for x64 native MSI packages
 r13042 <Component Id="contrib.vim" Guid="$(var.contrib.vim.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 <File Name="hg-menu.vim" KeyPath="yes" />
<File Name="HGAnnotate.vim" />
<File Name="hgcommand.vim" />
<File Name="patchreview.txt" />
<File Name="patchreview.vim" />
Steve Borho
wix: add vim syntax file for Mercurial unit tests
 r12792 <File Name="hgtest.vim" />
Adrian Buehlmann
wix: refactor and new guids.wxi
 r10828 </Component>
</Directory>
</Directory>
</DirectoryRef>
</Fragment>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
 r10513 </Wix>