##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r2100:f2bf7ee3 default
r2784:e8c62649 default
Show More
Makefile
53 lines | 1.4 KiB | text/x-makefile | MakefileLexer
makefile: updated makefile to standard layout
r1220
tests: allow running tests via make file on different databases
r2100 .PHONY: clean docs docs-clean docs-cleanup test test-clean test-only test-only-postgres test-only-mysql web-build
project: added all source files and assets
r1
WEBPACK=./node_modules/webpack/bin/webpack.js
GRUNT=grunt
NODE_PATH=./node_modules
makefile: updated makefile to standard layout
r1220
clean:
make test-clean
find . -type f \( -iname '*.c' -o -iname '*.pyc' -o -iname '*.so' \) -exec rm '{}' ';'
project: added all source files and assets
r1
makefile: updated makefile to standard layout
r1220 test:
make test-clean
make test-only
makefile: added commands to quickly build docs.
r13
makefile: updated makefile to standard layout
r1220 test-clean:
rm -rf coverage.xml htmlcov junit.xml pylint.log result
find . -type d -name "__pycache__" -prune -exec rm -rf '{}' ';'
test-only:
tests: allow running tests via make file on different databases
r2100 PYTHONHASHSEED=random \
py.test -x -vv -r xw -p no:sugar --cov=rhodecode \
--cov-report=term-missing --cov-report=html \
rhodecode
test-only-mysql:
PYTHONHASHSEED=random \
py.test -x -vv -r xw -p no:sugar --cov=rhodecode \
--cov-report=term-missing --cov-report=html \
--ini-config-override='{"app:main": {"sqlalchemy.db1.url": "mysql://root:qweqwe@localhost/rhodecode_test"}}' \
rhodecode
test-only-postgres:
PYTHONHASHSEED=random \
py.test -x -vv -r xw -p no:sugar --cov=rhodecode \
--cov-report=term-missing --cov-report=html \
--ini-config-override='{"app:main": {"sqlalchemy.db1.url": "postgresql://postgres:qweqwe@localhost/rhodecode_test"}}' \
rhodecode
makefile: added commands to quickly build docs.
r13
docs:
(cd docs; nix-build default.nix -o result; make clean html)
project: added all source files and assets
r1
makefile: added commands to quickly build docs.
r13 docs-clean:
(cd docs; make clean)
make: updated docs make commands.
r1214 docs-cleanup:
(cd docs; make cleanup)
project: added all source files and assets
r1 web-build:
NODE_PATH=$(NODE_PATH) $(GRUNT)