evolve: create a new commit instead of amending one of the divergents This patch changes the behavior of evolve command while resolving content-divergence to create a new commit instead of amending one of the divergent ones. In past, I have made this change, backed out this change and now today again I am doing this change, so let's dive in some history. Using cmdrewrite.amend() was never a good option as that requires hack to delete the evolvestate and also gives us less control over things. We can't make the commit on top of different parents as that of content-divergent ones. Due to all these, I first made this change to create a new commit instead of amending one. But, after few days, there was flakiness observed in the tests and turned out that we need to do some dirstate dance as repo.dirstate.setparents() does not always fix the dirstate. That flakiness was a blocker for progress at that time and we decided to switch to amend back so that we can have things working with some hacks and we can later fix the implementation part. Now, yesterday while tackling resolving content-divergence of a stack which is as follows: C1 C2 | | B1 B2 | | A1 A2 \/ base where, A1-A2, B1-B2, C1-C2 are content-divergent with each other. Now we can resolve A1-A2 very well because they have the same parent and let's say that resolution leads to A3. Now, we want to resolve B1-B2 and make the new resolution commit on top of A3 so that we can end up something like: C3 | B3 | A3 | base however, amending one of the divergent changesets, it's not possible to create a commit on a different parent like A3 here without some relocation. We should prevent relocation as that may leads to some conflicts and should change the parent before committing. So, looking ahead, we can't move with using amend as still using that we will need some relocation hacks making code ugly and prone to bad behaviors, bugs. Let's change back to creating a new commit so that we can move forward in a good way. About repo.dirstate.setparents() not setting the dirstate, I have researched yesterday night about how we can do that and found out that we can use cmdrewrite._uncommitdirstate() here. Expect upcoming patches to improve the documentation of that function. There are lot of test changes because of change in hash but there is no behavior change. The only behavior change is in test-evolve-abort-contentdiv.t which is nice because creating a new commit helps us in stripping that while aborting. We have a lot of testing of content-divergence and no behavior change gives enough confidence for making this change. I reviewed the patch carefully to make sure there is no behavior change and I suggest reviewer to do the same.

     1

VERSION=$(shell python setup.py --version)

     2

     3

PYTHON=python

     4

     5

all: help

     6

     7

deb-prepare:

     8

	python setup.py sdist --dist-dir ..

     9

	mv -f ../hg-evolve-$(VERSION).tar.gz ../mercurial-evolve_$(VERSION).orig.tar.gz

    10

	tar xf ../mercurial-evolve_$(VERSION).orig.tar.gz

    11

	rm -rf ../mercurial-evolve_$(VERSION).orig

    12

	mv hg-evolve-$(VERSION) ../mercurial-evolve_$(VERSION).orig

    13

	cp -r debian/ ../mercurial-evolve_$(VERSION).orig/

    14

	@cd ../mercurial-evolve_$(VERSION).orig && echo 'debian build directory ready at' `pwd`

    15

    16

install-home:

    17

	$(PYTHON) setup.py install --home="$(HOME)" --prefix="" --force

    18

    19

# test targets

    20

TESTFLAGS ?= $(shell echo $$HGTESTFLAGS)

    21

    22

HGTESTS=$(HGROOT)/tests

    23

    24

help:

    25

	@echo 'Commonly used make targets:'

    26

	@echo '  deb-prepare        - prepare the build of a debian package'

    27

	@echo '  tests              - run all tests in the automatic test suite'

    28

	@echo '  all-version-tests - run all tests against many hg versions'

    29

	@echo '  tests-%s           - run all tests in the specified hg version'

    30

    31

all: help

    32

    33

_check_hgroot:

    34

ifeq ($(HGROOT),)

    35

	$(error HGROOT is not set to the root of the hg source tree)

    36

endif

    37

    38

tests: _check_hgroot

    39

	cd tests && $(PYTHON) $(HGTESTS)/run-tests.py $(TESTFLAGS)

    40

    41

# /!\ run outside of the compatibility branch output test will likely fails

    42

    43

test-%: _check_hgroot

    44

	cd tests && $(PYTHON) $(HGTESTS)/run-tests.py $(TESTFLAGS) $@

    45

    46

tests-%: _check_hgroot

    47

	hg -R $(HGROOT) checkout $$(echo $@ | sed s/tests-//) && \

    48

	(cd $(HGROOT) ; $(MAKE) clean ) && \

    49

	cd tests && $(PYTHON) $(HGTESTS)/run-tests.py $(TESTFLAGS)

    50

    51

# build a script to extract declared version

    52

all-version-tests: tests-@

    53

    54

.PHONY: tests all-version-tests