Mercurial > evolve
view Makefile @ 6311:466702ac6c28
topic: complete "//" format support in experimental.topic.linear-merge code
This code is used for merging topics into bare branches (with
"allow-from-bare-branch"), and it modifies branch name on a specific revision
to be different from branch name on the merge destination. This allows merging
the two changesets even when they belong to the same branch.
Let's use formatfqbn() for consistency. The format doesn't matter much as long
as the result is different from bare branch name.
Topic namespace is ignored here by design, there needs to be a topic set for
this linear-merge mode to work.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Fri, 16 Sep 2022 17:00:48 +0400 |
parents | 7da0f8128d90 |
children | a80ed2e4745b |
line wrap: on
line source
PYTHON ?= python3 VERSION = $(shell $(PYTHON) setup.py --version) TESTFLAGS ?= $(shell echo $$HGTESTFLAGS) HGTESTS = $(HGROOT)/tests .PHONY: help help: @echo 'Commonly used make targets:' @echo ' deb-prepare - prepare the build of a debian package' @echo ' install-home - install with setup.py install --home=$$HOME ($(HOME))' @echo ' tests - run all tests in the automatic test suite' .PHONY: all all: help .PHONY: deb-prepare deb-prepare: $(PYTHON) setup.py sdist --dist-dir .. mv -f ../hg-evolve-$(VERSION).tar.gz ../mercurial-evolve_$(VERSION).orig.tar.gz tar xf ../mercurial-evolve_$(VERSION).orig.tar.gz rm -rf ../mercurial-evolve_$(VERSION).orig mv hg-evolve-$(VERSION) ../mercurial-evolve_$(VERSION).orig cp -r debian/ ../mercurial-evolve_$(VERSION).orig/ @cd ../mercurial-evolve_$(VERSION).orig && echo 'debian build directory ready at' `pwd` .PHONY: install-home install-home: $(PYTHON) setup.py install --home="$(HOME)" --prefix="" --force .PHONY: doc doc: $(MAKE) -C docs .PHONY: _check_hgroot _check_hgroot: ifeq ($(HGROOT),) $(error HGROOT is not set to the root of the hg source tree) endif .PHONY: tests tests: _check_hgroot cd tests && $(PYTHON) $(HGTESTS)/run-tests.py $(TESTFLAGS) test-%: _check_hgroot cd tests && $(PYTHON) $(HGTESTS)/run-tests.py $(TESTFLAGS) $@