Newer
Older
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
#!/bin/bash
# Copyright © 2012-2014 Intel Corporation
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
#
# Authors:
# Daniel Vetter <daniel.vetter@ffwll.ch>
# drm-intel-next maintainer script
# TODO
# - Add functions to setup/update all the branches/trees
# - Improve docs/workflow for topic branches
# - extract the integration tree logic and make it generally useful, maybe for a
# drm-integration tree ...
# fail on any goof-up
set -e
# User configuration. Set in environment or configuration file. See
# dimrc.sample for an example.
#
# dim configuration file
DIM_CONFIG=${DIM_CONFIG:-$HOME/.dimrc}
if [ -r $DIM_CONFIG ]; then
. $DIM_CONFIG
fi
# prefix for repo directories
DIM_PREFIX=${DIM_PREFIX:-$HOME/linux}
# main maintainer repo under $DIM_PREFIX
DIM_DRM_INTEL=${DIM_DRM_INTEL:-src}
# name of the $drm_intel_ssh remote within $DIM_DRM_INTEL
DIM_DRM_INTEL_REMOTE=${DIM_DRM_INTEL_REMOTE:-danvet}
# name of the $drm_upstream_git remote within $DIM_DRM_INTEL
DIM_DRM_UPSTREAM_REMOTE=${DIM_DRM_UPSTREAM_REMOTE:-airlied}
# mail user agent. must support a subset of mutt(1) command line options:
# usage: $DIM_MUA [-s subject] [-i file] [-c cc-addr] to-addr [...]
DIM_MUA=${DIM_MUA:-mutt}
#
# Internal configuration.
#
drm_intel_ssh=ssh://git.freedesktop.org/git/drm-intel
drm_intel_git=git://anongit.freedesktop.org/drm-intel
drm_upstream_git=git://people.freedesktop.org/~airlied/linux
sound_upstream_git=git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
linux_upstream_git=git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
# email aliases
addr_drm_maintainer="Dave Airlie <airlied@gmail.com>"
addr_intel_gfx_maintainer1="Daniel Vetter <daniel.vetter@ffwll.ch>"
addr_intel_gfx_maintainer2="Jani Nikula <jani.nikula@linux.intel.com>"
addr_intel_gfx="intel-gfx@lists.freedesktop.org"
addr_dri_devel="dri-devel@lists.freedesktop.org"
addr_intel_qa="Terence Yang <guang.a.yang@intel.com>"
#
# Command line options.
#
DRY_RUN=
DRY=
case "$opt" in
d)
DRY_RUN=--dry-run
DRY=echo
;;
*)
exit
esac
done
shift `expr $OPTIND - 1`
# first positional argument is the subcommand
if [ "$#" = "0" ]; then
subcommand="help"
else
subcommand="$1"
shift
fi
cd $DIM_PREFIX/$DIM_DRM_INTEL
if git grep "EXTRAVERSION.*=" origin/master Makefile | grep rc > /dev/null ; then
echo linux-next: -rc phase
if [[ $1 == queued ]] ; then
echo Updating for-linux-next to -queued and updating for-linux-next-fixes
git push $DRY_RUN $DIM_DRM_INTEL_REMOTE +drm-intel-next-queued:for-linux-next >& /dev/null
git push $DRY_RUN $DIM_DRM_INTEL_REMOTE +drm-intel-fixes:for-linux-next-fixes >& /dev/null
fi
if [[ $1 == fixes ]] ; then
echo Updating for-linux-next-fixes
git push $DRY_RUN $DIM_DRM_INTEL_REMOTE +drm-intel-fixes:for-linux-next-fixes >& /dev/null
fi
else
echo linux-next: merge window
if [[ $1 == fixes ]] ; then
echo Updating for-linux-next to -fixes
git push $DRY_RUN $DIM_DRM_INTEL_REMOTE +drm-intel-fixes:for-linux-next >& /dev/null
fi
fi
}
function check_conflicts
{
if git diff | grep '<<<<<<<' ; then
echo conflict found
exit 1
fi
if git diff | grep '=======' ; then
echo conflict found
exit 1
fi
if git diff | grep '>>>>>>>' ; then
echo conflict found
exit 1
fi
if git diff | grep '|||||||' ; then
echo conflict found
exit 1
fi
true
}
function update_rerere_cache
{
cd $DIM_PREFIX/drm-intel-rerere/
cp rr-cache/* $DIM_PREFIX/drm-intel-nightly/.git/rr-cache/ -r
cd -
}
function update_nightly
{
local integration_branch=drm-intel-nightly
local specfile=`mktemp`
local time=`date +%Yy-%mm-%dd-%Hh-%Mm-%Ss`
local first=1
local rerere=$DIM_PREFIX/drm-intel-rerere
cd $rerere
if [[ `git status --porcelain | grep -v "^[ ?][ ?]" | wc -l` -gt 0 ]]; then
if [[ $FORCE ]] ; then
echo WARNING: -nightly configuration file not commited, but continuing with rebuild
else
echo ERROR: -nightly configuration file not commited, aborting
exit 1
fi
source $rerere/nightly.conf
cd $DIM_PREFIX/$integration_branch
if ! git branch | grep $integration_branch | grep '\*' >& /dev/null ; then
echo "Branch setup for the integration repo is borked"
exit 1
fi
# git fetch returns 128 if there's nothing to be fetched
git fetch origin >& /dev/null || true
git fetch drm-upstream >& /dev/null || true
update_rerere_cache
for tree in $nightly_branches; do
local branch=${tree%:*}
local sha1=${tree#*:}
# the : separator is optional
if [[ $sha1 == $tree ]] ; then
sha1=
fi
if [[ -n $sha1 ]] ; then
echo Using override sha1: $sha1 for branch $name
else
sha1=$branch
fi
git reset --hard $sha1 >& /dev/null
git merge --rerere-autoupdate --no-commit $sha1 >& /dev/null || true
if [ -f $rerere/$integration_branch-$name-fixup.patch ] ; then
echo applying manual fixup patch for $integration_branch merge ...
git apply --index $rerere/$integration_branch-$name-fixup.patch
if [[ `git diff --cached --name-status | wc -l` -gt 0 ]]; then
git commit --no-edit || true
fi
echo $branch `git rev-parse $sha1` >> $specfile
done
mv $specfile integration-manifest
git add integration-manifest
git commit -m "$integration_branch: $time integration manifest"
git push $DRY_RUN origin +HEAD >& /dev/null && echo "$integration_branch branch successfully updated"
if git branch | grep rerere-cache | grep '\*' >& /dev/null ; then
git pull >& /dev/null
cp $DIM_PREFIX/$integration_branch/.git/rr-cache/* rr-cache -r
git add *.patch >& /dev/null || true
git add rr-cache/* > /dev/null
if git commit -m "$time: $integration_branch rerere cache update" >& /dev/null; then
else
echo "nothing changed in the rerere cache"
fi
git push $DRY_RUN origin HEAD >& /dev/null && echo "rerere cache successfully updated"
else
echo "Branch setup for the rerere-cache is borked"
fi
}
function check_repo_clean
{
cd $1
if ! git diff-index --quiet HEAD ; then
echo $2 repo not clean, aborting
exit 1
fi
}
# $1 is the git sha1 to check
function dim_checkpatch
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
{
git show $1 --pretty=email | scripts/checkpatch.pl --strict - || true
git show $1 | grep '^\+.*\WBUG' > /dev/null && echo -e "\n\nWARNING: New BUG macro added\n" || true
git show $1 | grep '^\+.*drm_i915_private_t' > /dev/null && echo -e "\n\nWARNING: New drm_i915_private_t added\n" || true
}
function prep_pull_mail_tags
{
cat > ~/tmp/dim-pull-request <<-HERE
Hi Dave,
HERE
for tag in $@ ; do
local obj=`git rev-parse $tag`
if [[ `git cat-file -t $obj` == "tag" ]] ; then
echo $tag: >> ~/tmp/dim-pull-request
git cat-file -p $obj | tail -n+6 >> ~/tmp/dim-pull-request
fi
done
cat >> ~/tmp/dim-pull-request <<-HERE
Cheers, Daniel
HERE
}
function prep_pull_mail
{
cat > ~/tmp/dim-pull-request <<-HERE
Hi Dave,
<insert pull request overview here>
Cheers, Daniel
HERE
}
function setup_dim
{
if [ ! -d $DIM_DRM_INTEL ]; then
echo "please set up $DIM_PREFIX/$DIM_DRM_INTEL (or update config)"
exit 1
fi
cd $DIM_DRM_INTEL
if ! git remote -v | grep "^origin[[:space:]]" | grep $linux_upstream_git > /dev/null; then
echo "please set up remote origin for $linux_upstream_git"
exit 1
fi
if ! git remote -v | grep "^$DIM_DRM_INTEL_REMOTE[[:space:]]" | grep $drm_intel_ssh > /dev/null; then
echo "please set up remote $DIM_DRM_INTEL_REMOTE for $drm_intel_ssh (or update config)"
exit 1
fi
if ! git remote -v | grep "^$DIM_DRM_UPSTREAM_REMOTE[[:space:]]" | grep $drm_upstream_git > /dev/null; then
echo "please set up remote $DIM_DRM_UPSTREAM_REMOTE for $drm_upstream_git (or update config)"
exit 1
fi
cd ..
git clone $drm_intel_ssh maintainer-tools
git config remote.origin.url $drm_intel_ssh
if ! git branch | grep maintainer-tools > /dev/null ; then
git checkout -t origin/maintainer-tools
fi
cd ..
if [ ! -d drm-intel-rerere ]; then
git clone $drm_intel_ssh drm-intel-rerere
git config remote.origin.url $drm_intel_ssh
if ! git branch | grep rerere-cache > /dev/null ; then
git checkout -t origin/rerere-cache
fi
cd ..
if [ ! -d drm-intel-nightly ]; then
git clone $drm_intel_ssh drm-intel-nightly
git config remote.origin.url $drm_intel_ssh
if ! git branch | grep drm-intel-nightly > /dev/null ; then
git checkout -t origin/drm-intel-nightly
fi
if git remote | grep drm-upstream > /dev/null ; then
git config remote.drm-upstream.url $drm_upstream_git
else
git remote add drm-upstream $drm_upstream_git
fi
if git remote | grep sound-upstream > /dev/null ; then
git config remote.sound-upstream.url $sound_upstream_git
else
git remote add sound-upstream $sound_upstream_git
fi
cd $DIM_PREFIX/$DIM_DRM_INTEL
setup)
setup_dim
;;
upload-docs)
# cd back
cd -
make htmldocs
$DRY scp -r Documentation/DocBook/drm annarchy.freedesktop.org:~/public_html
cd $DIM_PREFIX/drm-intel-nightly
git fetch origin >& /dev/null
git reset --hard origin/drm-intel-next-queued >& /dev/null
git merge origin/drm-intel-fixes
git rerere forget
;;
update-branches|ub)
git fetch $DIM_DRM_INTEL_REMOTE
check_repo_clean $DIM_PREFIX/$DIM_DRM_INTEL Kernel
git rebase -i $DIM_DRM_INTEL_REMOTE/drm-intel-next-queued
git rebase -i $DIM_DRM_INTEL_REMOTE/drm-intel-fixes
git reset --hard $DIM_DRM_INTEL_REMOTE/drm-intel-next
# TODO: Restore -nightly merge state from the rerere-cache
# branch
update_rerere_cache
;;
rebuild-nightly)
update_nightly
;;
push-queued|pq)
if git branch | grep drm-intel-next-queued | grep '\*' ; then
git push $DRY_RUN $DIM_DRM_INTEL_REMOTE drm-intel-next-queued $@
update_nightly
update_linux_next queued
else
echo "You're on the wrong branch."
fi
;;
push-fixes|pf)
if git branch | grep drm-intel-fixes | grep '\*' ; then
git push $DRY_RUN $DIM_DRM_INTEL_REMOTE drm-intel-fixes $@
update_nightly
update_linux_next fixes
else
echo "You're on the wrong branch."
fi
;;
co)
git checkout drm-intel-next-queued
;;
cof)
git checkout drm-intel-fixes
;;
apply-branch|ab)
branch=$1
if [[ -n `git status --porcelain --untracked-files=no` ]] ; then
echo Repository not clean, aborting
exit 2
fi
if git branch | grep $branch | grep '\*' ; then
git am -3 $@
dim_checkpatch HEAD
else
echo "You're on the wrong branch."
fi
;;
apply-queued|aq)
dim apply-branch drm-intel-next-queued $@
;;
apply-fixes|af)
dim apply-branch drm-intel-fixes $@
;;
apply-resolved|ar)
make -j 20 && git add -u && git am --resolved
dim_checkpatch HEAD
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
;;
apply-igt|ai)
cd ~/xorg/intel-gpu-tools/
git am -3 -s
;;
magic-patch|mp)
conflict_files=`patch -p1 | grep "saving rejects" | sed -e "s/.*saving rejects to file \(.*\)/\1/"`
if [[ $conflict_files != "" ]] ; then
echo conflicts found!
fi
for file in $conflict_files ; do
echo wiggling in ${file%.rej}:
#cat $file
rm -f ${file%.rej}.porig
wiggle -r ${file%.rej} $file || true
done
;;
magic-rebase-resolve|mrr)
git diff HEAD | patch -p1 -R
cat .git/rebase-merge/patch | dim mp
make -j 20
git add -u
git rebase --continue
;;
tc)
git tag --contains $1 | grep ^v | sort -V | head -n 1
if [ "x$1" == "x" ] ; then
if [[ "x$1" != "x" ]] ; then
upstream=$1
else
upstream=$DIM_DRM_UPSTREAM_REMOTE/drm-next
git fetch $DIM_DRM_UPSTREAM_REMOTE >& /dev/null || true
fi
echo Using $upstream as the upstream
# generate tag list
drm_intel_next_tags=`git log $DIM_DRM_INTEL_REMOTE/drm-intel-next ^$upstream --decorate | grep "(.*tag: drm-intel-next-" | sed -e "s/^.*(.*tag:.*\(drm-intel-next-[^ ,]*\).*)$/\1/"`
git request-pull $upstream $drm_intel_git $DIM_DRM_INTEL_REMOTE/drm-intel-next >> ~/tmp/dim-pull-request
$DIM_MUA -s "[PULL] drm-intel-next" \
-i ~/tmp/dim-pull-request \
-c "$addr_intel_gfx" \
-c "$addr_dri_devel" \
-c "$addr_intel_gfx_maintainer1" \
-c "$addr_intel_gfx_maintainer2" \
"$addr_drm_maintainer"
if [[ "x$1" != "x" ]] ; then
upstream=$1
else
upstream=origin/master
git fetch origin >& /dev/null || true
$DRY git tag -f drm-intel-fixes-$today $DIM_DRM_INTEL_REMOTE/drm-intel-fixes
$DRY git push -f $DIM_DRM_INTEL_REMOTE drm-intel-fixes-$today
git request-pull $upstream $drm_intel_git $DIM_DRM_INTEL_REMOTE/drm-intel-fixes >> ~/tmp/dim-pull-request
$DIM_MUA -s "[PULL] drm-intel-fixes" \
-i ~/tmp/dim-pull-request \
-c "$addr_intel_gfx" \
-c "$addr_dri_devel" \
-c "$addr_intel_gfx_maintainer1" \
-c "$addr_intel_gfx_maintainer2" \
"$addr_drm_maintainer"
if [[ "x$1" != "x" ]] ; then
branch=$1
$DRY git tag -f $branch-$today $DIM_DRM_INTEL_REMOTE/$branch
$DRY git push -f $DIM_DRM_INTEL_REMOTE $branch-$today
git request-pull $upstream $drm_intel_git $DIM_DRM_INTEL_REMOTE/$branch >> ~/tmp/dim-pull-request
$DIM_MUA -s "[PULL] $branch" \
-i ~/tmp/dim-pull-request \
-c "$addr_intel_gfx" \
-c "$addr_dri_devel" \
-c "$addr_intel_gfx_maintainer1" \
-c "$addr_intel_gfx_maintainer2" \
"$addr_drm_maintainer"
cd $DIM_PREFIX/$DIM_DRM_INTEL
git fetch $DIM_DRM_INTEL_REMOTE
if ! git branch --merged $DIM_DRM_INTEL_REMOTE/drm-intel-nightly | grep drm-intel-fixes &> /dev/null ; then
echo "drm-intel-fixes not merged into -nigthly, please update!"
exit 2
fi
if ! git branch --merged $DIM_DRM_INTEL_REMOTE/drm-intel-nightly | grep drm-intel-next-queued &> /dev/null ; then
echo "drm-intel-next-queued not merged into -nigthly, please update!"
exit 2
fi
gitk drm-intel-next-queued ^$DIM_DRM_UPSTREAM_REMOTE/drm-next &
git push $DRY_RUN $DIM_DRM_INTEL_REMOTE drm-intel-next-queued:drm-intel-next
$DRY git tag -f -a $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next
git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE $tag
git push $DRY_RUN $DIM_DRM_INTEL_REMOTE +$DIM_DRM_INTEL_REMOTE/drm-intel-nightly:drm-intel-testing
cat > ~/tmp/test-request <<-HERE
Hi all,
New -testing cycle with cool stuff:
HERE
obj=`git rev-parse $tag`
if [[ `git cat-file -t $obj` == "tag" ]] ; then
git cat-file -p $obj | tail -n+6 >> ~/tmp/test-request
else
echo "<tag doesn't contain a changelog overview, fix this>" >> ~/tmp/test-request
fi
cat >> ~/tmp/test-request <<-HERE
Happy testing!
Cheers, Daniel
HERE
$DIM_MUA -s "Updated drm-intel-testing" \
-i ~/tmp/test-request \
-c "$addr_intel_gfx" \
-c "$addr_intel_gfx_maintainer1" \
-c "$addr_intel_gfx_maintainer2" \
"$addr_intel_qa"
;;
checker)
rm drivers/gpu/drm/i915/*.o &> /dev/null || true
rm drivers/gpu/drm/i915/*.ko &> /dev/null || true
make C=1 drivers/gpu/drm/i915/i915.ko
;;
*)
if hash rst2man 2>/dev/null; then
renderer=rst2man
pager="man -l -"
else
renderer=cat
pager=${PAGER:-cat}
fi
$renderer <<HERE | $pager
=====
dim
=====
---------------------------
drm-intel maintainer script
---------------------------
:Author: Daniel Vetter <daniel.vetter@ffwll.ch>
:Author: Jani Nikula <jani.nikula@intel.com>
:Date: 2014-05-15
:Copyright: 2012-2014 Intel Corporation
:Manual section: 1
:Manual group: maintainer tools
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
**dim** [*option* ...] *command*
DESCRIPTION
===========
drm-intel maintainer script.
OPTIONS
=======
-v Verbose output.
-d Dry run.
COMMANDS
========
setup *prefix*
--------------
Setup git maintainer branches in the given prefix.
nightly-forget
--------------
Forget git rerere solutions for nightly merges in case they
contain a bogus merge resolution.
update-branches
---------------
Updates all maintainer branches.
rebuild-nightly
---------------
Rebuilds the nightly branch. Useful when ad-hoc trees are
included in -nightly.
push-queued|pq [*git push arguments*]
-------------------------------------
push-fixes|pf [*git push arguments*]
------------------------------------
Updates the drm-intel-fixes or the drm-intel-next-queued branch
respectively. Complains if that's not the current branch,
assuming that patches got merged to the wrong branch.
co
--
cof
---
Checks out the drm-intel-fixes branch or dinq respectively for
merging patches.
apply-branch|ab branch [*git am arguments*]
-------------------------------------------
Applys a patch to the given branch, complaining if it is not
checked out yet.
apply-queued|aq [*git am arguments*]
------------------------------------
apply-fixes|af [*git am arguments*]
-----------------------------------
Applies a patch to fixes or queued respectively, complains if
it's not the right branch. Additional arguments are passed to
git am.
magic-patch|mp
--------------
Apply a patch using patch and then wiggle in any conflicts.
magic-rebase-resolve|mrr
------------------------
Tries to resolve a rebase conflict by first resetting the tree
and the using the magic patch tool. Then builds the tree, adds
any changes with git add -u and continues the rebase.
apply-resolved|ar
-----------------
Compile-test the current tree and if successfully resolve a
confilicted git am. Also runs the patch checker afterwards.
apply-igt|ai
------------
Apply a patch to the i-g-t repository.
tc *commit-ish*
---------------
Prints the linux kernel tag which contains the supplied commit-ish
check-patch|cp [*commit-ish*]
-----------------------------
Runs a commit through the check tools like when applying a
patch. Git commit-ish can be passed in, defaults to HEAD
pull-request [*upstream*]
-------------------------
pull-request-fixes [*upstream*]
-------------------------------
Create a tag for the -fixes, but no tag is created for -next
since that's already been done by update-next. Then prepares a
pull request in ~/tmp/dim-pull-request. The upstream for -fixes
defaults to origin/master, the upstream for -next defaults to
airlied/drm-next
Since the tag for -fixes is based only on the day (and not the
exact time) and there's not tag being pushed for -next the pull
request can be regenerated with the same commands if the
upstream was wrong.
Then fires up mutt with the pre-generated email with subject and
recipients already set.
pull-request-topic *branch* *upstream*
--------------------------------------
Generates a pull request for the given topic-branch/upstream
combo and fires up mutt with the pre-generated email.
update-next
-----------
Pushes out the latest dinq to drm-intel-next and tags it. Also
pushes out the latest nightly to drm-intel-testing. For an
overview a gitk view of the currently unmerged feature pile is
opened.
Also checks that the drm-intel-fixes|-next-queued are fully
merged into -nightly to avoid operator error.
upload-docs
-----------
Generate html kernel docs and upload the drm DocBook to the
private fdo space. Note that this always uses the kernel sources
in the current directory.
checker
-------
Run sparse on the kernel.
HERE
exit 0