diff options
| -rw-r--r-- | Makefile | 7 | ||||
| -rwxr-xr-x | v4l/scripts/prep_commit_msg.pl | 19 |
2 files changed, 25 insertions, 1 deletions
@@ -28,6 +28,13 @@ commit cvscommit hgcommit change changes changelog:: whitespace @hg log -v -r -1 @echo "*** If not ok, do hg undo and make commit again" +qrefresh:: whitespace + cd $(BUILD_DIR); scripts/cardlist; cd .. + v4l/scripts/prep_commit_msg.pl -q $(TMP)/v4l_hg_whitespace > \ + $(TMP)/v4l_hg_commit.msg + $(EDITOR) $(TMP)/v4l_hg_commit.msg + grep -v '^#' $(TMP)/v4l_hg_commit.msg | hg qrefresh -g -l - + pull update v4l-update:: @echo "Pulling changes from master repository $(REPO_PULL)" -hg pull -u $(REPO_PULL) diff --git a/v4l/scripts/prep_commit_msg.pl b/v4l/scripts/prep_commit_msg.pl index f4047c6ba..819009c57 100755 --- a/v4l/scripts/prep_commit_msg.pl +++ b/v4l/scripts/prep_commit_msg.pl @@ -1,5 +1,10 @@ #!/usr/bin/perl +my $diff = 'diff'; +if ($ARGV[0] eq '-q') { + $diff = 'qdiff'; + shift; +} my $autopatch = shift; # Get Hg username from environment @@ -45,13 +50,25 @@ if ($user eq "") { } print "# Added/removed/changed files:\n"; -system "hg diff | diffstat -p1 -c"; +system "hg $diff | diffstat -p1 -c"; if (-s $autopatch) { print "#\n# Note, a problem with your patch was detected! These changes were made\n"; print "# automatically: $autopatch\n"; system "diffstat -p0 -c $autopatch"; print "#\n# Please review these changes and see if they belong in your patch or not.\n"; } +if ($diff eq 'qdiff') { + # Use existing mq patch logfile? + open IN, "hg qheader |"; + my @header = <IN>; + close IN; + if ($#header > 0) { + # Use existing header + print @header; + exit; + } + # No header, use pre-made log message below +} print <<"EOF"; # # For better log display, please keep a blank line after subject, after from, |