##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

copies: fix the changeset based algorithm regarding merge...
copies: fix the changeset based algorithm regarding merge In 99ebde4fec99, we changed the list of files stored into the `files` field. This lead to the changeset centric copy algorithm to break in various merge situation involving merge. Older information could reach the merge through `p1`, and while information from `p2` was strictly fresher, it would get overwritten anyway. We update the situation with more details about which revision introduces rename information. This help use making the right decision in case of merge. We are now running a more comprehensive suite of test with include this kind of situation. The behavior differ slightly from the filelog based in a couple of instance. There is mostly two distinct cases: 1) there are conflicting rename information in a merge (different rename history on each side). In this case the filelog based implementation arbitrarily pick a side based on the file-revision-number. So it depends on a local factor. The changeset centric algorithm will use a deterministic approach, by picking the information coming from the first parent of the merge. This is stable across different clone. 2) rename information related to file that exist in both source and destination. The filelog based implementation do not even try to detect these, however the changeset centric one get them for "free" (it is simpler to detect them than not). The new implementation focus on correctness. Performance improvement will come later. Differential Revision: https://phab.mercurial-scm.org/D8244
Denis Laxalde - - Load All Authors

File last commit:

r43627:7b638d25 stable
r45252:45f3f35c default
Show More
rules
44 lines | 1.4 KiB | text/plain | TextLexer
/ contrib / packaging / debian / rules
History | Source | Raw |Copy content |Copy permalink
Gregory Szorc
packaging: move contrib/debian to contrib/packaging/...
 r38029 #!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
CPUS=$(shell cat /proc/cpuinfo | grep -E ^processor | wc -l)
Denis Laxalde
packaging: upgrade Debian packaging to build with Python 3...
 r43615 export HGPYTHON3=1
export PYTHON=python3
Gregory Szorc
packaging: move contrib/debian to contrib/packaging/...
 r38029 %:
Denis Laxalde
packaging: upgrade Debian packaging to build with Python 3...
 r43615 dh $@ --with python3
Gregory Szorc
packaging: move contrib/debian to contrib/packaging/...
 r38029
override_dh_auto_test:
http_proxy='' dh_auto_test -- TESTFLAGS="-j$(CPUS)"
Denis Laxalde
packaging: upgrade Debian packaging to build with Python 3...
 r43615 override_dh_python3:
Denis Laxalde
packaging: use /usr/bin/python3 shebang for scripts in Debian...
 r43618 dh_python3 --shebang=/usr/bin/python3
Gregory Szorc
packaging: move contrib/debian to contrib/packaging/...
 r38029
Denis Laxalde
packaging: distinguish clean and build steps from install in Debian
 r43625 override_dh_auto_clean:
$(MAKE) cleanbutpackages
$(MAKE) -C contrib/chg clean
override_dh_auto_build:
$(MAKE) all
$(MAKE) -C contrib/chg all
Denis Laxalde
packaging: avoid running bare "make install" in debian/rules...
 r43626 override_dh_auto_install:
Denis Laxalde
packaging: upgrade Debian packaging to build with Python 3...
 r43615 python3 setup.py install --root "$(CURDIR)"/debian/mercurial --install-layout=deb
Gregory Szorc
packaging: move contrib/debian to contrib/packaging/...
 r38029 # chg
make -C contrib/chg \
DESTDIR="$(CURDIR)"/debian/mercurial \
PREFIX=/usr \
Denis Laxalde
packaging: distinguish clean and build steps from install in Debian
 r43625 install
Denis Laxalde
packaging: ship only a single binary Debian package...
 r43627 make install-doc PREFIX="$(CURDIR)"/debian/mercurial/usr
cp contrib/hg-ssh "$(CURDIR)"/debian/mercurial/usr/bin
mkdir -p "$(CURDIR)"/debian/mercurial/usr/share/mercurial
cp contrib/hgk "$(CURDIR)"/debian/mercurial/usr/share/mercurial
mkdir -p "$(CURDIR)"/debian/mercurial/etc/mercurial/hgrc.d/
cp contrib/packaging/debian/*.rc "$(CURDIR)"/debian/mercurial/etc/mercurial/hgrc.d/
Gregory Szorc
packaging: move contrib/debian to contrib/packaging/...
 r38029 # completions
Denis Laxalde
packaging: ship only a single binary Debian package...
 r43627 mkdir -p "$(CURDIR)"/debian/mercurial/usr/share/bash-completion/completions
cp contrib/bash_completion "$(CURDIR)"/debian/mercurial/usr/share/bash-completion/completions/hg
mkdir -p "$(CURDIR)"/debian/mercurial/usr/share/zsh/vendor-completions
cp contrib/zsh_completion "$(CURDIR)"/debian/mercurial/usr/share/zsh/vendor-completions/_hg