diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-22 11:51:24 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-22 11:51:24 -0300 |
| commit | 9a9c8e49eea524960d5fbead3d5794a0bd936500 (patch) | |
| tree | 6e6e91149393cc2a3de3edff89ff6714c454639a /Makefile | |
| parent | 78d2d7a1fea8c058e3ffa9dae7b6f96c3491a7ac (diff) | |
| download | mediapointer-dvb-s2-9a9c8e49eea524960d5fbead3d5794a0bd936500.tar.gz mediapointer-dvb-s2-9a9c8e49eea524960d5fbead3d5794a0bd936500.tar.bz2 | |
Have the commit auto-check code tell you when it does something
From: Trent Piepho <xyzzy@speakeasy.org>
When the make commit checks for whitespace errors, it will save a copy of
the changes it makes to $(TMP)/v4l_hg_whitespace. The prep_commit_msg.pl
script will look for this file and include a note in the prepared commit
message with diffstat output.
The changes that scripts/cardlist might make are not included, but that
can be added later.
The prep_commit_msg.pl script is effectively totally re-written. This one
will try some extra stuff to some up with the user's e-mail, such as
looking in the ~/.hgrc file.
The Makefile is changed so that temporary files created by make commit
and make whitespace will honor the $TMP environment variable, if set.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -1,4 +1,5 @@ BUILD_DIR := $(shell pwd)/v4l +TMP ?= /tmp REPO_PULL := http://linuxtv.org/hg/v4l-dvb ifeq ($(REPO_PUSH),) ifneq ($(CHANGE_LOG_LOGIN),) @@ -26,9 +27,10 @@ install: commit cvscommit hgcommit change changes changelog:: whitespace cd $(BUILD_DIR); scripts/cardlist; cd .. - v4l/scripts/prep_commit_msg.pl >/tmp/v4l_hg_commit.msg - $(EDITOR) /tmp/v4l_hg_commit.msg - grep -v ^# /tmp/v4l_hg_commit.msg | hg commit -l - + v4l/scripts/prep_commit_msg.pl $(TMP)/v4l_hg_whitespace > \ + $(TMP)/v4l_hg_commit.msg + $(EDITOR) $(TMP)/v4l_hg_commit.msg + grep -v '^#' $(TMP)/v4l_hg_commit.msg | hg commit -l - @echo "*** PLEASE CHECK IF LOG IS OK:" @hg log -v -r -1 @echo "*** If not ok, do hg undo and make commit again" @@ -43,5 +45,5 @@ push:: whitespace: @echo "Cleaning bad whitespaces" - @v4l/scripts/strip-trailing-whitespaces.sh fast | patch -p0 - + @v4l/scripts/strip-trailing-whitespaces.sh fast | \ + tee $(TMP)/v4l_hg_whitespace | patch -p0 |