1295191 - 'mach mercurial-setup' fails if there are uncommited changes in the version-control-tools repository

Status: RESOLVED WONTFIX

(Developer Services :: Mercurial: configwizard, defect)

Description

[Botond Ballo [:botond] [away until Oct 19]]

STR:
  1. Make a local uncommitted change to your v-c-t checkout
     (imagine this is for a debugging or development purpose).
  2. Run 'mach mercurial-setup'

The result is the following:


botond@botond-desktop:~/dev/mozilla/central$ ./mach mercurial-setup
================================================================================
Ensuring https://hg.mozilla.org/hgcustom/version-control-tools is up to date at /home/botond/.mozbuild/version-control-tools
pulling from https://hg.mozilla.org/hgcustom/version-control-tools
searching for changes
no changes found
abort: uncommitted changes
================================================================================
Error running mach:

    ['mercurial-setup']

The error occurred in code that was called by the mach command. This is either
a bug in the called code itself or in the way that mach is calling it.

You should consider filing a bug for this issue.

If filing a bug, please include the full output of mach, including this error
message.

The details of the failure are as follows:

CalledProcessError: Command '[u'/usr/local/bin/hg', 'update', '-r', '@']' returned non-zero exit status 255

  File "/home/botond/dev/mozilla/central/python/mozboot/mozboot/mach_commands.py", line 67, in mercurial_setup
    bootstrap.configure_mercurial(hg, self._context.state_dir)
  File "/home/botond/dev/mozilla/central/python/mozboot/mozboot/bootstrap.py", line 296, in configure_mercurial
    vct_dir = update_vct(hg, root_state_dir)
  File "/home/botond/dev/mozilla/central/python/mozboot/mozboot/bootstrap.py", line 289, in update_vct
    vct_dir, '@')
  File "/home/botond/dev/mozilla/central/python/mozboot/mozboot/bootstrap.py", line 339, in update_mercurial_repo
    subprocess.check_call([hg, 'update', '-r', revision], cwd=dest)
  File "/usr/lib/python2.7/subprocess.py", line 540, in check_call
    raise CalledProcessError(retcode, cmd)
botond@botond-desktop:~/dev/mozilla/central$

Comment 1

[Gregory Szorc [:gps]]

This is a really low priority bug, as I imagine most people won't have modifications to their v-c-t repo. The workaround should be pretty simple: commit your changes to v-c-t before running `mach mercurial-setup`.

If you are trying to test `hg configwizard`, you can activate the extension and run it locally, outside of `mach mercurial-setup`:

  $ hg --config extensions.configwizard=hgext/configwizard configwizard

Comment 2

[Sylvestre Ledru [:Sylvestre]]

Just like gps said, it is a bunch of work for a small gain. Closing.