From owner-svn-ports-svnadmin@freebsd.org Sat Feb 23 01:59:04 2019 Return-Path: Delivered-To: svn-ports-svnadmin@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 70DB91501AE8; Sat, 23 Feb 2019 01:59:04 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1758F6BFD6; Sat, 23 Feb 2019 01:59:04 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 09631E55A; Sat, 23 Feb 2019 01:59:04 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1N1x37G074165; Sat, 23 Feb 2019 01:59:03 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1N1x3vr074164; Sat, 23 Feb 2019 01:59:03 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201902230159.x1N1x3vr074164@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Sat, 23 Feb 2019 01:59:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r493633 - svnadmin/hooks/scripts X-SVN-Group: ports-svnadmin X-SVN-Commit-Author: zi X-SVN-Commit-Paths: svnadmin/hooks/scripts X-SVN-Commit-Revision: 493633 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1758F6BFD6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.975,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-svnadmin@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for svnadmin of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2019 01:59:04 -0000 Author: zi Date: Sat Feb 23 01:59:03 2019 New Revision: 493633 URL: https://svnweb.freebsd.org/changeset/ports/493633 Log: - Make error message useful PR: 226864, 231327 Approved by: portmgr (implicit, noop) Modified: svnadmin/hooks/scripts/verify.py Modified: svnadmin/hooks/scripts/verify.py ============================================================================== --- svnadmin/hooks/scripts/verify.py Sat Feb 23 01:52:45 2019 (r493632) +++ svnadmin/hooks/scripts/verify.py Sat Feb 23 01:59:03 2019 (r493633) @@ -234,7 +234,7 @@ class ChangeReceiver(delta.Editor): # POLICY: file replacement is not allowed for path, change in fs.paths_changed(self.txn_root).iteritems(): if (change.change_kind == fs.path_change_replace): - self.do_fail('Do not replace a file. This can lose history. Path: "%s"\n' % path) + self.do_fail('Do not replace a file, this can lose history. Try: svn cp;svn commit, then add your changes and commit. Path: "%s"\n' % path) # Whew! core.svn_pool_destroy(subpool) From owner-svn-ports-svnadmin@freebsd.org Sat Feb 23 10:08:33 2019 Return-Path: Delivered-To: svn-ports-svnadmin@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9CA4B150F91C; Sat, 23 Feb 2019 10:08:33 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3FB97842A4; Sat, 23 Feb 2019 10:08:33 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1033) id 0EF7717607; Sat, 23 Feb 2019 10:08:33 +0000 (UTC) Date: Sat, 23 Feb 2019 10:08:33 +0000 From: Alexey Dokuchaev To: Ryan Steinmetz Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: Re: svn commit: r493633 - svnadmin/hooks/scripts Message-ID: <20190223100832.GA23828@FreeBSD.org> References: <201902230159.x1N1x3vr074164@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201902230159.x1N1x3vr074164@repo.freebsd.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Rspamd-Queue-Id: 3FB97842A4 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.92 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.92)[-0.919,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-ports-svnadmin@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for svnadmin of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2019 10:08:33 -0000 On Sat, Feb 23, 2019 at 01:59:03AM +0000, Ryan Steinmetz wrote: > New Revision: 493633 > URL: https://svnweb.freebsd.org/changeset/ports/493633 > > Log: > - Make error message useful > > PR: 226864, 231327 > Approved by: portmgr (implicit, noop) > > Modified: > svnadmin/hooks/scripts/verify.py > > + self.do_fail('Do not replace a file, this can lose history. Try: svn cp;svn commit, then add your changes and commit. Path: "%s"\n' % path) There's no need to commit after "svn cp". Also, the whitespace bugs here are preposterous. You should've requested someone to review these changes prior to committing them. ./danfe From owner-svn-ports-svnadmin@freebsd.org Sat Feb 23 12:40:34 2019 Return-Path: Delivered-To: svn-ports-svnadmin@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C5501151488D; Sat, 23 Feb 2019 12:40:34 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3F441891D5; Sat, 23 Feb 2019 12:40:34 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 30E251D64A; Sat, 23 Feb 2019 12:40:34 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1NCeYYr009123; Sat, 23 Feb 2019 12:40:34 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1NCeY9L009122; Sat, 23 Feb 2019 12:40:34 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201902231240.x1NCeY9L009122@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Sat, 23 Feb 2019 12:40:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r493666 - svnadmin/hooks/scripts X-SVN-Group: ports-svnadmin X-SVN-Commit-Author: zi X-SVN-Commit-Paths: svnadmin/hooks/scripts X-SVN-Commit-Revision: 493666 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3F441891D5 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.948,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-svnadmin@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for svnadmin of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2019 12:40:34 -0000 Author: zi Date: Sat Feb 23 12:40:33 2019 New Revision: 493666 URL: https://svnweb.freebsd.org/changeset/ports/493666 Log: - Further clarify error/required action Approved by: portmgr (implicit, noop) Modified: svnadmin/hooks/scripts/verify.py Modified: svnadmin/hooks/scripts/verify.py ============================================================================== --- svnadmin/hooks/scripts/verify.py Sat Feb 23 12:24:22 2019 (r493665) +++ svnadmin/hooks/scripts/verify.py Sat Feb 23 12:40:33 2019 (r493666) @@ -234,7 +234,7 @@ class ChangeReceiver(delta.Editor): # POLICY: file replacement is not allowed for path, change in fs.paths_changed(self.txn_root).iteritems(): if (change.change_kind == fs.path_change_replace): - self.do_fail('Do not replace a file, this can lose history. Try: svn cp;svn commit, then add your changes and commit. Path: "%s"\n' % path) + self.do_fail('Do not replace a file, this can lose history. You must edit the files in place. Path: "%s"\n' % path) # Whew! core.svn_pool_destroy(subpool)