view contrib/vagrant/Vagrantfile @ 24993:be58bd30a478

amend: use dirstateguard instead of dirstate.invalidate

Before this patch, "cmdutil.amend()" uses "dirstate.invalidate()" as a
kind of "restore .hg/dirstate to the original status" during a failure.

But it just discards changes in memory, and doesn't actually restore
".hg/dirstate". Then, it can't work as expected, if "dirstate.write()"
is executed while processing.

This patch uses "dirstateguard" instead of "dirstate.invalidate()" to
restore ".hg/dirstate" at failure even if "dirstate.write()" is
executed before failure.

This is a part of preparations to fix the issue that the recent (in
memory) dirstate isn't visible to external process (e.g. "precommit"
hook).

# -*- mode: ruby -*-

Vagrant.configure('2') do |config|
  # Debian 7.4 32-bit i386 without configuration management software
  config.vm.box = "puppetlabs/debian-7.4-32-nocm"
  #config.vm.box = "pnd/debian-wheezy32-basebox"
  config.vm.hostname = "tests"

  config.vm.define "tests" do |conf|
    conf.vm.provision :file, source: "run-tests.sh", destination:"run-tests.sh"
    conf.vm.provision :shell, path: "provision.sh"
    conf.vm.synced_folder "../..", "/hgshared"
  end
end