contrib/wix/i18n.wxs

largefiles: put whole "hgmerge" process into the same "wlock" scope

Before this patch, there are two distinct "wlock" scopes below in
"hgmerge":

  1. "merge.update" via original "hg.merge" function
  2. "updatelfiles" specific "wlock" scope (to synchronize largefile
     dirstate)

But these should be executed in the same "wlock" scope for
consistency, because users of "hg.merge" don't get "wlock" explicitly
before invocation of it.

  - merge in commands

This patch puts almost all of the original "hgmerge" implementation into
"_hgmerge" to reduce changes.

<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

  <?include guids.wxi ?>
  <?include defines.wxi ?>

  <?define hg_po_langs =
    da;de;el;fr;it;ja;pt_BR;ro;ru;sv;zh_CN;zh_TW
  ?>

  <Fragment>
    <DirectoryRef Id="INSTALLDIR">
      <Directory Id="i18ndir" Name="i18n" FileSource="$(var.SourceDir)">
        <Component Id="i18nFolder" Guid="$(var.i18nFolder.guid)" Win64='$(var.IsX64)'>
          <File Name="hggettext" KeyPath="yes" />
          <?foreach LANG in $(var.hg_po_langs) ?>
            <File Id="hg.$(var.LANG).po"
                  Name="$(var.LANG).po"
            />
          <?endforeach?>
        </Component>
      </Directory>
    </DirectoryRef>
  </Fragment>

</Wix>