From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3FF5A1381FB for ; Sun, 11 Nov 2012 17:55:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6445E056C; Sun, 11 Nov 2012 17:55:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5CEECE0552 for ; Sun, 11 Nov 2012 17:55:11 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 660EF33D9A8 for ; Sun, 11 Nov 2012 17:55:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C34A7E543C for ; Sun, 11 Nov 2012 17:55:06 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1352656260.466c2c6b34a6a70b4f367c029b072b65b3bbb08e.sping@gentoo> Subject: [gentoo-commits] proj/userinfo-scripts:master commit in: / X-VCS-Repository: proj/userinfo-scripts X-VCS-Files: git-identity-map.py X-VCS-Directories: / X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 466c2c6b34a6a70b4f367c029b072b65b3bbb08e X-VCS-Branch: master Date: Sun, 11 Nov 2012 17:55:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b7447e9b-89eb-4bfa-b39d-b7edf1e632fe X-Archives-Hash: 7be2be814637dfcf42efd3a2d35398de commit: 466c2c6b34a6a70b4f367c029b072b65b3bbb08e Author: Sebastian Pipping pipping org> AuthorDate: Sun Nov 11 17:49:01 2012 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Sun Nov 11 17:51:00 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/userinfo-scripts.git;a=commit;h=466c2c6b Make aliases more flexible, add to aliases --- git-identity-map.py | 38 +++++++++++++++++++++++++++++++++----- 1 files changed, 33 insertions(+), 5 deletions(-) diff --git a/git-identity-map.py b/git-identity-map.py index 05dad60..c919a24 100755 --- a/git-identity-map.py +++ b/git-identity-map.py @@ -8,11 +8,31 @@ import xml.etree.ElementTree as ET # Python 2.5 import sys -def produce_line(gentoo_nick, realname): - line = '%s = %s <%s@gentoo.org>' % (gentoo_nick, realname, gentoo_nick) +_PAST_GENTOO_ACCOUNT, _CHAT_OR_LOCAL_ONLY = range(2) + + +_past_nicknames_for = { + 'chithanh': ( + ('chithead', _CHAT_OR_LOCAL_ONLY), + ), + 'fauli': ( + ('opfer', _PAST_GENTOO_ACCOUNT), + ), + 'stkn': ( + ('aura', _CHAT_OR_LOCAL_ONLY), + ), +} + + +def _produce_line(svn_nick, realname, address): + line = '%s = %s <%s>' % (svn_nick, realname, address) print(line.encode('utf-8')) +def _gentoo_address(nick): + return '%s@gentoo.org' % nick + + def main(args): if len(args) != 2: print('USAGE: %s GENTOO/xml/htdocs/proj/en/devrel/roll-call/userinfo.xml' % args[0]) @@ -29,10 +49,18 @@ def main(args): location = user.find('location') realname = user.find('realname').attrib['fullname'].strip() - produce_line(svn_nick, realname) + _produce_line(svn_nick, realname, _gentoo_address(svn_nick)) + + past_nicknames = _past_nicknames_for.get(svn_nick, []) + for alias, kind in past_nicknames: + if kind == _PAST_GENTOO_ACCOUNT: + gentoo_nick=alias + elif kind == _CHAT_OR_LOCAL_ONLY: + gentoo_nick=svn_nick + else: + assert False, 'Invalid kind %s' % str(kind) + _produce_line(alias, realname, _gentoo_address(gentoo_nick)) - if svn_nick == 'fauli': - produce_line('opfer', realname) return 0