[PATCH] dim: Move maintainer-tools branch to drm-tip

[Jani Nikula]

On Wed, 31 Jan 2018, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> Originally I wanted to move it to a completely stand-alone
> maintainer-tools.git repo. But that has the problem that we need to
> keep track of, and update, yet another remote. Easy way out it to
> simply stuff the maintainer-tools branch into drm-tip.
>
> The auto-upgrade hack is a bit gross, but shouldn't really cause
> overhead. I've also pushed out the latest maintainer-tools (without
> this patch) to drm-tip.git to make sure the patch can be tested.
>
> The neat thing here is that this allows us to finally remove
> drm-intel url hardcoding from dim.
>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> ---
>  dim | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/dim b/dim
> index 3639ada1854b..6f2bf0056e4b 100755
> --- a/dim
> +++ b/dim
> @@ -131,6 +131,12 @@ function read_integration_config
>  			dim_branches="$dim_branches $branch"
>  		fi
>  	done
> +
> +	#this is a bit a hack
> +	(
> +	 cd $DIM_PREFIX/maintainer-tools;
> +	 git config --replace-all  branch.maintainer-tools.remote $(repo_to_remote drm-tip)
> +	)

You know you could push this hunk only to the branch at drm-intel, with
a message to the user "updating bla bla".

The documentation needs updating too.

BR,
Jani.


>  }
>  
>  function echoerr
> @@ -1929,9 +1935,8 @@ function setup_aux_checkout # name url directory
>  
>  function dim_setup
>  {
> -	local remote drm_intel_ssh drm_tip_ssh drm_upstream_git linux_upstream_git
> +	local remote drm_tip_ssh drm_upstream_git linux_upstream_git
>  
> -	drm_intel_ssh=ssh://git.freedesktop.org/git/drm-intel
>  	drm_tip_ssh=ssh://git.freedesktop.org/git/drm-tip
>  	drm_upstream_git=git://people.freedesktop.org/~airlied/linux
>  	linux_upstream_git=git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
> @@ -1956,7 +1961,7 @@ function dim_setup
>  
>  	cd $DIM_PREFIX
>  
> -	setup_aux_checkout maintainer-tools $drm_intel_ssh maintainer-tools
> +	setup_aux_checkout maintainer-tools $drm_tip_ssh maintainer-tools
>  
>  	setup_aux_checkout rerere-cache $drm_tip_ssh drm-rerere
>  
> @@ -2140,7 +2145,7 @@ function dim_help
>  	if [ ! -e "$manpage" ]; then
>  		manpage=$(dirname $(readlink -f $0))/dim.rst
>  		if [ ! -e "$manpage" ]; then
> -			echo "Can't find the man page. See http://cgit.freedesktop.org/drm-intel/tree/dim.rst?h=maintainer-tools"
> +			echo "Can't find the man page. See http://cgit.freedesktop.org/drm-tip/tree/dim.rst?h=maintainer-tools"
>  			exit 1
>  		fi
>  	fi

-- 
Jani Nikula, Intel Open Source Technology Center