debian/rules
author Sushil khanchi <sushilkhanchi97@gmail.com>
Tue, 25 Jun 2019 21:54:22 +0530
changeset 4704 5f90eb8fd63c
parent 4645 6292fe564b20
child 4909 56a8fbdd6090
permissions -rwxr-xr-x
evolve: fix confusion in branch heads checking logic when topic in play To provide some context, when topics are in play the branchmap cache we store contains the branch info of a rev as "branch:topic" format IIUC. Assuming that is right, now in present code we don't actually cover this part that "when looking for branch heads where we also have active topic we should look for branch='branch_name:topic' instead". And we get wrong branch heads as a result. This patch make sure that we pass right candidate to find branch heads using branchmap.branchheads() by overriding the localrepo.branchheads() Changes in test file reflect the fixed behavior.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
531
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     1
#!/usr/bin/make -f
1123
d6c065a7a6b1 debian: Add DH_VERBOSE, commented out, for debugging convenience
Faheem Mitha <faheem@faheem.info>
parents: 999
diff changeset
     2
#export DH_VERBOSE=1
531
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     3
1124
25e8f9c43f8a debian: remove clean target before implicit match rule
Faheem Mitha <faheem@faheem.info>
parents: 1123
diff changeset
     4
%:
531
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     5
	dh $@ --with python2 --buildsystem=python_distutils
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     6
1125
f14163c7275a debian: replace build line with a override_dh_auto_build line
Faheem Mitha <faheem@faheem.info>
parents: 1124
diff changeset
     7
override_dh_auto_build:
f14163c7275a debian: replace build line with a override_dh_auto_build line
Faheem Mitha <faheem@faheem.info>
parents: 1124
diff changeset
     8
	dh_auto_build
4632
a1d191feaa84 debian: Override default value for SPHINXBUILD in docs/makefile
Faheem Mitha <faheem@faheem.info>
parents: 3745
diff changeset
     9
	# Workaround for Sphinx in Debian Buster defaulting to Python 3
4645
6292fe564b20 debian: override default value for SPHINXBUILD in docs/makefile
Faheem Mitha <faheem@faheem.info>
parents: 4632
diff changeset
    10
	SPHINXBUILD="python -m sphinx -bhtml" $(MAKE) -C docs
531
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    11
1565
9590332b26c8 debian: don't refer to deleted tests/run-tests.py in debian/rules
Martin von Zweigbergk <martinvonz@google.com>
parents: 1165
diff changeset
    12
hgsrc_defined:
9590332b26c8 debian: don't refer to deleted tests/run-tests.py in debian/rules
Martin von Zweigbergk <martinvonz@google.com>
parents: 1165
diff changeset
    13
	# Use "! -z" instead of "-n", because "-n" without arguments is true
9590332b26c8 debian: don't refer to deleted tests/run-tests.py in debian/rules
Martin von Zweigbergk <martinvonz@google.com>
parents: 1165
diff changeset
    14
	test ! -z $(HGSRC) && test -d $(HGSRC) || (echo "$(HGSRC) is not a directory"; false)
9590332b26c8 debian: don't refer to deleted tests/run-tests.py in debian/rules
Martin von Zweigbergk <martinvonz@google.com>
parents: 1165
diff changeset
    15
725
235a942eba3f debian: honor nocheck in DEB_BUILD_OPTIONS
Julien Cristau <julien.cristau@logilab.fr>
parents: 535
diff changeset
    16
ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
1565
9590332b26c8 debian: don't refer to deleted tests/run-tests.py in debian/rules
Martin von Zweigbergk <martinvonz@google.com>
parents: 1165
diff changeset
    17
override_dh_auto_test: hgsrc_defined
9590332b26c8 debian: don't refer to deleted tests/run-tests.py in debian/rules
Martin von Zweigbergk <martinvonz@google.com>
parents: 1165
diff changeset
    18
	cd tests && python $(HGSRC)/tests/run-tests.py --with-hg=$(HGSRC)/hg --blacklist=$(CURDIR)/debian/test-blacklist
725
235a942eba3f debian: honor nocheck in DEB_BUILD_OPTIONS
Julien Cristau <julien.cristau@logilab.fr>
parents: 535
diff changeset
    19
endif
535
47246c32e0fb pkg-debian: remove conflicting __init__.py files
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 531
diff changeset
    20
47246c32e0fb pkg-debian: remove conflicting __init__.py files
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 531
diff changeset
    21
override_dh_python2:
2072
c0a685c67c5c debian: don't delete evolve and topic extensions
Martin von Zweigbergk <martinvonz@google.com>
parents: 1565
diff changeset
    22
	# avoid conflict with mercurial's own hgext3rd/__init__.py
c0a685c67c5c debian: don't delete evolve and topic extensions
Martin von Zweigbergk <martinvonz@google.com>
parents: 1565
diff changeset
    23
	find debian -path '*/hgext3rd/__init__.py' -delete
535
47246c32e0fb pkg-debian: remove conflicting __init__.py files
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 531
diff changeset
    24
	dh_python2
735
d3bfd03cb26e debian: properly clean the docs build
Julien Cristau <julien.cristau@logilab.fr>
parents: 725
diff changeset
    25
1126
aef5e42a4fde debian: replace clean with override_dh_auto_clean
Faheem Mitha <faheem@faheem.info>
parents: 1125
diff changeset
    26
override_dh_auto_clean: clean-docs
aef5e42a4fde debian: replace clean with override_dh_auto_clean
Faheem Mitha <faheem@faheem.info>
parents: 1125
diff changeset
    27
	dh_auto_clean
999
38099dfdcbbe debian: add line to clean target to delete error files caused by failing tests
Faheem Mitha <faheem@faheem.info>
parents: 735
diff changeset
    28
	rm -f tests/*.err
735
d3bfd03cb26e debian: properly clean the docs build
Julien Cristau <julien.cristau@logilab.fr>
parents: 725
diff changeset
    29
d3bfd03cb26e debian: properly clean the docs build
Julien Cristau <julien.cristau@logilab.fr>
parents: 725
diff changeset
    30
clean-docs:
d3bfd03cb26e debian: properly clean the docs build
Julien Cristau <julien.cristau@logilab.fr>
parents: 725
diff changeset
    31
	rm -rf html
d3bfd03cb26e debian: properly clean the docs build
Julien Cristau <julien.cristau@logilab.fr>
parents: 725
diff changeset
    32
	rm -f docs/static/logo-evolve.ico
d3bfd03cb26e debian: properly clean the docs build
Julien Cristau <julien.cristau@logilab.fr>
parents: 725
diff changeset
    33
	rm -f docs/tutorials/tutorial.rst
3745
9fa3585b160f debian: add line to clean-docs target to delete additional docs file
Faheem Mitha <faheem@faheem.info>
parents: 2072
diff changeset
    34
	rm -f docs/tutorials/topic-tutorial.rst