upstream/mercurial-mirror Files · contrib/packaging/Makefile

copies: filter invalid copies only at end of pathcopies() (issue6163)...

copies: filter invalid copies only at end of pathcopies() (issue6163) copies._filter() filters out copies whose source file does not exist in the start commit or whose target file does not exist in the end commit. We do that after chaining copies with dirstate copies or backward renames from another branch. We also do at the end of the changeset-centric copy tracing. The filtering means that we will remove copies to/from files that did not exist in some intermediate commit. That is inconsistent with what we do if a file has been deleted and then re-added (we allow updating across that). Copying the two first examples from issue6163: @ 4 'rename x to y' | o 3 'add x again' | o 2 'remove x' | | o 1 'modify x' |/ o 0 'add x' @ 4 'rename x to y' | o 3 'add x again' | | o 2 'modify x' | | | o 1 'add x' |/ o 0 'base' When doing `hg rebase -r 1 -d 4` in the first case, it succeeds, but `hg rebase -r 2 -d 4` in the second case does not. That's because we chain and filter via commit 0, which does not have file 'x' in the second case. IMO, that's clearly inconsistent. So this patch removes the filtering step so it only happens at the end. If a file was temporarily removed, whether via a merge base or not, it will now still be considered the same file. That fixes issue6163 for the changeset-centric case. Differential Revision: https://phab.mercurial-scm.org/D6603

Augie Fackler - - Load All Authors

File last commit:

r40621:d0a6b2c8 default


                r42797:d013099c

default

Download file

             Makefile
        
                    145 lines
            
             | 3.8 KiB
            
                | text/x-makefile
            
             |
                MakefileLexer
            
             / contrib / packaging / Makefile
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      $(eval HGROOT := $(shell cd ../..; pwd))

      DEBIAN_CODENAMES := \

        jessie \

        stretch \

        buster

      UBUNTU_CODENAMES := \

        trusty \

        xenial \

        artful \

        bionic \

      FEDORA_RELEASES := \

        20 \

        21 \

        28 \

        29

      CENTOS_RELEASES := \

        5 \

        6 \

        7

      # Build a Python for these CentOS releases.

      CENTOS_WITH_PYTHON_RELEASES := 5 6

      help:

      	@echo 'Packaging Make Targets'

      	@echo ''

      	@echo 'docker-centos{$(strip $(CENTOS_RELEASES))}'

      	@echo '   Build an RPM for a specific CentOS version using Docker.'

      	@echo ''

      	@echo 'docker-debian-{$(strip $(DEBIAN_CODENAMES))}'

      	@echo '   Build Debian packages specific to a Debian distro using Docker.'

      	@echo ''

      	@echo 'docker-fedora{$(strip $(FEDORA_RELEASES))}'

      	@echo '   Build an RPM for a specific Fedora version using Docker.'

      	@echo ''

      	@echo 'docker-ubuntu-{$(strip $(UBUNTU_CODENAMES))}'

      	@echo '   Build Debian package specific to an Ubuntu distro using Docker.'

      	@echo ''

      	@echo 'docker-ubuntu-{$(strip $(UBUNTU_CODENAMES))}-ppa'

      	@echo '   Build a source-only Debian package specific to an Ubuntu distro'

      	@echo '   using Docker.'

      	@echo ''

      	@echo 'linux-wheels'

      	@echo '   Build Linux manylinux wheels using Docker.'

      	@echo ''

      	@echo 'linux-wheels-{x86_64, i686}'

      	@echo '   Build Linux manylinux wheels for a specific architecture using Docker'

      	@echo ''

      	@echo 'deb'

      	@echo '   Build a Debian package locally targeting the current system'

      	@echo ''

      	@echo 'ppa'

      	@echo '   Build a Debian source package locally targeting the current system'

      	@echo ''

      	@echo 'centos{$(strip $(CENTOS_RELEASES))}'

      	@echo '   Build an RPM for a specific CentOS version locally'

      	@echo ''

      	@echo 'fedora{$(strip $(FEDORA_RELEASES))}'

      	@echo '   Build an RPM for a specific Fedora version locally'

      .PHONY: help

      .PHONY: deb

      deb:

      	./builddeb

      .PHONY: ppa

      ppa:

      	./builddeb --source-only

      # Debian targets.

      define debian_targets =

      .PHONY: docker-debian-$(1)

      docker-debian-$(1):

      	./dockerdeb debian $(1)

      endef

      $(foreach codename,$(DEBIAN_CODENAMES),$(eval $(call debian_targets,$(codename))))

      # Ubuntu targets.

      define ubuntu_targets =

      .PHONY: docker-ubuntu-$(1)

      docker-ubuntu-$(1):

      	./dockerdeb ubuntu $(1)

      .PHONY: docker-ubuntu-$(1)-ppa

      docker-ubuntu-$(1)-ppa:

      	./dockerdeb ubuntu $(1) --source-only

      endef

      $(foreach codename,$(UBUNTU_CODENAMES),$(eval $(call ubuntu_targets,$(codename))))

      # Fedora targets.

      define fedora_targets

      .PHONY: fedora$(1)

      fedora$(1):

      	mkdir -p $$(HGROOT)/packages/fedora$(1)

      	./buildrpm

      	cp $$(HGROOT)/contrib/packaging/rpmbuild/RPMS/*/* $$(HGROOT)/packages/fedora$(1)

      	cp $$(HGROOT)/contrib/packaging/rpmbuild/SRPMS/* $$(HGROOT)/packages/fedora$(1)

      	rm -rf $(HGROOT)/rpmbuild

      .PHONY: docker-fedora$(1)

      docker-fedora$(1):

      	mkdir -p $$(HGROOT)/packages/fedora$(1)

      	./dockerrpm fedora$(1)

      endef

      $(foreach release,$(FEDORA_RELEASES),$(eval $(call fedora_targets,$(release))))

      # CentOS targets.

      define centos_targets

      .PHONY: centos$(1)

      centos$(1):

      	mkdir -p $$(HGROOT)/packages/centos$(1)

      	./buildrpm $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython)

      	cp $$(HGROOT)/contrib/packaging/rpmbuild/RPMS/*/* $$(HGROOT)/packages/centos$(1)

      	cp $$(HGROOT)/contrib/packaging/rpmbuild/SRPMS/* $$(HGROOT)/packages/centos$(1)

      .PHONY: docker-centos$(1)

      docker-centos$(1):

      	mkdir -p $$(HGROOT)/packages/centos$(1)

      	./dockerrpm centos$(1) $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython)

      endef

      $(foreach release,$(CENTOS_RELEASES),$(eval $(call centos_targets,$(release))))

      .PHONY: linux-wheels

      linux-wheels: linux-wheels-x86_64 linux-wheels-i686

      .PHONY: linux-wheels-x86_64

      linux-wheels-x86_64:

      	docker run -e "HGTEST_JOBS=$(shell nproc)" --rm -ti -v `pwd`/../..:/src quay.io/pypa/manylinux1_x86_64 /src/contrib/packaging/build-linux-wheels.sh

      .PHONY: linux-wheels-i686

      linux-wheels-i686:

      	docker run -e "HGTEST_JOBS=$(shell nproc)" --rm -ti -v `pwd`/../..:/src quay.io/pypa/manylinux1_i686 linux32 /src/contrib/packaging/build-linux-wheels.sh

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				$(eval HGROOT := $(shell cd ../..; pwd))

				DEBIAN_CODENAMES := \
				jessie \
				stretch \
				buster

				UBUNTU_CODENAMES := \
				trusty \
				xenial \
				artful \
				bionic \

				FEDORA_RELEASES := \
				20 \
				21 \
				28 \
				29

				CENTOS_RELEASES := \
				5 \
				6 \
				7

				# Build a Python for these CentOS releases.
				CENTOS_WITH_PYTHON_RELEASES := 5 6

				help:
				@echo 'Packaging Make Targets'
				@echo ''
				@echo 'docker-centos{$(strip $(CENTOS_RELEASES))}'
				@echo ' Build an RPM for a specific CentOS version using Docker.'
				@echo ''
				@echo 'docker-debian-{$(strip $(DEBIAN_CODENAMES))}'
				@echo ' Build Debian packages specific to a Debian distro using Docker.'
				@echo ''
				@echo 'docker-fedora{$(strip $(FEDORA_RELEASES))}'
				@echo ' Build an RPM for a specific Fedora version using Docker.'
				@echo ''
				@echo 'docker-ubuntu-{$(strip $(UBUNTU_CODENAMES))}'
				@echo ' Build Debian package specific to an Ubuntu distro using Docker.'
				@echo ''
				@echo 'docker-ubuntu-{$(strip $(UBUNTU_CODENAMES))}-ppa'
				@echo ' Build a source-only Debian package specific to an Ubuntu distro'
				@echo ' using Docker.'
				@echo ''
				@echo 'linux-wheels'
				@echo ' Build Linux manylinux wheels using Docker.'
				@echo ''
				@echo 'linux-wheels-{x86_64, i686}'
				@echo ' Build Linux manylinux wheels for a specific architecture using Docker'
				@echo ''
				@echo 'deb'
				@echo ' Build a Debian package locally targeting the current system'
				@echo ''
				@echo 'ppa'
				@echo ' Build a Debian source package locally targeting the current system'
				@echo ''
				@echo 'centos{$(strip $(CENTOS_RELEASES))}'
				@echo ' Build an RPM for a specific CentOS version locally'
				@echo ''
				@echo 'fedora{$(strip $(FEDORA_RELEASES))}'
				@echo ' Build an RPM for a specific Fedora version locally'

				.PHONY: help

				.PHONY: deb
				deb:
				./builddeb

				.PHONY: ppa
				ppa:
				./builddeb --source-only

				# Debian targets.
				define debian_targets =
				.PHONY: docker-debian-$(1)
				docker-debian-$(1):
				./dockerdeb debian $(1)

				endef

				$(foreach codename,$(DEBIAN_CODENAMES),$(eval $(call debian_targets,$(codename))))

				# Ubuntu targets.
				define ubuntu_targets =
				.PHONY: docker-ubuntu-$(1)
				docker-ubuntu-$(1):
				./dockerdeb ubuntu $(1)

				.PHONY: docker-ubuntu-$(1)-ppa
				docker-ubuntu-$(1)-ppa:
				./dockerdeb ubuntu $(1) --source-only

				endef

				$(foreach codename,$(UBUNTU_CODENAMES),$(eval $(call ubuntu_targets,$(codename))))

				# Fedora targets.
				define fedora_targets
				.PHONY: fedora$(1)
				fedora$(1):
				mkdir -p $$(HGROOT)/packages/fedora$(1)
				./buildrpm
				cp $$(HGROOT)/contrib/packaging/rpmbuild/RPMS// $$(HGROOT)/packages/fedora$(1)
				cp $$(HGROOT)/contrib/packaging/rpmbuild/SRPMS/* $$(HGROOT)/packages/fedora$(1)
				rm -rf $(HGROOT)/rpmbuild

				.PHONY: docker-fedora$(1)
				docker-fedora$(1):
				mkdir -p $$(HGROOT)/packages/fedora$(1)
				./dockerrpm fedora$(1)

				endef

				$(foreach release,$(FEDORA_RELEASES),$(eval $(call fedora_targets,$(release))))

				# CentOS targets.
				define centos_targets
				.PHONY: centos$(1)
				centos$(1):
				mkdir -p $$(HGROOT)/packages/centos$(1)
				./buildrpm $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython)
				cp $$(HGROOT)/contrib/packaging/rpmbuild/RPMS// $$(HGROOT)/packages/centos$(1)
				cp $$(HGROOT)/contrib/packaging/rpmbuild/SRPMS/* $$(HGROOT)/packages/centos$(1)

				.PHONY: docker-centos$(1)
				docker-centos$(1):
				mkdir -p $$(HGROOT)/packages/centos$(1)
				./dockerrpm centos$(1) $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython)

				endef

				$(foreach release,$(CENTOS_RELEASES),$(eval $(call centos_targets,$(release))))

				.PHONY: linux-wheels
				linux-wheels: linux-wheels-x86_64 linux-wheels-i686

				.PHONY: linux-wheels-x86_64
				linux-wheels-x86_64:
				docker run -e "HGTEST_JOBS=$(shell nproc)" --rm -ti -v `pwd`/../..:/src quay.io/pypa/manylinux1_x86_64 /src/contrib/packaging/build-linux-wheels.sh

				.PHONY: linux-wheels-i686
				linux-wheels-i686:
				docker run -e "HGTEST_JOBS=$(shell nproc)" --rm -ti -v `pwd`/../..:/src quay.io/pypa/manylinux1_i686 linux32 /src/contrib/packaging/build-linux-wheels.sh