Skip to contentSkip to conversation

dim: fix remote repository lookup function

PATCH In review Andrzej Hajda 4 participants 10 messages Aug 25, 2017 – Oct 11, 2017 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): CGME20170825113227eucas1p2beec67e2f2a805ccd34cf7bf71ed4ec1@eucas1p2.samsung.com

#1 lore raw

PATCH 1/1 dim: fix remote repository lookup function

dim finds remote name by matching repository urls, but different users requires different protocols/paths for remotes (ssh/git/https). Current code incorrectly translates provided url to alternatives, the patch fixes it.

---
 dim | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)
dim +12 -14
index 11aa675..d6d9269 100755
@@ -223,15 +223,15 @@ fi
 #	git branch name - dim assumes that the remote and local name match
 # url:
 #	url to a repo, using ssh:// protocol
-# git_url:
-#	url to a repo, but using anonymous git:// protocol
+# urls:
+#	alternative urls to a repo, derived from url
 #
 # The below functions map between these.
 #
 
 function url_to_remote # url
 {
-	local url remote
+	local url urls remote
 
 	url="$1"
 
@@ -240,19 +240,17 @@ function url_to_remote # url
 		return 1
 	fi
 
-	remote=$(git remote -v | grep -m 1 "$url" | cut -f 1)
+	urls=$(echo $url | sed -r \
+		-e 's!ssh://(git.freedesktop.org)/git/(.*)!\0|git://anon\1/\2|https://anon\1/git/\2.git!' \
+		-e 's!git://(git.kernel.org/.*)!\0|https://\1!')
+	remote=$(git remote -v | grep -m 1 -P "$urls" | cut -f 1)
 
 	if [[ -z "$remote" ]]; then
-		git_url=$(echo $url | sed -e 's/git\./anongit./' -e 's/ssh:/git:/')
-		remote=$(git remote -v | grep -m 1 "$git_url" | cut -f 1)
-
-		if [[ -z "$remote" ]]; then
-			echoerr "No git remote for url $url or $git_url found in $(pwd)"
-			echoerr "Please set it up using:"
-			echoerr "    $ git remote add <name> $url"
-			echoerr "with a name of your choice."
-			return 1
-		fi
+		echoerr "No git remote for url $url found in $(pwd)"
+		echoerr "Please set it up using:"
+		echoerr "    $ git remote add <name> url"
+		echoerr "with a name of your choice and url one of: ${urls//|/, }"
+		return 1
 	fi
 
 	echo $remote
Signature · 6 lines
2.7.4

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#2 lore raw
Quoted 6 lines · Andrzej Hajda

dim finds remote name by matching repository urls, but different users requires different protocols/paths for remotes (ssh/git/https). Current code incorrectly translates provided url to alternatives, the patch fixes it.

Gently ping.

Andrzej

Quoted 46 lines
---
 dim | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)
dim +7 -12
index 11aa675..d6d9269 100755
@@ -223,15 +223,15 @@ fi
 #	git branch name - dim assumes that the remote and local name match
 # url:
 #	url to a repo, using ssh:// protocol
-# git_url:
-#	url to a repo, but using anonymous git:// protocol
+# urls:
+#	alternative urls to a repo, derived from url
 #
 # The below functions map between these.
 #
 
 function url_to_remote # url
 {
-	local url remote
+	local url urls remote
 
 	url="$1"
 
@@ -240,19 +240,17 @@ function url_to_remote # url
 		return 1
 	fi
 
-	remote=$(git remote -v | grep -m 1 "$url" | cut -f 1)
+	urls=$(echo $url | sed -r \
+		-e 's!ssh://(git.freedesktop.org)/git/(.*)!\0|git://anon\1/\2|https://anon\1/git/\2.git!' \
+		-e 's!git://(git.kernel.org/.*)!\0|https://\1!')
+	remote=$(git remote -v | grep -m 1 -P "$urls" | cut -f 1)
 
 	if [[ -z "$remote" ]]; then
-		git_url=$(echo $url | sed -e 's/git\./anongit./' -e 's/ssh:/git:/')
-		remote=$(git remote -v | grep -m 1 "$git_url" | cut -f 1)
-
-		if [[ -z "$remote" ]]; then
-			echoerr "No git remote for url $url or $git_url found in $(pwd)"
-			echoerr "Please set it up using:"
-			echoerr "    $ git remote add <name> $url"
-			echoerr "with a name of your choice."

dim function url_to_remote # url · line 256

Quoted 10 lines
dim +5 -2
-			return 1
-		fi
+		echoerr "No git remote for url $url found in $(pwd)"
+		echoerr "Please set it up using:"
+		echoerr "    $ git remote add <name> url"
+		echoerr "with a name of your choice and url one of: ${urls//|/, }"
+		return 1
 	fi
 
 	echo $remote

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#3 lore raw
Quoted 9 lines · Andrzej Hajda
Quoted 6 lines · Andrzej Hajda

dim finds remote name by matching repository urls, but different users requires different protocols/paths for remotes (ssh/git/https). Current code incorrectly translates provided url to alternatives, the patch fixes it.

Gently ping.

Apologies for the delay. I had a hard time understanding all the sed trickery you have there. Then I decided the right solution is to be able to configure multiple URLs in nightly.conf for each repo in drm_tip_repos.

Patch follows adding this support to dim, untested because I need to run now. Unfortunately we can't update nightly.conf before dim users have upgraded to the patched version, because otherwise their setups would break.

BR,
Jani.

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#4 lore raw

PATCH 1/1 dim: allow a space separated list of URLs for each repo in drm_tip_repos

This lets us configure a space separated list of URLs for each repo in drm_tip_repos, with all accepted protocols and sources, and the first one found gets picked. This way we don't have to have a complicated set of rules for converting between ssh, git and https protocol URLs.

---

!!! UNTESTED !!!

---
 dim | 97 +++++++++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 63 insertions(+), 34 deletions(-)
dim +63 -34
index c6c746cdb154..d2f165893161 100755
@@ -255,44 +255,73 @@ fi
 # The below functions map between these.
 #
 
-function url_to_remote # url
+function url_to_remote # url [url ...]
 {
 	local url remote
 
-	url="$1"
-
-	if [[ -z "$url" ]]; then
-		echoerr "$0 without url"
+	if [[ "$#" = "0" ]]; then
+		echoerr "url_to_remote without URLs"
 		return 1
 	fi
 
-	remote=$(git remote -v | grep -m 1 "$url" | cut -f 1)
-
-	if [[ -z "$remote" ]]; then
-		git_url=$(echo $url | sed -e 's/git\./anongit./' -e 's/ssh:/git:/')
-		remote=$(git remote -v | grep -m 1 "$git_url" | cut -f 1)
+	for url; do
+		remote=$(git remote -v | grep -m 1 "$url" | cut -f 1)
+		if [[ -n "$remote" ]]; then
+			echo "$remote"
+			return 0
+		fi
+	done
 
-		if [[ -z "$remote" ]]; then
-			echoerr "No git remote for url $url or $git_url found in $(pwd)"
-			remote=${url%.git}
-			remote=${remote##*/}
-			read -r -i "$remote" -e -p "Enter a name to auto-add this remote, leave blank to abort: " || true
-			if [[ "$REPLY" == "" ]] ; then
-				echoerr "Please set it up yourself using:"
-				echoerr "    $ git remote add <name> $url"
-				echoerr "with a name of your choice."
-				exit 1
-			fi
+	echoerr "No git remote for any of the URLs $* found in $(pwd)"
 
-			git remote add $remote $url
-		fi
+	url=$1
+	remote=${url%.git}
+	remote=${remote##*/}
+	read -r -i "$remote" -e -p "Enter a name to auto-add this remote, leave blank to abort: " || true
+	if [[ "$REPLY" == "" ]] ; then
+		echoerr "Please set it up yourself using:"
+		echoerr "    $ git remote add <name> $url"
+		echoerr "with a name of your choice."
+		exit 1
 	fi
 
+	git remote add $remote $url
+
 	echo $remote
 
 	return 0
 }
 
+function url_to_git_url # url [url ...]
+{
+	local url git_url
+
+	if [[ "$#" = "0" ]]; then
+		echoerr "url_to_git_url without URLs"
+		return 1
+	fi
+
+	# Find the git:// URL, converting from ssh:// URL as fallback
+	for url; do
+		case $url in
+			git://*)
+				git_url=$url
+				break
+				;;
+			ssh://*)
+				git_url=$(echo $url | sed -e 's/git\./anongit./' -e 's/ssh:/git:/')
+				;;
+		esac
+	done
+
+	if [[ -z "$git_url" ]]; then
+		echoerr "No git or ssh URL in any of the URLs $*"
+		return 1
+	fi
+
+	echo $git_url
+}
+
 function branch_to_remote # branch
 {
 	local branch remote
@@ -595,7 +624,7 @@ function commit_rerere_cache
 
 function dim_rebuild_tip
 {
-	local integration_branch specfile time first rerere repo url remote
+	local integration_branch specfile time first rerere repo url_list remote
 
 	integration_branch=drm-tip
 	specfile=$(mktemp)
@@ -627,8 +656,8 @@ function dim_rebuild_tip
 	echo "Done."
 
 	for repo in "${!drm_tip_repos[@]}"; do
-		url=${drm_tip_repos[$repo]}
-		remote=$(url_to_remote $url)
+		url_list=${drm_tip_repos[$repo]}
+		remote=$(url_to_remote $url_list)
 		echo -n "Fetching $repo (local remote $remote)... "
 		git_fetch_helper $remote
 		echo "Done."
@@ -639,8 +668,8 @@ function dim_rebuild_tip
 		local branch override sha1 fixup_file
 
 		read -r repo branch override <<< $conf
-		url=${drm_tip_repos[$repo]}
-		remote=$(url_to_remote $url)
+		url_list=${drm_tip_repos[$repo]}
+		remote=$(url_to_remote $url_list)
 		sha1=$remote/$branch
 
 		echo -n "Merging $repo (local remote $remote) $branch... "
@@ -1641,7 +1670,7 @@ function prep_pull_tag_summary
 # dim_pull_request branch upstream
 function dim_pull_request
 {
-	local branch upstream remote repo req_file url git_url suffix tag
+	local branch upstream remote repo req_file url_list git_url suffix tag
 
 	branch=${1:?$usage}
 	upstream=${2:?$usage}
@@ -1679,8 +1708,8 @@ function dim_pull_request
 		repo=$(branch_to_repo $branch)
 	fi
 
-	url=${drm_tip_repos[$repo]}
-	git_url=$(echo $url | sed -e 's/git\./anongit./' -e 's/ssh:/git:/')
+	url_list=${drm_tip_repos[$repo]}
+	git_url=$(url_to_git_url $url_list)
 
 	git request-pull $upstream $git_url $tag >> $req_file
 	$DRY $DIM_MUA -s "[PULL] $branch" \
@@ -1729,7 +1758,7 @@ function dim_list_branches
 dim_alias_ub=update-branches
 function dim_update_branches
 {
-	local repo remote
+	local repo remote url_list
 
 	cd $DIM_PREFIX/$DIM_DRM_INTEL
 
@@ -1740,8 +1769,8 @@ function dim_update_branches
 	fi
 
 	for repo in "${!drm_tip_repos[@]}"; do
-		url=${drm_tip_repos[$repo]}
-		if ! remote=$(url_to_remote $url 2>/dev/null); then
+		url_list=${drm_tip_repos[$repo]}
+		if ! remote=$(url_to_remote $url_list 2>/dev/null); then
 			continue
 		fi
 		echo -n "Fetching $repo (local remote $remote)... "
Signature · 6 lines
2.11.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#5 lore raw

Re: [dim PATCH] dim: allow a space separated list of URLs for each repo in drm_tip_repos

Quoted 4 lines · Jani Nikula

This lets us configure a space separated list of URLs for each repo in drm_tip_repos, with all accepted protocols and sources, and the first one found gets picked. This way we don't have to have a complicated set of rules for converting between ssh, git and https protocol URLs.

I merged this last week with Daniel's IRC ack. We'll need to give people a little bit of time before updating nightly.conf. Sorry for the inconvenience in the mean time.

We should probably think about adding some real versioning to dim to be able to handle this kind of stuff more systematically.

BR,
Jani.

Quoted 182 lines

---

!!! UNTESTED !!!

---
 dim | 97 +++++++++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 63 insertions(+), 34 deletions(-)
dim +63 -34
index c6c746cdb154..d2f165893161 100755
@@ -255,44 +255,73 @@ fi
 # The below functions map between these.
 #
 
-function url_to_remote # url
+function url_to_remote # url [url ...]
 {
 	local url remote
 
-	url="$1"
-
-	if [[ -z "$url" ]]; then
-		echoerr "$0 without url"
+	if [[ "$#" = "0" ]]; then
+		echoerr "url_to_remote without URLs"
 		return 1
 	fi
 
-	remote=$(git remote -v | grep -m 1 "$url" | cut -f 1)
-
-	if [[ -z "$remote" ]]; then
-		git_url=$(echo $url | sed -e 's/git\./anongit./' -e 's/ssh:/git:/')
-		remote=$(git remote -v | grep -m 1 "$git_url" | cut -f 1)
+	for url; do
+		remote=$(git remote -v | grep -m 1 "$url" | cut -f 1)
+		if [[ -n "$remote" ]]; then
+			echo "$remote"
+			return 0
+		fi
+	done
 
-		if [[ -z "$remote" ]]; then
-			echoerr "No git remote for url $url or $git_url found in $(pwd)"
-			remote=${url%.git}
-			remote=${remote##*/}
-			read -r -i "$remote" -e -p "Enter a name to auto-add this remote, leave blank to abort: " || true
-			if [[ "$REPLY" == "" ]] ; then
-				echoerr "Please set it up yourself using:"
-				echoerr "    $ git remote add <name> $url"
-				echoerr "with a name of your choice."
-				exit 1
-			fi
+	echoerr "No git remote for any of the URLs $* found in $(pwd)"
 
-			git remote add $remote $url
-		fi
+	url=$1
+	remote=${url%.git}
+	remote=${remote##*/}
+	read -r -i "$remote" -e -p "Enter a name to auto-add this remote, leave blank to abort: " || true
+	if [[ "$REPLY" == "" ]] ; then
+		echoerr "Please set it up yourself using:"
+		echoerr "    $ git remote add <name> $url"
+		echoerr "with a name of your choice."
+		exit 1
 	fi
 
+	git remote add $remote $url
+
 	echo $remote
 
 	return 0
 }
 
+function url_to_git_url # url [url ...]
+{
+	local url git_url
+
+	if [[ "$#" = "0" ]]; then
+		echoerr "url_to_git_url without URLs"
+		return 1
+	fi
+
+	# Find the git:// URL, converting from ssh:// URL as fallback
+	for url; do
+		case $url in
+			git://*)
+				git_url=$url
+				break
+				;;
+			ssh://*)
+				git_url=$(echo $url | sed -e 's/git\./anongit./' -e 's/ssh:/git:/')
+				;;
+		esac
+	done
+
+	if [[ -z "$git_url" ]]; then
+		echoerr "No git or ssh URL in any of the URLs $*"
+		return 1
+	fi
+
+	echo $git_url
+}
+
 function branch_to_remote # branch
 {
 	local branch remote
@@ -595,7 +624,7 @@ function commit_rerere_cache
 
 function dim_rebuild_tip
 {
-	local integration_branch specfile time first rerere repo url remote
+	local integration_branch specfile time first rerere repo url_list remote
 
 	integration_branch=drm-tip
 	specfile=$(mktemp)
@@ -627,8 +656,8 @@ function dim_rebuild_tip
 	echo "Done."
 
 	for repo in "${!drm_tip_repos[@]}"; do
-		url=${drm_tip_repos[$repo]}
-		remote=$(url_to_remote $url)
+		url_list=${drm_tip_repos[$repo]}
+		remote=$(url_to_remote $url_list)
 		echo -n "Fetching $repo (local remote $remote)... "
 		git_fetch_helper $remote
 		echo "Done."
@@ -639,8 +668,8 @@ function dim_rebuild_tip
 		local branch override sha1 fixup_file
 
 		read -r repo branch override <<< $conf
-		url=${drm_tip_repos[$repo]}
-		remote=$(url_to_remote $url)
+		url_list=${drm_tip_repos[$repo]}
+		remote=$(url_to_remote $url_list)
 		sha1=$remote/$branch
 
 		echo -n "Merging $repo (local remote $remote) $branch... "
@@ -1641,7 +1670,7 @@ function prep_pull_tag_summary
 # dim_pull_request branch upstream
 function dim_pull_request
 {
-	local branch upstream remote repo req_file url git_url suffix tag
+	local branch upstream remote repo req_file url_list git_url suffix tag
 
 	branch=${1:?$usage}
 	upstream=${2:?$usage}
@@ -1679,8 +1708,8 @@ function dim_pull_request
 		repo=$(branch_to_repo $branch)
 	fi
 
-	url=${drm_tip_repos[$repo]}
-	git_url=$(echo $url | sed -e 's/git\./anongit./' -e 's/ssh:/git:/')
+	url_list=${drm_tip_repos[$repo]}
+	git_url=$(url_to_git_url $url_list)
 
 	git request-pull $upstream $git_url $tag >> $req_file
 	$DRY $DIM_MUA -s "[PULL] $branch" \
@@ -1729,7 +1758,7 @@ function dim_list_branches
 dim_alias_ub=update-branches
 function dim_update_branches
 {
-	local repo remote
+	local repo remote url_list
 
 	cd $DIM_PREFIX/$DIM_DRM_INTEL
 
@@ -1740,8 +1769,8 @@ function dim_update_branches
 	fi
 
 	for repo in "${!drm_tip_repos[@]}"; do
-		url=${drm_tip_repos[$repo]}
-		if ! remote=$(url_to_remote $url 2>/dev/null); then
+		url_list=${drm_tip_repos[$repo]}
+		if ! remote=$(url_to_remote $url_list 2>/dev/null); then
 			continue
 		fi
 		echo -n "Fetching $repo (local remote $remote)... "
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#6 lore raw

Re: [dim PATCH] dim: allow a space separated list of URLs for each repo in drm_tip_repos

Quoted 6 lines · Jani Nikula
Quoted 4 lines · Jani Nikula

This lets us configure a space separated list of URLs for each repo in drm_tip_repos, with all accepted protocols and sources, and the first one found gets picked. This way we don't have to have a complicated set of rules for converting between ssh, git and https protocol URLs.

Quoted 6 lines

I merged this last week with Daniel's IRC ack. We'll need to give people a little bit of time before updating nightly.conf. Sorry for the inconvenience in the mean time.

We should probably think about adding some real versioning to dim to be able to handle this kind of stuff more systematically.

We update dim in dim update-branches, and we complain about old dim. I think a few days of update time is plenty enough, at least it seems to have been for adding the drm-amd remote.
-Daniel

Quoted 191 lines

BR,
Jani.

Quoted 182 lines

---

!!! UNTESTED !!!

---
 dim | 97 +++++++++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 63 insertions(+), 34 deletions(-)
dim +63 -34
index c6c746cdb154..d2f165893161 100755
@@ -255,44 +255,73 @@ fi
 # The below functions map between these.
 #
 
-function url_to_remote # url
+function url_to_remote # url [url ...]
 {
 	local url remote
 
-	url="$1"
-
-	if [[ -z "$url" ]]; then
-		echoerr "$0 without url"
+	if [[ "$#" = "0" ]]; then
+		echoerr "url_to_remote without URLs"
 		return 1
 	fi
 
-	remote=$(git remote -v | grep -m 1 "$url" | cut -f 1)
-
-	if [[ -z "$remote" ]]; then
-		git_url=$(echo $url | sed -e 's/git\./anongit./' -e 's/ssh:/git:/')
-		remote=$(git remote -v | grep -m 1 "$git_url" | cut -f 1)
+	for url; do
+		remote=$(git remote -v | grep -m 1 "$url" | cut -f 1)
+		if [[ -n "$remote" ]]; then
+			echo "$remote"
+			return 0
+		fi
+	done
 
-		if [[ -z "$remote" ]]; then
-			echoerr "No git remote for url $url or $git_url found in $(pwd)"
-			remote=${url%.git}
-			remote=${remote##*/}
-			read -r -i "$remote" -e -p "Enter a name to auto-add this remote, leave blank to abort: " || true
-			if [[ "$REPLY" == "" ]] ; then
-				echoerr "Please set it up yourself using:"
-				echoerr "    $ git remote add <name> $url"
-				echoerr "with a name of your choice."
-				exit 1
-			fi
+	echoerr "No git remote for any of the URLs $* found in $(pwd)"
 
-			git remote add $remote $url
-		fi
+	url=$1
+	remote=${url%.git}
+	remote=${remote##*/}
+	read -r -i "$remote" -e -p "Enter a name to auto-add this remote, leave blank to abort: " || true
+	if [[ "$REPLY" == "" ]] ; then
+		echoerr "Please set it up yourself using:"
+		echoerr "    $ git remote add <name> $url"
+		echoerr "with a name of your choice."
+		exit 1
 	fi
 
+	git remote add $remote $url
+
 	echo $remote
 
 	return 0
 }
 
+function url_to_git_url # url [url ...]
+{
+	local url git_url
+
+	if [[ "$#" = "0" ]]; then
+		echoerr "url_to_git_url without URLs"
+		return 1
+	fi
+
+	# Find the git:// URL, converting from ssh:// URL as fallback
+	for url; do
+		case $url in
+			git://*)
+				git_url=$url
+				break
+				;;
+			ssh://*)
+				git_url=$(echo $url | sed -e 's/git\./anongit./' -e 's/ssh:/git:/')
+				;;
+		esac
+	done
+
+	if [[ -z "$git_url" ]]; then
+		echoerr "No git or ssh URL in any of the URLs $*"
+		return 1
+	fi
+
+	echo $git_url
+}
+
 function branch_to_remote # branch
 {
 	local branch remote
@@ -595,7 +624,7 @@ function commit_rerere_cache
 
 function dim_rebuild_tip
 {
-	local integration_branch specfile time first rerere repo url remote
+	local integration_branch specfile time first rerere repo url_list remote
 
 	integration_branch=drm-tip
 	specfile=$(mktemp)
@@ -627,8 +656,8 @@ function dim_rebuild_tip
 	echo "Done."
 
 	for repo in "${!drm_tip_repos[@]}"; do
-		url=${drm_tip_repos[$repo]}
-		remote=$(url_to_remote $url)
+		url_list=${drm_tip_repos[$repo]}
+		remote=$(url_to_remote $url_list)
 		echo -n "Fetching $repo (local remote $remote)... "
 		git_fetch_helper $remote
 		echo "Done."
@@ -639,8 +668,8 @@ function dim_rebuild_tip
 		local branch override sha1 fixup_file
 
 		read -r repo branch override <<< $conf
-		url=${drm_tip_repos[$repo]}
-		remote=$(url_to_remote $url)
+		url_list=${drm_tip_repos[$repo]}
+		remote=$(url_to_remote $url_list)
 		sha1=$remote/$branch
 
 		echo -n "Merging $repo (local remote $remote) $branch... "
@@ -1641,7 +1670,7 @@ function prep_pull_tag_summary
 # dim_pull_request branch upstream
 function dim_pull_request
 {
-	local branch upstream remote repo req_file url git_url suffix tag
+	local branch upstream remote repo req_file url_list git_url suffix tag
 
 	branch=${1:?$usage}
 	upstream=${2:?$usage}
@@ -1679,8 +1708,8 @@ function dim_pull_request
 		repo=$(branch_to_repo $branch)
 	fi
 
-	url=${drm_tip_repos[$repo]}
-	git_url=$(echo $url | sed -e 's/git\./anongit./' -e 's/ssh:/git:/')
+	url_list=${drm_tip_repos[$repo]}
+	git_url=$(url_to_git_url $url_list)
 
 	git request-pull $upstream $git_url $tag >> $req_file
 	$DRY $DIM_MUA -s "[PULL] $branch" \
@@ -1729,7 +1758,7 @@ function dim_list_branches
 dim_alias_ub=update-branches
 function dim_update_branches
 {
-	local repo remote
+	local repo remote url_list
 
 	cd $DIM_PREFIX/$DIM_DRM_INTEL
 
@@ -1740,8 +1769,8 @@ function dim_update_branches
 	fi
 
 	for repo in "${!drm_tip_repos[@]}"; do
-		url=${drm_tip_repos[$repo]}
-		if ! remote=$(url_to_remote $url 2>/dev/null); then
+		url_list=${drm_tip_repos[$repo]}
+		if ! remote=$(url_to_remote $url_list 2>/dev/null); then
 			continue
 		fi
 		echo -n "Fetching $repo (local remote $remote)... "
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#7 lore raw

Re: [dim PATCH] dim: allow a space separated list of URLs for each repo in drm_tip_repos

In reply to Jani Nikula
Quoted 3 lines · Jani Nikula

I merged this last week with Daniel's IRC ack. We'll need to give people a little bit of time before updating nightly.conf. Sorry for the inconvenience in the mean time.

Andrzej, all the bits and pieces for this have been pushed, so https://
should just work for all repos *except* Dave's drm tree. I don't know why, but [1] doesn't advertize https for it.

BR,
Jani.

[1] https://cgit.freedesktop.org/~airlied/linux/

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#8 lore raw

Re: [dim PATCH] dim: allow a space separated list of URLs for each repo in drm_tip_repos

Hey,

Quoted 8 lines · Jani Nikula
Quoted 3 lines · Jani Nikula

I merged this last week with Daniel's IRC ack. We'll need to give people a little bit of time before updating nightly.conf. Sorry for the inconvenience in the mean time.

Andrzej, all the bits and pieces for this have been pushed, so https://
should just work for all repos *except* Dave's drm tree. I don't know why, but [1] doesn't advertize https for it.

Probably because it's not linked in from his public_html? He'd need to do that, and also make sure that git-update-server-info was run in a hook somewhere too.

Cheers,
Daniel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#9 lore raw

Re: [dim PATCH] dim: allow a space separated list of URLs for each repo in drm_tip_repos

Quoted 8 lines · Daniel Stone

Hey,

Quoted 5 lines · Jani Nikula
Quoted 3 lines · Jani Nikula

I merged this last week with Daniel's IRC ack. We'll need to give people a little bit of time before updating nightly.conf. Sorry for the inconvenience in the mean time.

Quoted 7 lines
Quoted 3 lines

Andrzej, all the bits and pieces for this have been pushed, so https://
should just work for all repos *except* Dave's drm tree. I don't know why, but [1] doesn't advertize https for it.

Probably because it's not linked in from his public_html? He'd need to do that, and also make sure that git-update-server-info was run in a hook somewhere too.

Sorry, how do you do these two steps exactly? I tried looking around in the docs, [1] is the closest I could find but nothing on https.

BR,
Jani.

[1] https://www.freedesktop.org/wiki/Infrastructure/git/RepositoryAdmin/

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#10 lore raw

Re: [dim PATCH] dim: allow a space separated list of URLs for each repo in drm_tip_repos

In reply to Jani Nikula
Quoted 8 lines · Jani Nikula
Quoted 3 lines · Jani Nikula

I merged this last week with Daniel's IRC ack. We'll need to give people a little bit of time before updating nightly.conf. Sorry for the inconvenience in the mean time.

Andrzej, all the bits and pieces for this have been pushed, so https://
should just work for all repos *except* Dave's drm tree. I don't know why, but [1] doesn't advertize https for it.

Quoted 6 lines

BR,
Jani.

[1] https://cgit.freedesktop.org/~airlied/linux/

Sorry for late response, I have tested the code and it works, thanks.

Regards

Andrzej

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel