[dim PATCH 0/2] dim fetch fixes

[dim PATCH 0/2] dim fetch fixes

[Jani Nikula]

Fix a couple of issues that probably only plague setups that don't use
git-worktree.

We should probably consider adding Linus' tree and drm-tip to drm_tip_repos;
drm-tip is rebuilt based on drm_tip_config anyway. Anyway, this is the quick
fix.

BR,
Jani.


Jani Nikula (2):
  dim: fetch Linus' tree again on update-branches
  dim: fetch drm-tip before rebuilding

 dim | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

-- 
2.1.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[dim PATCH 1/2] dim: fetch Linus' tree again on update-branches

[Jani Nikula]

Fixes: 6552af2d32c4 ("dim: fix update-branches to fetch all available nightly repos")
Cc: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 dim | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dim b/dim
index 3dd2d1dec796..562cbc64c93e 100755
--- a/dim
+++ b/dim
@@ -1255,6 +1255,14 @@ function dim_update_branches
 	local repo remote
 
 	cd $DIM_PREFIX/$DIM_DRM_INTEL
+
+	if remote=$(url_to_remote $linux_upstream_git 2>/dev/null); then
+		echo -n "Fetching linux (local remote $remote)... "
+		# git fetch returns 128 if there's nothing to be fetched
+		git fetch -q $remote || true
+		echo "Done."
+	fi
+
 	for repo in "${!drm_tip_repos[@]}"; do
 		url=${drm_tip_repos[$repo]}
 		if ! remote=$(url_to_remote $url 2>/dev/null); then
-- 
2.1.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[dim PATCH 2/2] dim: fetch drm-tip before rebuilding

[Jani Nikula]

Without this, my non-git-worktree setup will fail to push (or it takes
forever) if the local drm-tip is not up to date.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 dim | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dim b/dim
index 562cbc64c93e..6371c95885a8 100755
--- a/dim
+++ b/dim
@@ -424,6 +424,12 @@ function dim_rebuild_tip
 		exit 1
 	fi
 
+	echo -n "Fetching drm-tip (local remote $remote)... "
+	remote=$(url_to_remote $drm_tip_ssh)
+	# git fetch returns 128 if there's nothing to be fetched
+	git fetch -q $remote || true
+	echo "Done."
+
 	for repo in "${!drm_tip_repos[@]}"; do
 		url=${drm_tip_repos[$repo]}
 		remote=$(url_to_remote $url)
-- 
2.1.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [dim PATCH 1/2] dim: fetch Linus' tree again on update-branches

[Daniel Vetter]

On Tue, Nov 29, 2016 at 06:17:15PM +0200, Jani Nikula wrote:
> Fixes: 6552af2d32c4 ("dim: fix update-branches to fetch all available nightly repos")
> Cc: Archit Taneja <architt@codeaurora.org>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  dim | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/dim b/dim
> index 3dd2d1dec796..562cbc64c93e 100755
> --- a/dim
> +++ b/dim
> @@ -1255,6 +1255,14 @@ function dim_update_branches
>  	local repo remote
>  
>  	cd $DIM_PREFIX/$DIM_DRM_INTEL
> +
> +	if remote=$(url_to_remote $linux_upstream_git 2>/dev/null); then

We still have a bunch of places where we hardcode origin for Linus' repo.
Might want to sed that at one point for consistency ...

But this here is acked.

> +		echo -n "Fetching linux (local remote $remote)... "
> +		# git fetch returns 128 if there's nothing to be fetched
> +		git fetch -q $remote || true

Another idea: fetch_helper instead of the same 2 lines copypasted everywhere?
-Daniel

> +		echo "Done."
> +	fi
> +
>  	for repo in "${!drm_tip_repos[@]}"; do
>  		url=${drm_tip_repos[$repo]}
>  		if ! remote=$(url_to_remote $url 2>/dev/null); then
> -- 
> 2.1.4
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [dim PATCH 2/2] dim: fetch drm-tip before rebuilding

[Daniel Vetter]

On Tue, Nov 29, 2016 at 06:17:16PM +0200, Jani Nikula wrote:
> Without this, my non-git-worktree setup will fail to push (or it takes
> forever) if the local drm-tip is not up to date.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Ack. No idea why git is dense at this ...
-Daniel
> ---
>  dim | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/dim b/dim
> index 562cbc64c93e..6371c95885a8 100755
> --- a/dim
> +++ b/dim
> @@ -424,6 +424,12 @@ function dim_rebuild_tip
>  		exit 1
>  	fi
>  
> +	echo -n "Fetching drm-tip (local remote $remote)... "
> +	remote=$(url_to_remote $drm_tip_ssh)
> +	# git fetch returns 128 if there's nothing to be fetched
> +	git fetch -q $remote || true
> +	echo "Done."
> +
>  	for repo in "${!drm_tip_repos[@]}"; do
>  		url=${drm_tip_repos[$repo]}
>  		remote=$(url_to_remote $url)
> -- 
> 2.1.4
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx