##// END OF EJS Templates
templatekw: compare target context and its parent exactly (issue4690)...
templatekw: compare target context and its parent exactly (issue4690) Before this patch, template keywords `{file_mods}`, `{file_adds}` and `{file_dels}` use values gotten by `repo.status(ctx.p1().node(), ctx.node())`. But this doesn't work as expected if `ctx` is `memctx` or `workingcommitctx`. Typical case of templating with these contexts is customization of the text shown in the commit message editor by `[committemplate]` configuration. In this case, `ctx.node()` returns None and it causes comparison between `ctx.p1()` and `workingctx`. `workingctx` lists up all changed files in the working directory even at selective committing. BTW, `{files}` uses `ctx.files()` and it works as expected. To compare target context and its parent exactly, this patch passes `ctx.p1()` and `ctx` without `node()`-nize. This avoids unexpected comparison with `workingctx`. This patch uses a little redundant template configurations in `test-commit.t`, but they are needed to avoid regression around problems fixed by a4958cdb2202 and 1e6fb8db666e: accessing on `ctx` may break `ctx._status` field.

File last commit:

r24973:4c4d0012 default
r25392:ed18f4ac 3.4.1 stable
Show More
Makefile
216 lines | 6.7 KiB | text/x-makefile | MakefileLexer
Martin Geisler
Makefile: added instructions on how to override PREFIX
r10134 # If you want to change PREFIX, do not just edit it below. The changed
# value wont get passed on to recursive make calls. You should instead
# override the variable on the command like:
#
# % make PREFIX=/opt/ install
wilde@trapperkeeper.sha-bang.de
Added install target.
r2233 PREFIX=/usr/local
export PREFIX
Thomas Arendsen Hein
Add Makefile for generating release tarballs....
r1008 PYTHON=python
Augie Fackler
Makefile: introduce testpy-% target for testing with a specifc Python...
r24194 $(eval HGROOT := $(shell pwd))
HGPYTHONS ?= $(HGROOT)/build/pythons
Martin Geisler
use PURE option in Makefile
r7706 PURE=
Martin Geisler
Makefile: remove underscore in var name
r12816 PYFILES:=$(shell find mercurial hgext doc -name '*.py')
Martin Geisler
Makefile: var for documentation files
r12817 DOCFILES=mercurial/help/*.txt
Takumi IINO
doc: make i18n man and html...
r19427 export LANGUAGE=C
export LC_ALL=C
Augie Fackler
Makefile: allow setting HGTESTFLAGS in shell environment for TESTFLAGS...
r24195 TESTFLAGS ?= $(shell echo $$HGTESTFLAGS)
Thomas Arendsen Hein
Add Makefile for generating release tarballs....
r1008
Bryan O'Sullivan
makefile: allow local builds to work on windows/mingw32
r18056 # Set this to e.g. "mingw32" to use a non-default compiler.
COMPILER=
Thomas Arendsen Hein
Just using 'make' now shows help. 'make all' doesn't perform inplace build.
r2244 help:
@echo 'Commonly used make targets:'
@echo ' all - build program and documentation'
Matt Mackall
makefile: add $ to environment variables in help message
r20311 @echo ' install - install program and man pages to $$PREFIX ($(PREFIX))'
@echo ' install-home - install with setup.py install --home=$$HOME ($(HOME))'
Markus F.X.J. Oberhumer
Makefile: change "make local" to build a fully working local version.
r4706 @echo ' local - build for inplace usage'
Thomas Arendsen Hein
Just using 'make' now shows help. 'make all' doesn't perform inplace build.
r2244 @echo ' tests - run all tests in the automatic test suite'
Thomas Arendsen Hein
Makefile: adjust example, test-merge1 is now test-merge1.t
r15379 @echo ' test-foo - run only specified tests (e.g. test-merge1.t)'
Thomas Arendsen Hein
Just using 'make' now shows help. 'make all' doesn't perform inplace build.
r2244 @echo ' dist - run all tests and create a source tarball in dist/'
@echo ' clean - remove files created by other targets'
@echo ' (except installed files or dist source tarball)'
Martin Geisler
i18n: let Makefile generate i18n/hg.pot...
r7648 @echo ' update-pot - update i18n/hg.pot'
Thomas Arendsen Hein
Just using 'make' now shows help. 'make all' doesn't perform inplace build.
r2244 @echo
@echo 'Example for a system-wide installation under /usr/local:'
@echo ' make all && su -c "make install" && hg version'
@echo
@echo 'Example for a local installation (usable in this directory):'
@echo ' make local && ./hg version'
all: build doc
Thomas Arendsen Hein
New make targets:...
r2235
local:
Bryan O'Sullivan
makefile: allow local builds to work on windows/mingw32
r18056 $(PYTHON) setup.py $(PURE) \
build_py -c -d . \
build_ext $(COMPILER:%=-c %) -i \
build_hgexe $(COMPILER:%=-c %) -i \
build_mo
Bryan O'Sullivan
makefile: don't use system hgrc when running hg in-place...
r17927 env HGRCPATH= $(PYTHON) hg version
mpm@selenic.com
Add default make rule...
r1020
Thomas Arendsen Hein
New make targets:...
r2235 build:
Bryan O'Sullivan
makefile: allow local builds to work on windows/mingw32
r18056 $(PYTHON) setup.py $(PURE) build $(COMPILER:%=-c %)
Thomas Arendsen Hein
New make targets:...
r2235
doc:
$(MAKE) -C doc
Thomas Arendsen Hein
Add Makefile for generating release tarballs....
r1008
clean:
Greg Ward
Makefile: fix grammar in comment
r8365 -$(PYTHON) setup.py clean --all # ignore errors from this command
Matt Mackall
make: restrict recursion in make clean
r20007 find contrib doc hgext i18n mercurial tests \
\( -name '*.py[cdo]' -o -name '*.so' \) -exec rm -f '{}' ';'
Matt Mackall
Makefile: be more careful when cleaning up pure/ components...
r16460 rm -f $(addprefix mercurial/,$(notdir $(wildcard mercurial/pure/[a-z]*.py)))
J. Lewis Muir
build: don't clean __version__.py on 'make clean' in release tarballs...
r22375 rm -f MANIFEST MANIFEST.in hgext/__index__.py tests/*.err
if test -d .hg; then rm -f mercurial/__version__.py; fi
Brodie Rao
Makefile: remove the build folder manually...
r12500 rm -rf build mercurial/locale
levon@movementarian.org
Use $(MAKE) not make
r1423 $(MAKE) -C doc clean
Thomas Arendsen Hein
Add Makefile for generating release tarballs....
r1008
Sascha Wilde
Split installation targets into install-bin and install-doc....
r2527 install: install-bin install-doc
install-bin: build
Dévai Tamás
Respect the DESTDIR variable during 'make install'...
r10961 $(PYTHON) setup.py $(PURE) install --root="$(DESTDIR)/" --prefix="$(PREFIX)" --force
Sascha Wilde
Split installation targets into install-bin and install-doc....
r2527
install-doc: doc
Thomas Arendsen Hein
New make targets:...
r2235 cd doc && $(MAKE) $(MFLAGS) install
Sascha Wilde
Split installation targets into install-bin and install-doc....
r2527 install-home: install-home-bin install-home-doc
install-home-bin: build
Augie Fackler
setup: specify --prefix="" for install-home-bin to avoid badness with defaults...
r20614 $(PYTHON) setup.py $(PURE) install --home="$(HOME)" --prefix="" --force
Sascha Wilde
Split installation targets into install-bin and install-doc....
r2527
install-home-doc: doc
Thomas Arendsen Hein
New make targets:...
r2235 cd doc && $(MAKE) $(MFLAGS) PREFIX="$(HOME)" install
Benoit Boissinot
fix MANIFEST generation
r3872 MANIFEST-doc:
$(MAKE) -C doc MANIFEST
Stephen Thorne
distutils: Create MANIFEST.in instead of MANIFEST in Makefile...
r14558 MANIFEST.in: MANIFEST-doc
hg manifest | sed -e 's/^/include /' > MANIFEST.in
echo include mercurial/__version__.py >> MANIFEST.in
sed -e 's/^/include /' < doc/MANIFEST >> MANIFEST.in
Benoit Boissinot
fix MANIFEST generation
r3872
Thomas Arendsen Hein
New make target "dist-notests" to create tarballs without running tests first.
r2234 dist: tests dist-notests
Stephen Thorne
distutils: Create MANIFEST.in instead of MANIFEST in Makefile...
r14558 dist-notests: doc MANIFEST.in
Matt Mackall
Make make dist a bit quieter
r3865 TAR_OPTIONS="--owner=root --group=root --mode=u+w,go-w,a+rX-s" $(PYTHON) setup.py -q sdist
Thomas Arendsen Hein
Add Makefile for generating release tarballs....
r1008
Johan Euphrosine
add make check: tests rule
r14172 check: tests
Thomas Arendsen Hein
Add Makefile for generating release tarballs....
r1008 tests:
Benoit Boissinot
add possibility to pass flags when testing with the Makefile
r3969 cd tests && $(PYTHON) run-tests.py $(TESTFLAGS)
Thomas Arendsen Hein
Add Makefile for generating release tarballs....
r1008
Benoit Boissinot
add a target for running only one test
r1426 test-%:
Benoit Boissinot
add possibility to pass flags when testing with the Makefile
r3969 cd tests && $(PYTHON) run-tests.py $(TESTFLAGS) $@
Benoit Boissinot
add a target for running only one test
r1426
Augie Fackler
Makefile: introduce testpy-% target for testing with a specifc Python...
r24194 testpy-%:
@echo Looking for Python $* in $(HGPYTHONS)
[ -e $(HGPYTHONS)/$*/bin/python ] || ( \
cd $$(mktemp --directory --tmpdir) && \
$(MAKE) -f $(HGROOT)/contrib/Makefile.python PYTHONVER=$* PREFIX=$(HGPYTHONS)/$* python )
cd tests && $(HGPYTHONS)/$*/bin/python run-tests.py $(TESTFLAGS)
Benoit Boissinot
check-code: add Makefile target to run check-code
r18598 check-code:
hg manifest | xargs python contrib/check-code.py
Tobias Bell
enhance Makefile for language translators...
r7893 update-pot: i18n/hg.pot
Simon Heimberg
Makefile: hg.pot depends on the scripts generating it...
r20358 i18n/hg.pot: $(PYFILES) $(DOCFILES) i18n/posplit i18n/hggettext
Martin Geisler
i18n: accurately generate hg.pot
r8542 $(PYTHON) i18n/hggettext mercurial/commands.py \
FUJIWARA Katsunori
filemerge: create detail of internal merge tools from documentation string...
r16126 hgext/*.py hgext/*/__init__.py \
mercurial/fileset.py mercurial/revset.py \
Alexander Sauta
i18n-ru: translated missing strings for commands, some typos corrected
r14815 mercurial/templatefilters.py mercurial/templatekw.py \
Yuya Nishihara
templater: tell hggettext to collect help of template functions
r24601 mercurial/templater.py \
FUJIWARA Katsunori
filemerge: create detail of internal merge tools from documentation string...
r16126 mercurial/filemerge.py \
FUJIWARA Katsunori
i18n: extract doc string of each web commands as translatable one...
r24859 mercurial/hgweb/webcommands.py \
Simon Heimberg
Makefile: temporary copy of hg.pot is hg.pot.tmp instead of hg.pot~...
r20121 $(DOCFILES) > i18n/hg.pot.tmp
Martin Geisler
i18n: extract strings with xgettext...
r7710 # All strings marked for translation in Mercurial contain
# ASCII characters only. But some files contain string
# literals like this '\037\213'. xgettext thinks it has to
Martin Geisler
Makefile: fixed comment
r8273 # parse them even though they are not marked for translation.
# Extracting with an explicit encoding of ISO-8859-1 will make
# xgettext "parse" and ignore them.
Martin Geisler
Makefile: remove underscore in var name
r12816 echo $(PYFILES) | xargs \
Martin Geisler
Makefile: remove non-default wrapping of hg.pot strings
r9278 xgettext --package-name "Mercurial" \
Martin Geisler
Makefile: add more meta data to hg.pot
r8272 --msgid-bugs-address "<mercurial-devel@selenic.com>" \
--copyright-holder "Matt Mackall <mpm@selenic.com> and others" \
Wagner Bruna
i18n: extract comments marked for translator hints...
r12806 --from-code ISO-8859-1 --join --sort-by-file --add-comments=i18n: \
Simon Heimberg
Makefile: temporary copy of hg.pot is hg.pot.tmp instead of hg.pot~...
r20121 -d hg -p i18n -o hg.pot.tmp
$(PYTHON) i18n/posplit i18n/hg.pot.tmp
Simon Heimberg
Makefile: intermediate steps work with temporary copy of hg.pot...
r20080 # The target file is not created before the last step. So it never is in
# an intermediate state.
Simon Heimberg
Makefile: temporary copy of hg.pot is hg.pot.tmp instead of hg.pot~...
r20121 mv -f i18n/hg.pot.tmp i18n/hg.pot
Thomas Arendsen Hein
Add Makefile for generating release tarballs....
r1008
Tobias Bell
enhance Makefile for language translators...
r7893 %.po: i18n/hg.pot
Simon Heimberg
Makefile: do update on a temporary copy of a po file...
r19991 # work on a temporary copy for never having a half completed target
cp $@ $@.tmp
msgmerge --no-location --update $@.tmp $^
Simon Heimberg
Makefile: fix po file updating by using same file name everywhere...
r20120 mv -f $@.tmp $@
Tobias Bell
enhance Makefile for language translators...
r7893
Matt Mackall
build: initial support for in-tree autobuilding recipes
r21255 # Packaging targets
Matt Mackall
make: add a basic osx mpkg target
r21559 osx:
Mads Kiilerich
osx: use bdist_mpkg.script_bdist_mpkg module instead of bdist_mpkg command...
r23932 python -c 'import bdist_mpkg.script_bdist_mpkg' || \
Matt Mackall
make: add a basic osx mpkg target
r21559 (echo "Missing bdist_mpkg (easy_install bdist_mpkg)"; false)
Mads Kiilerich
osx: create dmg with installer instead of zip...
r22358 rm -rf dist/mercurial-*.mpkg
Mads Kiilerich
osx: use bdist_mpkg.script_bdist_mpkg module instead of bdist_mpkg command...
r23932 python -m bdist_mpkg.script_bdist_mpkg setup.py --
Mads Kiilerich
osx: patch .pax.gz files in pkg bundles so they extract as root (issue4081)...
r23940 python contrib/fixpax.py dist/mercurial-*.mpkg/Contents/Packages/*.pkg/Contents/Archive.pax.gz
Matt Mackall
packaging: move output directory from build/ to packages/...
r21560 mkdir -p packages/osx
Mads Kiilerich
osx: create dmg with installer instead of zip...
r22358 N=`cd dist && echo mercurial-*.mpkg | sed 's,\.mpkg$$,,'` && hdiutil create -srcfolder dist/$$N.mpkg/ -scrub -volname "$$N" -ov packages/osx/$$N.dmg
Matt Mackall
make: add a basic osx mpkg target
r21559 rm -rf dist/mercurial-*.mpkg
Mads Kiilerich
docker: use stable tags for fedora and centos...
r22442 fedora20:
mkdir -p packages/fedora20
Mads Kiilerich
buildrpm: remove prompt for uncommitted changes - it was a bad idea...
r21640 contrib/buildrpm
Mads Kiilerich
docker: use stable tags for fedora and centos...
r22442 cp rpmbuild/RPMS/*/* packages/fedora20
cp rpmbuild/SRPMS/* packages/fedora20
Matt Mackall
build: initial support for in-tree autobuilding recipes
r21255 rm -rf rpmbuild
Mads Kiilerich
docker: use stable tags for fedora and centos...
r22442 docker-fedora20:
mkdir -p packages/fedora20
contrib/dockerrpm fedora20
Matt Mackall
build: initial support for in-tree autobuilding recipes
r21255
Mads Kiilerich
docker: support Fedora 21
r23882 fedora21:
mkdir -p packages/fedora21
contrib/buildrpm
cp rpmbuild/RPMS/*/* packages/fedora21
cp rpmbuild/SRPMS/* packages/fedora21
rm -rf rpmbuild
docker-fedora21:
mkdir -p packages/fedora21
contrib/dockerrpm fedora21
Mads Kiilerich
docker: add CentOS 5...
r22443 centos5:
mkdir -p packages/centos5
contrib/buildrpm --withpython
cp rpmbuild/RPMS/*/* packages/centos5
cp rpmbuild/SRPMS/* packages/centos5
docker-centos5:
mkdir -p packages/centos5
contrib/dockerrpm centos5 --withpython
Matt Mackall
build: initial support for in-tree autobuilding recipes
r21255 centos6:
Matt Mackall
packaging: move output directory from build/ to packages/...
r21560 mkdir -p packages/centos6
Mads Kiilerich
buildrpm: remove prompt for uncommitted changes - it was a bad idea...
r21640 contrib/buildrpm
Matt Mackall
packaging: move output directory from build/ to packages/...
r21560 cp rpmbuild/RPMS/*/* packages/centos6
cp rpmbuild/SRPMS/* packages/centos6
Matt Mackall
build: initial support for in-tree autobuilding recipes
r21255
docker-centos6:
Matt Mackall
packaging: move output directory from build/ to packages/...
r21560 mkdir -p packages/centos6
Matt Mackall
build: initial support for in-tree autobuilding recipes
r21255 contrib/dockerrpm centos6
Mads Kiilerich
docker: add centos7 target for CentOS / Red Hat 7 support
r23033 centos7:
mkdir -p packages/centos7
contrib/buildrpm
cp rpmbuild/RPMS/*/* packages/centos7
cp rpmbuild/SRPMS/* packages/centos7
docker-centos7:
mkdir -p packages/centos7
contrib/dockerrpm centos7
Sascha Wilde
Split installation targets into install-bin and install-doc....
r2527 .PHONY: help all local build doc clean install install-bin install-doc \
Mads Kiilerich
Makefile: update .PHONY...
r23125 install-home install-home-bin install-home-doc \
dist dist-notests check tests check-code update-pot \
Mads Kiilerich
docker: support Fedora 21
r23882 osx fedora20 docker-fedora20 fedora21 docker-fedora21 \
Mads Kiilerich
Makefile: update .PHONY...
r23125 centos5 docker-centos5 centos6 docker-centos6 centos7 docker-centos7