From owner-svn-src-svnadmin@FreeBSD.ORG Mon Nov 2 20:37:50 2009 Return-Path: Delivered-To: svn-src-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 72AA1106568D; Mon, 2 Nov 2009 20:37:50 +0000 (UTC) (envelope-from simon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 45FB28FC2E; Mon, 2 Nov 2009 20:37:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA2KboSA068932; Mon, 2 Nov 2009 20:37:50 GMT (envelope-from simon@svn.freebsd.org) Received: (from simon@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA2Kboga068930; Mon, 2 Nov 2009 20:37:50 GMT (envelope-from simon@svn.freebsd.org) Message-Id: <200911022037.nA2Kboga068930@svn.freebsd.org> From: "Simon L. Nielsen" Date: Mon, 2 Nov 2009 20:37:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r198821 - svnadmin/hooks/scripts X-BeenThere: svn-src-svnadmin@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the admin / configuration tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Nov 2009 20:37:50 -0000 Author: simon Date: Mon Nov 2 20:37:49 2009 New Revision: 198821 URL: http://svn.freebsd.org/changeset/base/198821 Log: Change the handling of directory property changes in the svn mailer script: - Removes all directories that have only prop-changes from the subject line (unless there are only prop-changes in the commit). - Move directory prop-changes to a separate category at the end of the change listing. This should hopefully reduce the problem mergeinfo in sys/contrib etc. "cluttering up" commit mails, and should also make it easier to spot when there is mergeinfo missing (or misplaced) in a MFC. Submitted by: mlaier (also most of the commit message) Reviewed by: peter (the general idea) Modified: svnadmin/hooks/scripts/mailer.py Directory Properties: Modified: svnadmin/hooks/scripts/mailer.py ============================================================================== --- svnadmin/hooks/scripts/mailer.py Mon Nov 2 20:18:50 2009 (r198820) +++ svnadmin/hooks/scripts/mailer.py Mon Nov 2 20:37:49 2009 (r198821) @@ -370,9 +370,14 @@ class Commit(Messenger): # figure out the changed directories dirs = { } + pdirs = { } for path, change in self.changelist: if change.item_kind == svn.core.svn_node_dir: - dirs[path] = None + # do not include dirs that have only prop changes + if change.prop_changes: + pdirs[path] = None + else: + dirs[path] = None else: idx = string.rfind(path, '/') if idx == -1: @@ -380,7 +385,10 @@ class Commit(Messenger): else: dirs[path[:idx]] = None - dirlist = dirs.keys() + if len(dirs) == 0: + dirlist = pdirs.keys() + else: + dirlist = dirs.keys() commondir, dirlist = get_commondir(dirlist) @@ -1029,6 +1037,7 @@ class TextCommitRenderer: w = self.output.write w(header + ':\n') + ps = '' for d in data_list: if d.is_dir: is_dir = '/' @@ -1037,11 +1046,13 @@ class TextCommitRenderer: if d.props_changed: if d.text_changed: props = ' (contents, props changed)' + w(' %s%s%s\n' % (d.path, is_dir, props)) else: props = ' (props changed)' + ps = ('%s %s%s%s\n' % (ps, d.path, is_dir, props)) else: props = '' - w(' %s%s%s\n' % (d.path, is_dir, props)) + w(' %s%s%s\n' % (d.path, is_dir, props)) if d.copied: if is_dir: text = '' @@ -1051,6 +1062,7 @@ class TextCommitRenderer: text = ' unchanged' w(' - copied%s from r%d, %s%s\n' % (text, d.base_rev, d.base_path, is_dir)) + w('Directory Properties:\n%s' % (ps)) def _render_diffs(self, diffs, section_header): """Render diffs. Write the SECTION_HEADER if there are actually From owner-svn-src-svnadmin@FreeBSD.ORG Mon Nov 2 21:44:59 2009 Return-Path: Delivered-To: svn-src-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 569AD1065676; Mon, 2 Nov 2009 21:44:58 +0000 (UTC) (envelope-from simon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 45AD78FC14; Mon, 2 Nov 2009 21:44:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA2Liw2P070793; Mon, 2 Nov 2009 21:44:58 GMT (envelope-from simon@svn.freebsd.org) Received: (from simon@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA2Liw4K070791; Mon, 2 Nov 2009 21:44:58 GMT (envelope-from simon@svn.freebsd.org) Message-Id: <200911022144.nA2Liw4K070791@svn.freebsd.org> From: "Simon L. Nielsen" Date: Mon, 2 Nov 2009 21:44:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r198826 - svnadmin/hooks/scripts X-BeenThere: svn-src-svnadmin@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the admin / configuration tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Nov 2009 21:44:59 -0000 Author: simon Date: Mon Nov 2 21:44:57 2009 New Revision: 198826 URL: http://svn.freebsd.org/changeset/base/198826 Log: Only print the 'Directory Properties' section if we actually have changed directory properties. Modified: svnadmin/hooks/scripts/mailer.py Modified: svnadmin/hooks/scripts/mailer.py ============================================================================== --- svnadmin/hooks/scripts/mailer.py Mon Nov 2 21:44:10 2009 (r198825) +++ svnadmin/hooks/scripts/mailer.py Mon Nov 2 21:44:57 2009 (r198826) @@ -1062,7 +1062,8 @@ class TextCommitRenderer: text = ' unchanged' w(' - copied%s from r%d, %s%s\n' % (text, d.base_rev, d.base_path, is_dir)) - w('Directory Properties:\n%s' % (ps)) + if len(ps) > 0: + w('Directory Properties:\n%s' % (ps)) def _render_diffs(self, diffs, section_header): """Render diffs. Write the SECTION_HEADER if there are actually From owner-svn-src-svnadmin@FreeBSD.ORG Tue Nov 3 10:27:05 2009 Return-Path: Delivered-To: svn-src-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E74B51065672 for ; Tue, 3 Nov 2009 10:27:05 +0000 (UTC) (envelope-from max@love2party.net) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.171]) by mx1.freebsd.org (Postfix) with ESMTP id 7A9F58FC0A for ; Tue, 3 Nov 2009 10:27:05 +0000 (UTC) Received: from vampire.homelinux.org (dslb-088-067-242-013.pools.arcor-ip.net [88.67.242.13]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0Ll1qT-1MXaDP3UXd-00aNGX; Tue, 03 Nov 2009 11:14:30 +0100 Received: (qmail 94176 invoked from network); 3 Nov 2009 10:14:02 -0000 Received: from kvm.laiers.local (HELO kvm.localnet) (192.168.4.188) by ns1.laiers.local with SMTP; 3 Nov 2009 10:14:02 -0000 From: Max Laier Organization: FreeBSD To: "Simon L. Nielsen" Date: Tue, 3 Nov 2009 11:13:58 +0100 User-Agent: KMail/1.12.2 (Linux/2.6.31-ARCH; KDE/4.3.2; x86_64; ; ) References: <200911022144.nA2Liw4K070791@svn.freebsd.org> In-Reply-To: <200911022144.nA2Liw4K070791@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <200911031113.59437.max@love2party.net> X-Provags-ID: V01U2FsdGVkX19q7a7OBbh+46JIKy6WKwlKDDjVnJmC+cuuJQi C1wN85Hen2j3KgkwKlebzkk2FGtvIASOP/nfNG8A7PSVea2BxJ iXfdLe5PewckkT8UbmIRQ== Cc: svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-svnadmin@freebsd.org Subject: Re: svn commit: r198826 - svnadmin/hooks/scripts X-BeenThere: svn-src-svnadmin@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the admin / configuration tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Nov 2009 10:27:06 -0000 On Monday 02 November 2009 22:44:58 Simon L. Nielsen wrote: > Author: simon > Date: Mon Nov 2 21:44:57 2009 > New Revision: 198826 > URL: http://svn.freebsd.org/changeset/base/198826 > > Log: > Only print the 'Directory Properties' section if we actually have > changed directory properties. Thank you for the commit and sorry for this oversight. This is mine. > Modified: > svnadmin/hooks/scripts/mailer.py > > Modified: svnadmin/hooks/scripts/mailer.py > =========================================================================== > === --- svnadmin/hooks/scripts/mailer.py Mon Nov 2 21:44:10 2009 (r198825) > +++ svnadmin/hooks/scripts/mailer.py Mon Nov 2 21:44:57 2009 (r198826) @@ > -1062,7 +1062,8 @@ class TextCommitRenderer: > text = ' unchanged' > w(' - copied%s from r%d, %s%s\n' > % (text, d.base_rev, d.base_path, is_dir)) > - w('Directory Properties:\n%s' % (ps)) > + if len(ps) > 0: > + w('Directory Properties:\n%s' % (ps)) > > def _render_diffs(self, diffs, section_header): > """Render diffs. Write the SECTION_HEADER if there are actually > > > !DSPAM:4aef52ed799761205380022! > -- /"\ Best regards, | mlaier@freebsd.org \ / Max Laier | ICQ #67774661 X http://pf4freebsd.love2party.net/ | mlaier@EFnet / \ ASCII Ribbon Campaign | Against HTML Mail and News From owner-svn-src-svnadmin@FreeBSD.ORG Wed Nov 4 14:19:24 2009 Return-Path: Delivered-To: svn-src-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6CD9E10656EA; Wed, 4 Nov 2009 14:19:24 +0000 (UTC) (envelope-from jkoshy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 42A588FC24; Wed, 4 Nov 2009 14:19:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA4EJOba034162; Wed, 4 Nov 2009 14:19:24 GMT (envelope-from jkoshy@svn.freebsd.org) Received: (from jkoshy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA4EJO2P034160; Wed, 4 Nov 2009 14:19:24 GMT (envelope-from jkoshy@svn.freebsd.org) Message-Id: <200911041419.nA4EJO2P034160@svn.freebsd.org> From: Joseph Koshy Date: Wed, 4 Nov 2009 14:19:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r198891 - svnadmin/conf X-BeenThere: svn-src-svnadmin@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the admin / configuration tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Nov 2009 14:19:24 -0000 Author: jkoshy Date: Wed Nov 4 14:19:23 2009 New Revision: 198891 URL: http://svn.freebsd.org/changeset/base/198891 Log: Fabien Thomas (fabient@) is free to fly solo henceforth. Modified: svnadmin/conf/mentors Modified: svnadmin/conf/mentors ============================================================================== --- svnadmin/conf/mentors Wed Nov 4 13:41:43 2009 (r198890) +++ svnadmin/conf/mentors Wed Nov 4 14:19:23 2009 (r198891) @@ -13,7 +13,6 @@ cbzimmer sam dchagin kib eri mlaier Co-mentor: thompsa -fabient jkoshy ivoras gnn jh trasz Co-mentor: rwatson jinmei gnn