[tor] branch main updated: Change git.tpo URLs to gitlab.tpo
This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new cdb270d55e Change git.tpo URLs to gitlab.tpo cdb270d55e is described below commit cdb270d55ec7416b099bd0310ef2daece840a62b Author: David Goulet <dgoulet@torproject.org> AuthorDate: Thu Jun 15 13:00:11 2023 -0400 Change git.tpo URLs to gitlab.tpo Signed-off-by: David Goulet <dgoulet@torproject.org> --- .gitlab-ci.yml | 2 +- Makefile.am | 4 ++-- doc/HACKING/CircuitPaddingQuickStart.md | 2 +- doc/HACKING/GettingStarted.md | 2 +- doc/HACKING/README.1st.md | 6 +++--- scripts/git/git-push-all.sh | 2 +- scripts/git/git-setup-dirs.sh | 21 ++------------------- src/test/test-network.sh | 3 ++- 8 files changed, 13 insertions(+), 29 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 17ce0af43b..bec3043072 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,7 +105,7 @@ variables: # TODO: This next line should not be debian-only. - if [ "$STEM" = yes ]; then git clone --depth 1 https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi # TODO: This next line should not be debian-only. - - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://git.torproject.org/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi + - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://gitlab.torproject.org/tpo/core/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi - if [ "$TRACING" = yes ]; then apt install liblttng-ust-dev; fi # Minimal check on debian: just make, make check. diff --git a/Makefile.am b/Makefile.am index 21f71e2e05..1682f58b49 100644 --- a/Makefile.am +++ b/Makefile.am @@ -296,7 +296,7 @@ check-local: \ shellcheck # test-network requires a copy of Chutney in $CHUTNEY_PATH. -# Chutney can be cloned from https://git.torproject.org/chutney.git . +# Chutney can be cloned from https://gitlab.torproject.org/tpo/core/chutney.git . .PHONY: need-chutney-path need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \ @@ -309,7 +309,7 @@ need-chutney-path: echo; \ echo "To run these tests," \ "git clone" \ - "https://git.torproject.org/chutney.git ;" \ + "https://gitlab.torproject.org/tpo/core/chutney.git ;" \ "export CHUTNEY_PATH=\`pwd\`/chutney"; \ exit 1; \ fi \ diff --git a/doc/HACKING/CircuitPaddingQuickStart.md b/doc/HACKING/CircuitPaddingQuickStart.md index 25bf05048c..fc690084bb 100644 --- a/doc/HACKING/CircuitPaddingQuickStart.md +++ b/doc/HACKING/CircuitPaddingQuickStart.md @@ -19,7 +19,7 @@ The quick and dirty plan is to: ## Clone and compile tor ```console -$ git clone https://git.torproject.org/tor.git +$ git clone https://gitlab.torproject.org/tpo/core/tor.git $ cd tor $ git checkout tor-0.4.1.5 ``` diff --git a/doc/HACKING/GettingStarted.md b/doc/HACKING/GettingStarted.md index 271e2d7517..21b9b17358 100644 --- a/doc/HACKING/GettingStarted.md +++ b/doc/HACKING/GettingStarted.md @@ -38,7 +38,7 @@ Once you've reached this point, here's what you need to know. version, run: ```console - $ git clone https://git.torproject.org/git/tor + $ git clone https://gitlab.torproject.org/tpo/core/tor.git ``` This will give you a checkout of the main branch. If you're diff --git a/doc/HACKING/README.1st.md b/doc/HACKING/README.1st.md index 1c0decf9ce..e49c41f6f7 100644 --- a/doc/HACKING/README.1st.md +++ b/doc/HACKING/README.1st.md @@ -24,15 +24,15 @@ that you don't miss any steps! ## Additional Information For full information on how Tor is supposed to work, look at the files in -[Tor specification](https://gitweb.torproject.org/torspec.git/tree). +[Tor specification](https://gitlab.torproject.org/tpo/core/torspec). For an explanation of how to change Tor's design to work differently, look at -[the Tor proposal process](https://gitweb.torproject.org/torspec.git/plain/proposals/001-process.txt). +[the Tor proposal process](https://gitlab.torproject.org/tpo/core/torspec/-/blob/main/proposals/001-pro...). For the latest version of the code, get a copy of git, and ```console -$ git clone https://git.torproject.org/git/tor +$ git clone https://gitlab.torproject.org/tpo/core/tor.git ``` For a copy of Tor's original design paper, see diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index e5c16e615f..0eac616000 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -80,7 +80,7 @@ if [ "$TOR_FULL_GIT_PATH" ]; then fi # git push command and default arguments GIT_PUSH=${TOR_GIT_PUSH:-"git push --atomic"} -# The upstream remote which git.torproject.org/tor.git points to. +# The upstream remote which gitlab.torproject.org/tpo/core/tor.git points to. DEFAULT_UPSTREAM_REMOTE=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"} # Push to a different upstream remote using -r <remote-name> UPSTREAM_REMOTE=${DEFAULT_UPSTREAM_REMOTE} diff --git a/scripts/git/git-setup-dirs.sh b/scripts/git/git-setup-dirs.sh index c502f74f58..f8a85c4928 100755 --- a/scripts/git/git-setup-dirs.sh +++ b/scripts/git/git-setup-dirs.sh @@ -40,10 +40,6 @@ function usage() echo " (current: $GITHUB_PULL)" echo " TOR_GITHUB_PUSH: the tor-github remote push URL" echo " (current: $GITHUB_PUSH)" - echo " TOR_GITLAB_PULL: the tor-gitlab remote pull URL" - echo " (current: $GITLAB_PULL)" - echo " TOR_GITLAB_PUSH: the tor-gitlab remote push URL" - echo " (current: $GITLAB_PUSH)" echo " TOR_EXTRA_CLONE_ARGS: extra arguments to git clone" echo " (current: $TOR_EXTRA_CLONE_ARGS)" echo " TOR_EXTRA_REMOTE_NAME: the name of an extra remote" @@ -72,9 +68,9 @@ TOR_MASTER_NAME=${TOR_MASTER_NAME:-"tor"} TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"} # Origin repositories -GIT_ORIGIN_PULL=${TOR_GIT_ORIGIN_PULL:-"https://git.torproject.org/tor.git"} +GIT_ORIGIN_PULL=${TOR_GIT_ORIGIN_PULL:-"https://gitlab.torproject.org/tpo/core/tor.git"} GIT_ORIGIN_PUSH=${TOR_GIT_ORIGIN_PUSH:-"git@git-rw.torproject.org:tor.git"} -# The upstream remote which git.torproject.org/tor.git points to. +# The upstream remote which gitlab.torproject.org/tpo/core/tor.git points to. DEFAULT_UPSTREAM_REMOTE=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"} # Copy the URLs from origin GIT_UPSTREAM_PULL="$GIT_ORIGIN_PULL" @@ -87,10 +83,6 @@ fi GITHUB_PULL=${TOR_GITHUB_PULL:-"https://github.com/torproject/tor.git"} GITHUB_PUSH=${TOR_GITHUB_PUSH:-"No_Pushing_To_GitHub"} -# GitLab repositories -GITLAB_PULL=${TOR_GITLAB_PULL:-"https://gitlab.torproject.org/tpo/core/tor.git"} -GITLAB_PUSH=${TOR_GITLAB_PUSH:-"No_Pushing_To_GitLab"} - ########################## # Git branches to manage # ########################## @@ -493,15 +485,6 @@ set_tor_github_pr_fetch_config # Now fetch them all fetch_remote "tor-github" -# GitLab remote -printf "%s Setting up remote %s\\n" "$MARKER" "${BYEL}tor-gitlab${CNRM}" -add_remote "tor-gitlab" "$GITLAB_PULL" -set_remote_push "tor-gitlab" "$GITLAB_PUSH" -# Add custom fetch for MRs -set_tor_gitlab_mr_fetch_config -# Now fetch them all -fetch_remote "tor-gitlab" - # Extra remote if [ "$TOR_EXTRA_REMOTE_NAME" ]; then printf "%s Setting up remote %s\\n" "$MARKER" \ diff --git a/src/test/test-network.sh b/src/test/test-network.sh index 5ef995f1a4..72ed73c6ff 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -65,7 +65,8 @@ if [ ! -d "$CHUTNEY_PATH" ] || [ ! -x "$CHUTNEY_PATH/chutney" ]; then CHUTNEY_PATH="$TOR_DIR/../chutney" else $ECHO "$myname: missing 'chutney' in \$CHUTNEY_PATH ($CHUTNEY_PATH)" - $ECHO "$myname: Get chutney: git clone https://git.torproject.org/\ + $ECHO "$myname: Get chutney: git clone + https://gitlab.torproject.org/tpo/core\ chutney.git" $ECHO "$myname: Set \$CHUTNEY_PATH to a non-standard location: export \ CHUTNEY_PATH=\`pwd\`/chutney" -- To stop receiving notification emails like this one, please contact the administrator of this repository.
participants (1)
-
gitolite role