[dim PATCH 7/7] dim: replace drm-intel-next usage with drm-intel-next-queued

[Jani Nikula]

On Thu, 06 Dec 2018, Rodrigo Vivi <rodrigo.vivi at intel.com> wrote:
> On Wed, Dec 05, 2018 at 05:02:59PM +0200, Jani Nikula wrote:
>> Stop using drm-intel-next for pull requests. Use drm-intel-next-queued
>> instead. Keep drm-intel-next in sync with drm-intel-next-queued by
>> pushing it every time dinq is pushed.
>> 
>> This paves the way for a later flag-day switch to drm-intel-next.
>> 
>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>> ---
>>  dim     | 49 ++++++++++++++-----------------------------------
>>  dim.rst | 13 +------------
>>  2 files changed, 15 insertions(+), 47 deletions(-)
>> 
>> diff --git a/dim b/dim
>> index 12b86cf3a382..14783e971d40 100755
>> --- a/dim
>> +++ b/dim
>> @@ -887,6 +887,11 @@ function dim_push_branch
>>  
>>  	git push $DRY_RUN $remote $branch "$@"
>>  
>> +	# Transitional: Always push dinq to din
>> +	if [[ "$branch" = "drm-intel-next-queued" ]]; then
>> +		git push $DRY_RUN -f $remote drm-intel-next-queued:drm-intel-next
>
> I'm wondering why we don't simply kill dinq and push to drm-intel-next...
> or if we line "dinq" word better kill drm-intel-next instead?
>
> but why keep both?

See cover letter. Currently we have mixed dinq and din use, so I'm first
moving to just one. It's easier to do that with dinq. Then the goal is
to switch from dinq to din. But it's not at all trivial with everyone
trained on dinq. One thing at a time.

BR,
Jani.




>
>> +	fi
>> +
>>  	update_linux_next $branch drm-intel-next-queued drm-intel-next-fixes drm-intel-fixes
>>  	update_linux_next $branch drm-misc-next drm-misc-next-fixes drm-misc-fixes
>>  	update_linux_next $branch drm-amd-next drm-amd-next-fixes drm-amd-fixes
>> @@ -1873,27 +1878,10 @@ function dim_update_next
>>  
>>  	dim_update_driver_date "drm/i915" "drivers/gpu/drm/i915/i915_drv.h"
>>  
>> -	gitk --first-parent drm-intel-next-queued ^$(branch_to_remote drm-next)/drm-next &
>> -
>>  	# try to push dinq first in case someone raced
>>  	FORCE=1 dim_push_queued
>>  
>> -	dim_update_next_continue
>> -}
>> -
>> -function dim_update_next_continue
>> -{
>> -	local remote tag
>> -
>> -	assert_branch drm-intel-next-queued
>> -
>> -	remote=$(repo_to_remote drm-intel)
>> -
>> -	git push $DRY_RUN -f $remote drm-intel-next-queued:drm-intel-next
>> -	tag=$(tag_name "drm-intel-next")
>> -
>> -	tag_branch $tag drm-intel-next
>> -	git push $DRY_RUN $remote $tag
>> +	dim_tag_branch $branch $(branch_to_remote drm-next)/drm-next
>>  }
>>  
>>  function dim_tag_branch
>> @@ -1933,7 +1921,7 @@ function dim_tag_branch
>>  
>>  function dim_tag_next
>>  {
>> -	dim_tag_branch "drm-intel-next"
>> +	dim_tag_branch "drm-intel-next-queued"
>>  }
>>  
>>  # dim_pull_request branch upstream
>> @@ -1946,26 +1934,17 @@ function dim_pull_request
>>  	remote=$(branch_to_remote $branch)
>>  	req_file=$(mktemp)
>>  
>> -	if [ "$branch" != "drm-intel-next" ]; then
>> -		assert_branch $branch
>> -	else
>> -		cd $DIM_PREFIX/$DIM_REPO
>> -	fi
>> +	assert_branch $branch
>>  
>>  	git_fetch_helper ${upstream%%/*}
>>  	echo "Using $upstream as the upstream"
>>  
>> -	if [ "$branch" = "drm-intel-next" ]; then
>> -		# drm-intel-next pulls have been tagged using dim update-next
>> -		repo="drm-intel"
>> -	else
>> -		tag=$(tag_name "$branch")
>> -		gitk --first-parent "$branch" ^$upstream &
>> -		tag_branch $tag $branch
>> -		$DRY git push $remote $tag
>> +	tag=$(tag_name "$branch")
>> +	gitk --first-parent "$branch" ^$upstream &
>> +	tag_branch $tag $branch
>> +	$DRY git push $remote $tag
>>  
>> -		repo=$(branch_to_repo $branch)
>> -	fi
>> +	repo=$(branch_to_repo $branch)
>>  
>>  	tags=$(git_unmerged_tags "$branch" "$upstream")
>>  	prep_pull_mail $req_file $tags
>> @@ -1988,7 +1967,7 @@ function dim_pull_request
>>  function dim_pull_request_next
>>  {
>>  	upstream=${1:-$(branch_to_remote drm-next)/drm-next}
>> -	dim_pull_request drm-intel-next $upstream
>> +	dim_pull_request drm-intel-next-queued $upstream
>>  }
>>  
>>  function dim_pull_request_fixes
>> diff --git a/dim.rst b/dim.rst
>> index 792c99f324fa..5dc630add8b0 100644
>> --- a/dim.rst
>> +++ b/dim.rst
>> @@ -367,13 +367,6 @@ view of the currently unmerged feature pile is opened.
>>  
>>  The tag will be signed using the key specified by \$DIM_GPG_KEYID, if set.
>>  
>> -update-next-continue
>> ---------------------
>> -
>> -When **update-next** fails to push the special release commit (because it raced with
>> -another committer) rebase and push manually, and then continue using this
>> -command.
>> -
>>  tag-branch *branch* [*upstream*]
>>  --------------------------------
>>  Pushes a new tag for the specified branch after checking that the remote is 
>> @@ -385,11 +378,7 @@ If upstream is provided, launch gitk to show the changes to be tagged.
>>  
>>  tag-next
>>  --------
>> -**tag-branch** shorthand for drm-intel-next.
>> -
>> -Useful if drm-intel-next has been changed since the last run of the
>> -update-next command (e.g. to apply a hotfix before sending out the pull request).
>> -
>> +**tag-branch** shorthand for drm-intel-next-queued.
>>  
>>  DIM HELP COMMANDS
>>  =================
>> -- 
>> 2.11.0
>> 
>> _______________________________________________
>> dim-tools mailing list
>> dim-tools at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dim-tools

-- 
Jani Nikula, Intel Open Source Graphics Center