git: 0c3eaa06b3cb - main - Remove perforce tools and references
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 20 Jul 2023 17:33:55 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=0c3eaa06b3cb6e310491f69620fd20a142c7b116
commit 0c3eaa06b3cb6e310491f69620fd20a142c7b116
Author: Minsoo Choo <minsoochoo0122@proton.me>
AuthorDate: 2023-07-20 17:28:18 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-07-20 17:33:39 +0000
Remove perforce tools and references
Perforce has been retired since 2019 (commit feea78990c2f), so there is
no need anymore to keep perforce tools. Plus, there is no need to
mention perforce admin.
Reviewed by: emaste, Olivier Certner
Differential Revision: https://reviews.freebsd.org/D41106
---
share/misc/organization.dot | 2 --
tools/tools/perforce/awkdiff | 42 ---------------------------------------
tools/tools/perforce/p4diffbranch | 19 ------------------
3 files changed, 63 deletions(-)
diff --git a/share/misc/organization.dot b/share/misc/organization.dot
index d888ff420b1c..6658a7855d89 100644
--- a/share/misc/organization.dot
+++ b/share/misc/organization.dot
@@ -48,7 +48,6 @@ bugmeister [label="Bugmeister Team\nbugmeister@FreeBSD.org\neadler, gavin, gonzo
clusteradm [label="Cluster Administrators\nclusteradm@FreeBSD.org\nallanjude, brd,\ndhw, gavin,\ngjb, peter,\nsbruno, simon,\nzi"]
dnsadm [label="DNS Administrators\ndnsadm@FreeBSD.org\nclusteradm"]
mirroradmin [label="FTP/WWW Mirror Site Coordinators\nmirror-admin@FreeBSD.org\nclusteradm,\nkuriyama"]
-perforceadmin [label="Perforce Repository Administrators\nperforce-admin@FreeBSD.org\nscottl, kensmith, gordon,\nrwatson, peter, dhw"]
postmaster [label="Postmaster Team\npostmaster@FreeBSD.org\ndhw, krion, ler, philip, pi, rea, remko, zi"]
webmaster [label="Webmaster Team\nwebmaster@FreeBSD.org\ngjb, wblock, blackend,\ngabor, hrs, wosch"]
@@ -68,7 +67,6 @@ _admin -> bugmeister
_admin -> clusteradm
_admin -> dnsadm
_admin -> mirroradmin
-_admin -> perforceadmin
_admin -> postmaster
_admin -> webmaster
diff --git a/tools/tools/perforce/awkdiff b/tools/tools/perforce/awkdiff
deleted file mode 100755
index 380d6fa26f93..000000000000
--- a/tools/tools/perforce/awkdiff
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/awk -f
-#
-# $FreeBSD$
-#
-
-BEGIN {
- #parentpath = "//depot/vendor/freebsd/src/sys/"
- #childpath = "//depot/projects/opencrypto/"
-}
-$1 == "====" {
- last_line = $0
- last_filename = $2
- #gsub(parentpath, "", last_filename)
- gsub(/#[0-9]*$/, "", last_filename)
- did_sub = 0
-}
-$1 == "====" && $2 == "<none>" {
- new_file = $4
- gsub(childpath, "", new_file)
- gsub(/#[0-9]*$/, "", new_file)
- cmd = "p4 print \"" $4 "\" | sed '/^\\/\\/depot/d' | diff -u /dev/null /dev/stdin | sed s@/dev/stdin@" new_file "@"
- #print "x" cmd "x"
- system(cmd)
-}
-$1 == "====" && $4 == "<none>" {
- del_file = $2
- gsub(parentpath, "", del_file)
- gsub(/#[0-9]*$/, "", del_file)
- cmd = "p4 print \"" $2 "\" | sed '/^\\/\\/depot/d' | diff -u /dev/stdin /dev/null | sed s@/dev/stdin@" del_file "@"
- #print "x" cmd "x"
- system(cmd)
-}
-$1 != "====" {
- if (!did_sub && (($1 == "***************") || ($1 == "@@"))) {
- print "--- ", last_filename ".orig"
- print "+++ ", last_filename
- print $0
- did_sub = 1
- } else {
- print $0
- }
-}
diff --git a/tools/tools/perforce/p4diffbranch b/tools/tools/perforce/p4diffbranch
deleted file mode 100755
index 9d29f23c5019..000000000000
--- a/tools/tools/perforce/p4diffbranch
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh -
-#
-# $FreeBSD$
-#
-
-if [ x"$#" != x"2" ]; then
- echo "Usage: $0 <branch> <changesetnum>"
- exit 1
-fi
-
-basescript="$(realpath "$0")"
-awkdiff="${basescript%/*}/awkdiff"
-
-branch="$1"
-changenum="$2"
-
-p4 branch -o "$branch" |
- awk ' /^View:/ { doview = 1; next; } /^[^ ]/ {doview = 0; next; } $1 && $2 && doview == 1 { system("p4 diff2 -du " $1 "@" changenum " " $2) }' changenum="$changenum" |
- "$awkdiff"