@@ -160,8 +160,14 @@ class Group: self.comment = cc.getRealComment(self.comment) self.subject = self.comment.split('\n')[0] def commit(self): + def getUserName(user): + return str(user).split(' <')[0] def getUserEmail(user): - return '<%s@%s>' % (user.lower().replace(' ','.').replace("'", ''), mailSuffix) + email = search('<.*@.*>', str(user)) + if email == None: + return '<%s@%s>' % (user.lower().replace(' ','.').replace("'", ''), mailSuffix) + else: + return email.group(0) files = [] for file in self.files: files.append(file.file) @@ -171,9 +177,8 @@ class Group: git_exec(['add', cache.file]) env = {} user = users.get(self.user, self.user) - user = str(user) env['GIT_AUTHOR_DATE'] = env['GIT_COMMITTER_DATE'] = str(self.date) - env['GIT_AUTHOR_NAME'] = env['GIT_COMMITTER_NAME'] = user + env['GIT_AUTHOR_NAME'] = env['GIT_COMMITTER_NAME'] = getUserName(user) env['GIT_AUTHOR_EMAIL'] = env['GIT_COMMITTER_EMAIL'] = getUserEmail(user) comment = self.comment if self.comment.strip() != "" else "<empty message>" try: rebase.py @@ -1,5 +1,6 @@ users = { 'charleso': "Charles O'Farrell",\ + 'jki': 'Jan Kiszka <jan.kiszka@web.de>',\ } mailSuffix = 'example.com' users.py.example 46c028a708eccb8ab5d349127b16f94d6cad75ce Jan Kiszka jan.kiszka@web.de http://github.com/charleso/git-cc/commit/a0491ac04e76561c2cac07e351d8bbe7826c77ed a0491ac04e76561c2cac07e351d8bbe7826c77ed 2009-05-12T17:15:13-07:00 2009-05-12T12:43:31-07:00 Support for individual user email addresses This patch allows to explicitly specify the user email address in users.py along with the full name. This overrides the emailSuffix that is otherwise used. Signed-off-by: Jan Kiszka <jan.kiszka@web.de> 09e8f7a16cec77cd3b5227db90f08cff318b4d71 Charles O'Farrell charleso@charleso.org