evolve: protect call to rebase within a wlock (#42, #35, #16) Without a wlock, repo.commit would blow away the dirstate's parents on OSes that have no 'os.symlink' support in python, leading evolve to produce a merge instead of a rebase. If a user ran the rebase command instead of evolve, then things would work because rebase is wrapped in a giant wlock. Unfortunately, we can't use the same idea of wrapping the evolve command in one giant wlock because that's too early in the process. If the lock did wrap the entire evolve command, then the working directory would save its current parents which, since rebase hasn't been called yet, would be just p1. Therefore, we need to obtain the lock *after* the dirstate's parents are changed but *before* the call to rebase. This way ensures that when a conflict happens the working directory correctly shows both parent changeset.

     1

#!/usr/bin/make -f

     2

     3

clean %:

     4

	dh $@ --with python2 --buildsystem=python_distutils

     5

     6

build:

     7

	dh build --with python2 --buildsystem=python_distutils

     8

	$(MAKE) -C docs

     9

    10

ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))

    11

override_dh_auto_test:

    12

	cd tests &&  python run-tests.py --with-hg=`which hg`

    13

endif

    14

    15

override_dh_python2:

    16

	# avoid conflict with mercurial's own hgext/__init__.py

    17

	find debian -name __init__.py -delete

    18

	dh_python2

    19

    20

clean: clean-docs

    21

    22

clean-docs:

    23

	rm -rf html

    24

	rm -f docs/static/logo-evolve.ico

    25

	rm -f docs/tutorials/tutorial.rst

    26

    27

.PHONY: build clean clean-docs