From patchwork Sun Oct 16 18:48:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9378295 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CF1E460487 for ; Sun, 16 Oct 2016 18:48:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C148128DD6 for ; Sun, 16 Oct 2016 18:48:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B602728DDB; Sun, 16 Oct 2016 18:48:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4351E28DD6 for ; Sun, 16 Oct 2016 18:48:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B10ED6E184; Sun, 16 Oct 2016 18:48:58 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id C38EF6E159 for ; Sun, 16 Oct 2016 18:48:31 +0000 (UTC) Received: by mail-lf0-x243.google.com with SMTP id x79so22737154lff.2 for ; Sun, 16 Oct 2016 11:48:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eLcigpxerh4iZGCISXjS8XC0oLbcYd3vXyvrqE9x158=; b=igqjpVxCWbhggOU+vxVXo5ch4Bp5fjfSQk7UujLbuhtVE3bBLYvvzGH8xpWaa63IpE gZy/GpHyKzv19NPeIWTzsAAjDpByeQDbwvXyl/lbfp3WWCYSwyLSs/CS/lC4AhCxXOo5 PA9J+LhbRSOY0Mqh2UHJr6RKyxv9IbrZPn6R0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eLcigpxerh4iZGCISXjS8XC0oLbcYd3vXyvrqE9x158=; b=HDlUMCyCJ1/HlP1+3ci4SdfP05cpIhwK9Nf6PoDzo3Xhi9ORPI1hzMUup9Qws60xyT LsxR2A0U4ndhEI6mVkW315y1mh42jPHwT6vvj3pE1Iza36ZcfSVvzoW9s+94sEV+QtMY 5aSyFSkx2gfm/fsObiqriZx8vKTgECuMOAanDY/7JzwUeKmwafsA1SwL4Tw4qAErEsAZ zZ3jE/CWcPjVOEdhlLR44LpEIZucvC9UWjpN9fBVbMKuTDd8EpqwVlQ90JtoEj+65WG8 DO3hkfbaUkr3sEYLpI/WRx7vciqg1g58P95KEFfc38XdPOrTwjR/wtTrt1V8lvgwssCA d7hA== X-Gm-Message-State: AA6/9RmdAC9WVQFijVZS3XAS1b8hXQC01KV4XPnjXNRjRyQCvjD1y4mpz8tGmEbyUaSKPA== X-Received: by 10.28.87.85 with SMTP id l82mr5444222wmb.99.1476643709358; Sun, 16 Oct 2016 11:48:29 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id pe5sm45143773wjb.15.2016.10.16.11.48.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Oct 2016 11:48:28 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Sun, 16 Oct 2016 20:48:10 +0200 Message-Id: <20161016184810.12030-9-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161016184810.12030-1-daniel.vetter@ffwll.ch> References: <20161016184810.12030-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , DRI Development , Daniel Vetter Subject: [Intel-gfx] [PATCH 8/8] dim: Split out drm-nightly.git X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This is a prep step to eventually split out the drm-misc branches all into their own repo. To get there we first need to split out the integration tree mangling. Since dim doesn't auto-update and since the transition is a good reason to switch over to worktrees and it's tricky it's not scripted. The following needs to be done when dim rebuild-nightly fails: - Make sure you have the latest dim version. - Good to also check you have a recent-ish git. Latest dim supports git worktree to save on disk space needed for .git metadata. It's much more robust than the git alternates storage trick we've used thus far. Note that git worktree is still optional (but that's not a recommended setup). - Delete $DIM_PREFIX/{drm-intel-rerere,drm-intel-nightly,maintainer-tools} It's not strictly needed to kill the maintainer-tools checkout too, but might as well switch it over to git worktree too. - Make sure you don't have any branches left over for drm-intel-rerere and drm-intel-nightly anywhere (since they need to switch their remotes). - run dim setup and enjoy the new awesomeness. If it breaks, I'm guilty ;-) Signed-off-by: Daniel Vetter --- dim | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dim b/dim index 92841b046c2c..d8f8a87b95c2 100755 --- a/dim +++ b/dim @@ -78,6 +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_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 @@ -506,6 +507,8 @@ function dim_apply_next_fixes function dim_cherry_pick { + local nightly_remote=`get_remote_name $drm_nightly_ssh` + if [[ "x$1" = "x" ]]; then echo "usage: $dim $subcommand commit-ish" exit 1 @@ -514,9 +517,9 @@ function dim_cherry_pick sha_short=${sha:0:8} # need latest -nightly - git fetch $DIM_DRM_INTEL_REMOTE + git fetch $nightly_remote echo Possible fixup patches for your cherry-pick: - git log --grep=$sha_short --pretty=oneline $sha..$DIM_DRM_INTEL_REMOTE/drm-intel-nightly + git log --grep=$sha_short --pretty=oneline $sha..$nightly_remote/drm-intel-nightly $DRY git cherry-pick -s -x -e $1 } @@ -885,15 +888,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 git pull --ff-only - if ! git branch --merged $DIM_DRM_INTEL_REMOTE/drm-intel-nightly | grep drm-intel-fixes &> /dev/null ; then + if ! git branch --merged $nightly_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 + if ! git branch --merged $nightly_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 @@ -915,6 +920,8 @@ function dim_update_next function dim_update_next_continue { + local nightly_remote=`get_remote_name $drm_nightly_ssh` + assert_branch drm-intel-next-queued git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE drm-intel-next-queued:drm-intel-next @@ -923,7 +930,7 @@ function dim_update_next_continue git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE $tag echo "Updating -testing to latest -nightly" - git push $DRY_RUN $DIM_DRM_INTEL_REMOTE +$DIM_DRM_INTEL_REMOTE/drm-intel-nightly:drm-intel-testing + git push $DRY_RUN $DIM_DRM_INTEL_REMOTE +$nightly_remote/drm-intel-nightly: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 @@ -1129,15 +1136,16 @@ 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_upstream_git` cd .. setup_aux_checkout maintainer-tools $drm_intel_ssh maintainer-tools - setup_aux_checkout rerere-cache $drm_intel_ssh drm-intel-rerere + setup_aux_checkout rerere-cache $drm_nightly_ssh drm-intel-rerere - setup_aux_checkout drm-intel-nightly $drm_intel_ssh drm-intel-nightly + setup_aux_checkout drm-intel-nightly $drm_nightly_ssh drm-intel-nightly cd drm-intel-nightly if git remote | grep drm-upstream > /dev/null ; then git config remote.drm-upstream.url $drm_upstream_git