Commit Graph

95 Commits

Author SHA1 Message Date
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
teor 995618ec61 scripts/git: Make a master symlink in the worktree directory
When running git-setup-dirs.sh.

Part of 32347.
2019-10-31 14:59:12 +10:00
teor e046903f93 scripts/git: Restore a dropped check for pre-commit in pre-push
Bugfix on 31919; not in any released version of Tor.
2019-10-31 14:51:31 +10:00
teor 7e73c0d5a1 scripts/git: Print the correct path in git-setup-dirs.sh 2019-10-31 14:39:49 +10:00
teor cb7340abf1 scripts/git: Don't use spaces in git URLs 2019-10-31 13:56:59 +10:00
teor 3479024cb1 scripts: Change to the top source directory as needed
Bugfix on 31919; not in any released version of tor.
2019-10-28 13:28:50 +10:00
teor 68befa3b84 scripts/git: Fix a shellcheck error in pre-commit.git-hook
Some versions of shellcheck do not detect this error.

Bugfix on 31919; not in any released version of tor.
2019-10-28 13:04:29 +10:00
teor 1094389d82 scripts/git: Make spaces consistent in pre-push.git-hook
Part of 31919.
2019-10-24 14:10:30 +10:00
teor b4b316631d scripts/git: Only check modified files in existing git hook checks
Part of 31919.
2019-10-24 14:10:26 +10:00
teor b9a2286765 scripts/git: Add check_cocci_parse.sh to the pre-commit hook
But only check modified files, which dramatically speeds up
check_cocci_parse.sh.

Part of 31919.
2019-10-24 14:09:53 +10:00
teor f43a7a4d96 scripts/git: Avoid sleeping before the last push in git-push-all.sh
Change the loop order, so that we only sleep between pushes,
and avoid sleeping after all the pushes are done.

(In rare cases, there may still be an extra sleep.)

Part of 32216.
2019-10-23 13:28:37 +10:00
teor 4f6f006c99 scripts/git: Make git-push-all.sh skip more branches that match upstream
The script now skips master, maint-* and release-* branches that match
upstream, not just test branches.

And fix "no branches" bugs that this change makes happen more often.

Part of 32216.
2019-10-23 13:28:15 +10:00
teor 9a3b768fae scripts/git: Pass all unrecognised arguments to git-push-all.sh
This makes the behaviour of git-push-all.sh -n identical to the other
git scripts.

Part of 32216.
2019-10-23 13:04:28 +10:00
teor 71191fa3dc scripts/git: Fix a variable name typo in git-push-all.sh
Obviously correct changes to already reviewed code.
2019-10-23 13:01:55 +10:00
teor 85d0a458c2 scripts: Add git-setup-dirs.sh, which sets up maintainer git repos
git-setup-dirs.sh sets up an upstream git repository and worktrees,
so that tor maintainers can do merges.

Closes ticket 29603.
2019-10-17 14:47:48 +10:00
teor 11b5946e49 scripts: Fix a git script comment 2019-10-15 13:58:53 +10:00
teor 028987a0a1 scripts: Merge forward test branch _042 into test branch _master
Fixes an issue where test branch _041 was merged into _042 and _master.
This issue only affects test branch mode (-t).
2019-10-15 13:36:56 +10:00
Nick Mathewson 78f4e29219 git scripts: add maint/release-0.4.2. 2019-10-11 17:26:34 -04:00