[PATCH] dim: remove special casing for drm-intel-next

[Jani Nikula]

On Thu, 10 Jan 2019, Daniel Vetter <daniel at ffwll.ch> wrote:
> On Thu, Jan 10, 2019 at 03:42:12PM +0200, Jani Nikula wrote:
>> Now that drm-intel-next is defined in nightly.conf, we can remove some
>> of the special treatment.
>> 
>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>> 
>> ---
>> 
>> now ~ after "nightly.conf: add drm-intel-next to drm-tip branches"
>> ---
>
> Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

Thanks, pushed.

> Only thing I've found that could cause a hiccup for the smooth transition
> is the dim_push_branch logic. Since we need a flag day anyway that
> shouldn't be too hard really (or we could type a special version which
> picks the later of dinq and din).

I was thinking the tag and pull request were the bigger problem, and the
previous patches kind of stalled at the multiple-tags-in-a-pull-request
issue. I guess drm-intel-next/-queued could first switch to
tag-and-pull-request in one go like everything else, and postpone the
multiple tags thing until we've migrated to drm-intel-next only.

Here I'm just trying to nudge small things forward in the mean time.

BR,
Jani.


> -Daniel
>
>>  dim | 10 ----------
>>  1 file changed, 10 deletions(-)
>> 
>> diff --git a/dim b/dim
>> index 1efbffd7c677..dafbf946e0b7 100755
>> --- a/dim
>> +++ b/dim
>> @@ -1456,10 +1456,6 @@ function dim_checkout
>>  	if ! git_branch_exists $branch ; then
>>  		repo=$(branch_to_repo $branch)
>>  
>> -		if [[ $branch == "drm-intel-next" ]] ; then
>> -			repo="drm-intel"
>> -		fi
>> -
>>  		if [[ $repo == "" ]] ; then
>>  			echoerr "$branch not found in $dim_integration_config"
>>  			exit 1
>> @@ -2027,12 +2023,6 @@ function dim_update_branches
>>  			$DRY git rebase -i
>>  		fi
>>  	done
>> -	if git_branch_exists drm-intel-next ; then
>> -		intel_remote=$(repo_to_remote drm-intel)
>> -
>> -		dim_checkout drm-intel-next
>> -		$DRY git reset --hard $intel_remote/drm-intel-next
>> -	fi
>>  
>>  	cd $DIM_PREFIX/maintainer-tools
>>  	if git_is_current_branch maintainer-tools ; then
>> -- 
>> 2.20.1
>> 

-- 
Jani Nikula, Intel Open Source Graphics Center