topic: take topic in account for all branch head computation This changeset introduce a "topicmap" that is tracking not just the head of all branches, but the heads of all branch+topic pair. Including the head of the part of the branch without any topic. In practice this means that BRANCHNAME now resolve to the tipmost part for the branch without topic and impact various other logic like head checking during push and default destination for update and merge (these aspect will need adjustment in later changesets). The on-the-fly-temporary-monkey-patching process is pretty horrible, but allow to move forward without waiting on having core patched. We use 'branch:topic' as the branchmap key, this is a small and easy hack that help use a lot for (future) support of heads discovery/checking and on disc cache. I'm not sure it is worthwhile to improve this until an implementation into core. Note that this changeset change the branchmap in all cases, including during exchange, see next changeset for improved behavior. We also currently have the on-disk cache disabled because the core branchmap is lacking phase information in its cache key. This will get done in a later changesets

     1

PYTHON=python

     2

ifeq ($(HGROOT),)

     3

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

     4

endif

     5

TESTFLAGS ?= $(shell echo $$HGTESTFLAGS)

     6

     7

HGTESTS=$(HGROOT)/tests

     8

     9

help:

    10

	@echo 'Commonly used make targets:'

    11

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

    12

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

    13

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

    14

    15

all: help

    16

    17

tests:

    18

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

    19

    20

test-%:

    21

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

    22

    23

tests-%:

    24

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

    25

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

    26

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

    27

    28

all-version-tests: tests-3.7 tests-tip

    29

    30

.PHONY: tests all-version-tests