Commit Graph

112 Commits

Author SHA1 Message Date
David Goulet 82a5297d99 scripts: Add 048 maint branch to our helper scripts
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-08-23 11:06:16 -04:00
David Goulet 846bad3a96 scripts: Update git scripts with new gitlab canonical repository
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-06-19 14:33:12 -04:00
David Goulet cdb270d55e Change git.tpo URLs to gitlab.tpo
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-06-15 13:00:11 -04:00
David Goulet 119b84c365 scripts: Bye bye 0.4.5, you have reached end of life
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-02-16 15:25:16 -05:00
David Goulet 275d790ac1 scripts: Remove 0.4.6.x as it is EOL
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-08-11 11:27:18 -04:00
David Goulet 8c39c664c2 ci: Add 0.4.7 series to scripts and CI
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-04-27 11:06:03 -04:00
David Goulet 2176354e22 Remove unmaintained versions from CI and scripts
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-02-04 13:00:56 -05:00
David Goulet 5e1f64602b scripts: Add -M option to git-list-tor-branches.sh
Omit all "maint" branch. It is the opposite of -R that omits release
branches.

In other words, -M can be used to list all release branches.

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-26 15:52:53 -04:00
David Goulet 3f73ab3f0d git: Don't pull github anymore in git-pull-all.sh
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-06-16 10:53:32 -04:00
Nick Mathewson 27c3254988 Remove 0.4.4 from list-tor-branches. 2021-06-14 11:50:00 -04:00
Nick Mathewson 2ddd45bdb8 Merge branch 'maint-0.4.6' 2021-05-28 08:03:43 -04:00
Nick Mathewson e1f0b9fb1e Merge branch 'maint-0.4.5' into maint-0.4.6 2021-05-28 08:03:43 -04:00
Nick Mathewson 8b6e919086 Stop using the "x$FOO" idiom in git-resquash.sh
The new version of shellcheck says that that this idiom is
unnecessary, and its presence here is making the shellcheck tests
fail.

No changes file needed, since this is not user-facing code.
2021-05-28 08:02:08 -04:00
Alexander Færøy 22552ad88e Update scripts to use main instead of master.
When talking about the "master" Tor checkout, we now refer to it as "the
primary Tor repository". The "master" branch is instead called "main".

See: tpo/core/team#2.
2021-05-25 00:20:58 +00:00
Nick Mathewson d6ebd8160d Add 0.4.6 to git-list-tor-branches.sh 2021-04-15 12:40:45 -04:00
Nick Mathewson 6b7a145409 git-list-tor-branches: remove 0.4.3 2021-03-01 08:28:53 -05:00
Nick Mathewson 1b21d716ec Add {release,maint}-0.4.5 to git-list-tor-branches.sh 2020-11-17 08:04:55 -05:00
Samanta Navarro 4a0cd79588 Fix typos.
Typos found with codespell.

Please keep in mind that this should have impact on actual code
and must be carefully evaluated:

src/core/or/lttng_circuit.inc
-    ctf_enum_value("CONTROLER", CIRCUIT_PURPOSE_CONTROLLER)
+    ctf_enum_value("CONTROLLER", CIRCUIT_PURPOSE_CONTROLLER)
2020-11-12 11:44:09 -05:00
Nick Mathewson ca389d22a1 Remove 0.4.2 from list of branches in git script: it has reached EOL. 2020-09-15 09:00:44 -04:00
Nick Mathewson 0401993197 Add git-resquash.sh to repository
This differs from my old git-resquash.sh in that it uses the newer
`git rebase --keep-base` if available
2020-07-17 12:24:01 -04:00
Nick Mathewson 18391f689e git-install-tools: use -b, not --backup.
The osx version of this tool doesn't have --backup
2020-07-09 17:12:37 -04:00
Nick Mathewson 97a9966b04 Update git scripts to include tor-gitlab repository
Analogously to tor-github, we now make a tor-gitlab repository.  It
is set up to disable push direct attempts, and to fetch merge
requests into appropriate branches.

git-pull-all.sh knows how to fetch this repository.
2020-07-09 14:27:10 -04:00
David Goulet 887dc6abb0 scripts: Don't run practracker in git hooks
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-02 14:39:44 -04:00
David Goulet 8ae0ecbd6a scripts: Add env variable to disable pre-commit hook
We introduce TOR_EXTRA_PRE_COMMIT_CHECKS environment variable to run the
pre-commit hook. The pre-push git hook will set it in order to run all
pre-commit checks.

Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-02 14:39:44 -04:00
Nick Mathewson eaae5625cb Add 0.4.4 to list of tor branches used by git scripts. 2020-06-09 14:17:15 -04:00
Nick Mathewson 811853c677 Remove 0.4.1 from list of tor branches used by git scripts. 2020-06-03 14:54:21 -04:00
teor 1d17541cfa Merge branch 'pr1764_squashed' 2020-03-13 11:14:20 +10:00
Nick Mathewson 78c9ff7052 Add a script to install the scripts in scripts/git appropriately.
To run this, say something like

   TOR_DEVTOOL_DIR=~/bin scripts/git/git-install-tools.sh all

To see what it would do, give it the -n flag.

To get help, give it the -h flag.
2020-03-13 11:14:04 +10:00
Nick Mathewson 8096f3b254 Revert "scripts: Remove typo in git-list-tor-branches.sh"
This reverts commit a63b414822.

The "typo" wasn't actually a typo.  The "r" in the suffixes for the
release branches is meant to make them distinct from the maint
branches.

Now, _right now_, nothing uses release branch suffixes, but it's
important to keep them distinct if we decide to use them in the
future.
2020-03-09 09:03:51 -04:00
David Goulet a63b414822 scripts: Remove typo in git-list-tor-branches.sh
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-03-05 10:29:47 -05:00
David Goulet a62e3e45e6 Merge branch 'tor-github/pr/1720' 2020-03-05 10:29:42 -05:00
Nick Mathewson d9152b8a66 Update git scripts to use git-list-tor-branches.sh 2020-03-05 10:29:35 -05:00
Nick Mathewson 42660ea056 Add a script to list the maintained Tor branches in different ways
This will be used for 32121
2020-03-05 10:29:35 -05:00
teor 99d957696b scripts/git: Stop running the checked-out git scripts
Stop executing the checked-out pre-commit hook from the pre-push hook.
Instead, execute the copy in the user's git dir.

Fixes bug 33284; bugfix on 0.4.1.1-alpha.
2020-02-12 20:37:21 +10:00
Nick Mathewson 7404b6fb71 Update scripts/git/*.sh to know about 043 and not about 040. 2020-02-11 10:52:42 -05:00
Nick Mathewson cda10a2e89 Git hooks: remove support for 0.2.9 directory layout.
We no longer will be pushing or committing things in branches that
use src/common or src/or.

Resolves ticket 32957.
2020-01-23 10:28:09 -05:00
teor c80694decc scripts/git: Improve branch list comments
Hopefully, these explanations make it easier to get the next branch
transition right.

Part of 32772.
2020-01-15 12:28:00 +10:00
teor 536eeb4589 scripts/git: Fix git-merge-forward after removing 0.2.9
We need a test branch for the earliest maint branch (maint-0.3.5),
but we can't merge forward into it, because there is no previous
active maint branch.

Also, edit a git-push-all comment that still said "029".

Bugfix on 32772; bug not in any released version of tor.
2020-01-15 12:22:38 +10:00
rl1987 c0dd214c8a Remove 0.2.9 from git scripts 2019-12-30 12:41:08 +07:00
teor ac3a9aaf0d Makefile/git scripts: Add comments to keep owned file lists in sync 2019-12-20 09:35:18 +10:00
teor 8861ad85d0 git scripts: Add the checkSpace.pl unit tests
Extra testing after 32613.
2019-12-04 12:15:22 -05:00
teor 5ce45ac907 Makefile/git scripts: Add the practracker unit tests
Add a check-practracker-unit-test target, and run it as part of
"make check".

Add the practracker unit tests to scripts/git/pre-commit.git-hook.

Part of 32609.
2019-12-04 12:15:22 -05:00
David Goulet 1371d29e5b Merge branch 'tor-github/pr/1489' 2019-11-14 10:37:14 -05:00
teor 7ee1e16c6f scripts/git: Stop failing when upstream branches don't exist
If you add a custom remote, or a new branch, and don't fetch first,
then the script would fail when checking for unchanged branches.

Instead, skip the check: a new branch is definitely a change.
2019-11-07 12:04:51 +10:00
teor 3864536b7c scripts/git: Remove extra printfs from a bad merge 2019-11-07 12:04:22 +10:00
teor e6b5a1ff93 shellcheck: Fix minor issues in some scripts
Fix minor issues in git-push-all.sh, git-setup-dirs.sh and
test_parseconf.sh.

Fixes bug 32402; not in any released version of tor.
Obviously correct changes to already reviewed code.
2019-11-06 16:21:01 +10:00
teor f7b45975bf Merge branch 'bug32402_042' into bug32402_master
Merge changes from master with shellcheck fixes.
2019-11-06 16:14:06 +10:00
teor 7f23d47f72 shellcheck: Fix issues in the git-*.sh scripts
Fixes bug 32402; bugfix on 0.4.2.1-alpha.
Obviously correct changes to already reviewed code.
2019-11-06 16:09:31 +10:00
teor 1ffb3b549f scripts/git: Add TOR_EXTRA_REMOTE_* for an extra git remote
When running git-setup-dirs.sh.

Part of 32347.
2019-10-31 14:59:19 +10:00
teor 38e8cca6a1 scripts/git: Add TOR_EXTRA_CLONE_ARGS for git clone
When running git-setup-dirs.sh.

Part of 32347.
2019-10-31 14:59:16 +10:00