tip = testing and integration pile
Also rename drm-intel-rerere directory to drm-rerere.
v2: don't call get_remote_name before switching directories.
Signed-off-by: Daniel Vetter daniel.vetter@intel.com --- dim | 52 ++++++++++++++++++++++++++-------------------------- dim.rst | 16 +++++++--------- dimrc.sample | 2 +- drm-intel-flow.dot | 18 +++++++++--------- drm-intel.rst | 20 +++++++++++--------- 5 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/dim b/dim index 85e5de92a13e..5996306cddfb 100755 --- a/dim +++ b/dim @@ -78,7 +78,7 @@ dim=$(basename $0) today=`date +%Y-%m-%d`
drm_intel_ssh=ssh://git.freedesktop.org/git/drm-intel -drm_nightly_ssh=ssh://git.freedesktop.org/git/drm-nightly +drm_tip_ssh=ssh://git.freedesktop.org/git/drm-tip drm_intel_git=git://anongit.freedesktop.org/drm-intel drm_upstream_git=git://people.freedesktop.org/~airlied/linux linux_upstream_git=git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git @@ -151,7 +151,7 @@ fi #
if [ "$subcommand" != "setup" -a "$subcommand" != "help" -a "$subcommand" != "usage" ]; then - for d in $DIM_PREFIX $DIM_PREFIX/$DIM_DRM_INTEL $DIM_PREFIX/drm-intel-rerere $DIM_PREFIX/drm-intel-nightly; do + for d in $DIM_PREFIX $DIM_PREFIX/$DIM_DRM_INTEL $DIM_PREFIX/drm-rerere $DIM_PREFIX/drm-tip; do if [ ! -d $d ]; then echo "$d is missing, please check your configuration and/or run dim setup" exit 1 @@ -162,7 +162,7 @@ if [ "$subcommand" != "setup" -a "$subcommand" != "help" -a "$subcommand" != "us # Internal configuration that depends on a sane setup. #
- dim_branches=`(source $DIM_PREFIX/drm-intel-rerere/nightly.conf ; echo $nightly_branches) | \ + dim_branches=`(source $DIM_PREFIX/drm-rerere/nightly.conf ; echo $nightly_branches) | \ xargs -n 1 echo | grep '^origin' | sed -e 's/^origin///'` fi
@@ -244,7 +244,7 @@ function map_nightly_remote
function update_linux_next { - cd $DIM_PREFIX/drm-intel-nightly + cd $DIM_PREFIX/drm-tip
local nightly_origin=`map_nightly_remote origin`
@@ -283,8 +283,8 @@ function check_conflicts
function rr_cache_dir { - if [ -d $DIM_PREFIX/drm-intel-nightly/.git/rr-cache/ ] ; then - echo $DIM_PREFIX/drm-intel-nightly/.git/rr-cache/ + if [ -d $DIM_PREFIX/drm-tip/.git/rr-cache/ ] ; then + echo $DIM_PREFIX/drm-tip/.git/rr-cache/ else echo $DIM_PREFIX/$DIM_DRM_INTEL/.git/rr-cache/ fi @@ -292,7 +292,7 @@ function rr_cache_dir
function update_rerere_cache { - cd $DIM_PREFIX/drm-intel-rerere/ + cd $DIM_PREFIX/drm-rerere/ git pull cp rr-cache/* `rr_cache_dir` -r cd - @@ -300,12 +300,12 @@ function update_rerere_cache
function dim_rebuild_nightly { - local integration_branch=drm-intel-nightly + local integration_branch=drm-tip local specfile=`mktemp` local time="`date --utc +%Yy-%mm-%dd-%Hh-%Mm-%Ss` UTC" local first=1
- local rerere=$DIM_PREFIX/drm-intel-rerere + local rerere=$DIM_PREFIX/drm-rerere
cd $rerere if [[ `git status --porcelain | grep -v "^[ ?][ ?]" | wc -l` -gt 0 ]]; then @@ -512,7 +512,7 @@ function dim_apply_next_fixes
function dim_cherry_pick { - local nightly_remote=`get_remote_name $drm_nightly_ssh` + local nightly_remote=`get_remote_name $drm_tip_ssh`
if [[ "x$1" = "x" ]]; then echo "usage: $dim $subcommand commit-ish" @@ -524,7 +524,7 @@ function dim_cherry_pick # need latest -nightly git fetch $nightly_remote echo Possible fixup patches for your cherry-pick: - git log --grep=$sha_short --pretty=oneline $sha..$nightly_remote/drm-intel-nightly + git log --grep=$sha_short --pretty=oneline $sha..$nightly_remote/drm-tip $DRY git cherry-pick -s -x -e $1 }
@@ -649,7 +649,7 @@ function dim_create_branch
$DRY git branch $branch $start git push $DRY_RUN $DIM_DRM_INTEL_REMOTE +$branch --set-upstream - cd $DIM_PREFIX/drm-intel-rerere + cd $DIM_PREFIX/drm-rerere $DRY echo "nightly_branches="$nightly_branches origin/$branch"" \ >> nightly.conf $DRY git add nightly.conf @@ -674,10 +674,10 @@ function dim_remove_branch rm -R $DIM_PREFIX/$branch fi
- cd $DIM_PREFIX/drm-intel-nightly + cd $DIM_PREFIX/drm-tip git push $DRY_RUN origin --delete $branch $DRY git fetch origin --prune - cd $DIM_PREFIX/drm-intel-rerere + cd $DIM_PREFIX/drm-rerere full_branch="origin/$branch" $DRY sed -e "/${full_branch////\/}/d" -i nightly.conf $DRY git add nightly.conf @@ -893,17 +893,17 @@ function dim_for_each_workdirs
function dim_update_next { - local nightly_remote=`get_remote_name $drm_nightly_ssh` - assert_branch drm-intel-next-queued
+ local nightly_remote=`get_remote_name $drm_tip_ssh` + git pull --ff-only
- if ! git branch --merged $nightly_remote/drm-intel-nightly | grep drm-intel-fixes &> /dev/null ; then + if ! git branch --merged $nightly_remote/drm-tip | grep drm-intel-fixes &> /dev/null ; then echo "drm-intel-fixes not merged into -nigthly, please update!" exit 2 fi - if ! git branch --merged $nightly_remote/drm-intel-nightly | grep drm-intel-next-queued &> /dev/null ; then + if ! git branch --merged $nightly_remote/drm-tip | grep drm-intel-next-queued &> /dev/null ; then echo "drm-intel-next-queued not merged into -nigthly, please update!" exit 2 fi @@ -925,17 +925,17 @@ function dim_update_next
function dim_update_next_continue { - local nightly_remote=`get_remote_name $drm_nightly_ssh` - assert_branch drm-intel-next-queued
+ local nightly_remote=`get_remote_name $drm_tip_ssh` + git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE drm-intel-next-queued:drm-intel-next tag=drm-intel-next-$today $DRY git tag -f -a $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE $tag
echo "Updating -testing to latest -nightly" - git push $DRY_RUN $DIM_DRM_INTEL_REMOTE +$nightly_remote/drm-intel-nightly:drm-intel-testing + git push $DRY_RUN $DIM_DRM_INTEL_REMOTE +$nightly_remote/drm-tip:drm-intel-testing $DRY git tag -f drm-intel-testing-$today $DIM_DRM_INTEL_REMOTE/drm-intel-testing $DRY git push -f $DIM_DRM_INTEL_REMOTE drm-intel-testing-$today
@@ -1141,17 +1141,17 @@ function dim_setup # check remote configuration remote=`get_remote_name $linux_upstream_git` remote=`get_remote_name $drm_intel_ssh` - remote=`get_remote_name $drm_nightly_ssh` + remote=`get_remote_name $drm_tip_ssh` remote=`get_remote_name $drm_upstream_git`
cd ..
setup_aux_checkout maintainer-tools $drm_intel_ssh maintainer-tools
- setup_aux_checkout rerere-cache $drm_nightly_ssh drm-intel-rerere + setup_aux_checkout rerere-cache $drm_tip_ssh drm-rerere
- setup_aux_checkout drm-intel-nightly $drm_nightly_ssh drm-intel-nightly - cd drm-intel-nightly + setup_aux_checkout drm-tip $drm_tip_ssh drm-tip + cd drm-tip if git remote | grep drm-upstream > /dev/null ; then git config remote.drm-upstream.url $drm_upstream_git else @@ -1199,7 +1199,7 @@ function dim_list_aliases
function dim_cat_to_fixup { - cd $DIM_PREFIX/drm-intel-nightly + cd $DIM_PREFIX/drm-tip cat > `cat .fixup_file_path` }
diff --git a/dim.rst b/dim.rst index 85de95796611..dd4ba0fc5720 100644 --- a/dim.rst +++ b/dim.rst @@ -110,7 +110,7 @@ push-queued|pq [*git push arguments*] Updates the named branch, or drm-intel-fixes, drm-intel-next-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. After pushing also -updates linux-next and drm-intel-nightly branches. +updates linux-next and drm-tip branches.
checkout|co *branch* -------------------- @@ -189,10 +189,8 @@ CodingStyle approved format. cherry-pick *commit-ish* [*git cherry-pick arguments*] ------------------------------------------------------
-Improved git cherry-pick version which also scans drm-intel-nightly for any -mentions of the cherry-picked commit. Should be used when cherry-pick from -next -to -fixes to make sure all fixups are picked, too. In dry-run mode/-d only the -patch list is generated. +Improved git cherry-pick version which also scans drm-tip picked, too. In +dry-run mode/-d only the patch list is generated.
cherry-pick-fixes ----------------- @@ -399,7 +397,7 @@ you have improvements for dim, please submit them to intel-gfx.
You should now have a main repository for patch application. The directory corresponding to this repository is defined by DIM_DRM_INTEL in your .dimrc. -You should also have directories called maintainer-tools, drm-intel-nightly (for +You should also have directories called maintainer-tools, drm-tip (for rebuilding the tree), and drm-intel-rerere for some dim-internal book-keeping.
Applying patches to dinq is done in the main repository with:: @@ -415,9 +413,9 @@ rebasing) push out the new tree with::
$ dim push-queued
-This will also rebuild a new drm-intel-nightly integration tree. If that fails, -ask maintainers for help with resolving conflicts. One thing to note here is -that the script syncs saved git rerere conflict resolutions around. One does the +This will also rebuild a new drm-tip integration tree. If that fails, ask +maintainers for help with resolving conflicts. One thing to note here is that +the script syncs saved git rerere conflict resolutions around. One does the resolution, everyone has it. The drawback is, someone screws up the conflict resolution, everyone has it...
diff --git a/dimrc.sample b/dimrc.sample index ad463b42d537..42612a3a9fdf 100644 --- a/dimrc.sample +++ b/dimrc.sample @@ -4,7 +4,7 @@ # Defaults are in the comments below.
# Prefix for the repo directories. The prefix will contain -# $DIM_DRM_INTEL, drm-intel-nightly, maintainer-tools, etc. +# $DIM_DRM_INTEL, drm-tip, maintainer-tools, etc. #DIM_PREFIX=$HOME/linux
# Name of the main maintainer repo under $DIM_PREFIX. diff --git a/drm-intel-flow.dot b/drm-intel-flow.dot index 0c9879deba64..1be86164f5e0 100644 --- a/drm-intel-flow.dot +++ b/drm-intel-flow.dot @@ -56,7 +56,7 @@ strict digraph "drm-intel" { "drm-intel-next" [color=blue] "drm-intel-next-fixes" [color=blue] "drm-intel-next-queued" [label="drm-intel-next-queued\ntopic/* branches" color=blue] - "drm-intel-nightly" [color=blue] + "drm-tip" [color=blue] "drm-intel-testing" [color=blue] "drm-intel-internal" [color=blue]
@@ -66,20 +66,20 @@ strict digraph "drm-intel" { "drm-intel-next-fixes" -> "drm-next" [label="discretionary pulls\n~rc5..release" color=blue] "drm-intel-next-queued" -> "drm-intel-next" [color=blue] "drm-intel-next-queued" -> "drm-next" [label="special topic/* branches" color=blue] - "drm-intel-nightly" -> "drm-intel-testing" [label="snapshot for QA" color=blue] + "drm-tip" -> "drm-intel-testing" [label="snapshot for QA" color=blue]
# other trees in nightly "sound/for-linus" [color=yellow style=dashed] "sound/for-next" [color=yellow style=dashed]
# nightly rebuild - "drm-intel-fixes" -> "drm-intel-nightly" [label="rebuild" color=blue] - "drm-intel-next-fixes" -> "drm-intel-nightly" [label="rebuild" color=blue] - "drm-intel-next-queued" -> "drm-intel-nightly" [label="rebuild" color=blue] - "drm-next" -> "drm-intel-nightly" [label="rebuild" color=blue] - "drm-fixes" -> "drm-intel-nightly" [label="rebuild" color=blue] - "sound/for-next" -> "drm-intel-nightly" [label="rebuild" color=blue] - "sound/for-linus" -> "drm-intel-nightly" [label="rebuild" color=blue] + "drm-intel-fixes" -> "drm-tip" [label="rebuild" color=blue] + "drm-intel-next-fixes" -> "drm-tip" [label="rebuild" color=blue] + "drm-intel-next-queued" -> "drm-tip" [label="rebuild" color=blue] + "drm-next" -> "drm-tip" [label="rebuild" color=blue] + "drm-fixes" -> "drm-tip" [label="rebuild" color=blue] + "sound/for-next" -> "drm-tip" [label="rebuild" color=blue] + "sound/for-linus" -> "drm-tip" [label="rebuild" color=blue]
# patch flow "intel-gfx" [label="intel-gfx mailing list"] diff --git a/drm-intel.rst b/drm-intel.rst index 492cb580bbd5..e9cf240c4048 100644 --- a/drm-intel.rst +++ b/drm-intel.rst @@ -120,10 +120,12 @@ This is the fastest path to getting fixes to Linus' tree. It is generally for the regressions, cc:stable, black screens, GPU hangs only, and should pretty much follow the stable rules.
-drm-intel-nightly -~~~~~~~~~~~~~~~~~ +drm-tip +~~~~~~~
-This branch combines them all. Rebuilt every time one of the trees is pushed. +This branch combines them all. Rebuilt every time one of the trees is pushed. It +is living in a separate git repository name +`drm-tip https://cgit.freedesktop.org/drm-tip`_.
Patch and Merge Flow ==================== @@ -215,11 +217,11 @@ Signed-off-by: line in the commit message:
(cherry picked from commit 0bff4858653312a10c83709e0009c3adb87e6f1e)
-Resolving Conflicts when Rebuilding drm-intel-nightly -===================================================== +Resolving Conflicts when Rebuilding drm-tip +===========================================
-When you push patches with dim drm-intel-nightly always gets rebuild and this -can sometimes fail, for example like this: :: +When you push patches with dim drm-tip always gets rebuild and this can +sometimes fail, for example like this: ::
Updating rerere cache and nightly.conf... Done. Fetching drm-upstream... Done. @@ -246,9 +248,9 @@ when it's tricky or something fails in the below procedure. It's handy to keep the log output for context so that you know which branch caused the conflicts, and which branches are already included.
-3. Switch to $DIM_PREFIX/drm-intel-nightly and analyze the conflict: :: +3. Switch to $DIM_PREFIX/drm-tip and analyze the conflict: ::
- $ cd $DIM_PREFIX/drm-intel-nightly + $ cd $DIM_PREFIX/drm-tip $ git diff # shows three-way diff of conflict $ gitk --merge # lists all commits git believes to be relevant