[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51022] tags/blender-2.64-release/blender: Merging r51017 through r51021 from trunk into blender-2.64-release
Sergey Sharybin
sergey.vfx at gmail.com
Wed Oct 3 15:44:38 CEST 2012
Revision: 51022
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51022
Author: nazgul
Date: 2012-10-03 13:44:38 +0000 (Wed, 03 Oct 2012)
Log Message:
-----------
Merging r51017 through r51021 from trunk into blender-2.64-release
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51017
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51021
Modified Paths:
--------------
tags/blender-2.64-release/blender/intern/tools/credits_svn_gen.py
tags/blender-2.64-release/blender/release/datafiles/splash.png
tags/blender-2.64-release/blender/source/blender/blenloader/intern/readfile.c
tags/blender-2.64-release/blender/source/tools/tag_release.py
Property Changed:
----------------
tags/blender-2.64-release/blender/
tags/blender-2.64-release/blender/source/blender/editors/interface/interface.c
tags/blender-2.64-release/blender/source/blender/editors/space_outliner/
Property changes on: tags/blender-2.64-release/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:51017-51021
Modified: tags/blender-2.64-release/blender/intern/tools/credits_svn_gen.py
===================================================================
--- tags/blender-2.64-release/blender/intern/tools/credits_svn_gen.py 2012-10-03 13:39:59 UTC (rev 51021)
+++ tags/blender-2.64-release/blender/intern/tools/credits_svn_gen.py 2012-10-03 13:44:38 UTC (rev 51022)
@@ -45,6 +45,13 @@
Running this script will create a file called 'credits.html',
the resulting data is then be copied into the Development/Credits page
in blender.org's typo3.
+
+
+Example execution commands:
+
+ svn log https://svn.blender.org/svnroot/bf-blender/trunk/blender -v --xml > ~/svn_log.xml
+ svn log https://svn.blender.org/svnroot/bf-extensions/trunk/py/scripts/addons -v --xml > ~/svn_log_ext.xml
+ python3.2 intern/tools/credits_svn_gen.py --svn_log=~/svn_log.xml --svn_log_ext=~/svn_log_ext.xml --tracker_csv=~/tracker_report-2012-10-03.csv
"""
# -----------------------------------------------------------------------------
@@ -89,7 +96,7 @@
return repr(repr_dict)
-def parse_commits(filepath):
+def parse_commits(filepath, min_rev=0):
from xml.dom.minidom import parse
svn_xml = parse(filepath)
@@ -102,7 +109,9 @@
for commit_xml in log_entries:
# get all data from the commit into a dict for more easy checking.
- commits.append(SvnCommit(commit_xml))
+ commit = SvnCommit(commit_xml)
+ if commit.revision > min_rev:
+ commits.append(commit)
return commits
@@ -143,6 +152,7 @@
"aligorith": "Joshua Leung",
"antont": "Toni Alatalo",
"aphex": "Simon Clitherow",
+ "apinzonf": "Alexander Pinzon",
"artificer": "Ben Batt",
"ascotan": "Joseph Gilbert",
"bdiego": "Diego Borghetti",
@@ -161,6 +171,7 @@
"dfelinto": "Dalai Felinto",
"dingto": "Thomas Dinges",
"djcapelis": "D.J. Capelis",
+ "dna": "Dan Eicher",
"domino": "Domino Marama",
"dougal2": "Doug Hammond",
"eeshlo": "Alfredo de Greef",
@@ -168,6 +179,7 @@
"ender79": "Andrew Wiggin", # an alias, not real name.
"erwin": "Erwin Coumans",
"frank": "Frank van Beek",
+ "gaiaclary": "Gaia Clary",
"genscher": "Daniel Genrich",
"goofster": "Roel Spruit",
"gsrb3d": "gsr b3d",
@@ -178,11 +190,13 @@
"hans": "Hans Lambermont",
"harkyman": "Roland Hess",
"hos": "Chris Want",
+ "howardt": "Howard Trickey",
"ianwill": "Willian Padovani Germano",
"imbusy": "Lukas Steiblys",
"intrr": "Alexander Ewering",
"jaguarandi": "Andre Susano Pinto",
"jandro": "Alejandro Conty Estevez",
+ "jason_hays22": "Jason Hays",
"jbakker": "Jeroen Bakker",
"jbinto": "Jacques Beuarain",
"jensverwiebe": "Jens Verwiebe",
@@ -192,13 +206,16 @@
"joeedh": "Joseph Eagar",
"jwilkins": "Jason Wilkins",
"kakbarnf": "Robin Allen",
+ "kanttori": "Juha Mäki-Kanto",
"kazanbas": "Arystanbek Dyussenov",
"kester": "Kester Maddock",
"khughes": "Ken Hughes",
+ "kupoman": "Daniel Stokes",
"kwk": "Konrad Kleine",
"larstiq": "Wouter van Heyst",
"letterrip": "Tom Musgrove",
"lmg": "M.G. Kishalmi",
+ "lockal": "Sv. Lockal",
"loczar": "Francis Laurence", # not 100% sure on this.
"lonetech": "Yann Vernier",
"lukastoenne": "Lukas Toenne",
@@ -206,20 +223,24 @@
"lusque": "Ervin Weber",
"maarten": "Maarten Gribnau",
"mal_cando": "Mal Duffin",
+ "mdewanchand": "Monique Dewanchand",
"mein": "Kent Mein",
"merwin": "Mike Erwin",
"mfoxdogg": "Michael Fox",
"mfreixas": "Marc Freixas",
"michel": "Michel Selten",
"migius": "Remigiusz Fiedler",
+ "miikah": "Miika Hamalainen",
"mikasaari": "Mika Saari",
"mindrones": "Luca Bonavita",
"mmikkelsen": "Morten Mikkelsen",
"moguri": "Mitchell Stokes",
+ "mokazon": "Matthew Smith",
"mont29": "Bastien Montagne",
"n_t": "Nils Thuerey",
"nazgul": "Sergey Sharybin",
"nexyon": "Joerg Mueller",
+ "nicholas_rishel": "Nicholas Rishel",
"nicholasbishop": "Nicholas Bishop",
"phaethon": "Frederick Lee",
"phase": "Rob Haarsma",
@@ -230,35 +251,75 @@
"sateh": "Stefan Arentz",
"schlaile": "Peter Schlaile",
"scourage": "Robert Holcomb",
+ "sergof": "Sergej Reich",
"sgefant": "Stefan Gartner",
"sirdude": "Kent Mein",
"smerch": "Alex Sytnik",
"snailrose": "Charlie Carley",
"stiv": "Stephen Swaney",
- "trumanblending": "Andrew Hale",
"theeth": "Martin Poirier",
"themyers": "Ricki Myers",
"ton": "Ton Roosendaal",
+ "trumanblending": "Andrew Hale",
"vekoon": "Elia Sarti",
"xat": "Xavier Thomas",
+ "xercesblue": "Francisco De La Cruz",
+ "xglasyliax": "Peter Larabell",
"xiaoxiangquan": "Xiao Xiangquan",
+ "z0r": "Alex Fraser",
"zaghaghi": "Hamed Zaghaghi",
"zanqdo": "Daniel Salazar",
- "z0r": "Alex Fraser",
"zuster": "Daniel Dunbar",
- "jason_hays22": "Jason Hays",
- "miikah": "Miika Hamalainen",
- "howardt": "Howard Trickey",
- "kanttori": "Juha Mäki-Kanto",
- "xglasyliax": "Peter Larabell",
- "lockal": "Sv. Lockal",
- "kupoman": "Daniel Stokes",
- "xercesblue": "Francisco De La Cruz",
+
# TODO, find remaining names
"nlin": "",
# added for 'author_overrides'
"farny": "Mike Farnsworth",
+
+ # --------------------
+ # Extension Developers
+ "aurel": "Aurel W", # TODO, full name?
+ "axon_d": "Dany Lebel",
+ "bartekskorupa": "Bartek Skorupa",
+ "bassamk": "Bassam Kurdali",
+ "benjycook": "Benjy Cook",
+ "blendphys": "Clemens Barth",
+ "codemanx": "Sebastian Nell",
+ "conz": "Constantin Rahn",
+ "cotejrp1": "Philip Cote",
+ "crouch": "Bart Crouch",
+ "darknet": "John Phan",
+ "dmbasso": "Daniel M. Basso",
+ "dreampainter": "Gerwin Damsteegt",
+ "eclectiel": "Eclectiel L", # TODO, full name?
+ "frigi": "Fabian Fricke",
+ "gabhead": "Gabriel Beaudin",
+ "gekko": "Jesse Kaukonen",
+ "guillaum": "Bouchard Guillaume",
+ "haikalle": "Kalle-Samuli Riihikoski",
+ "imoverclocked": "Tim Spriggs",
+ "jacepriester": "Jace Priester",
+ "jaydez": "Jonathan Smith",
+ "jcbdigger": "John Brown",
+ "ken9": "Ken Nign",
+ "kiravakaan": "Chris Foster",
+ "kroopson": "Michael Krupa",
+ "lichtwerk": "Philipp Oeser",
+ "loolarge": "Ivo Grigull",
+ "mauriceraybaud": "Maurice Raybaud",
+ "meta-androcto": "Brendon Murphy",
+ "michaelw": "Michael Williamson",
+ "muraj": "Cory Perry",
+ "paulo_gomes": "Paulo Gomes",
+ "pontiac": "Martin Buerbaum",
+ "seminumerical": "Morgan Mörtsell",
+ "spudmn": "Aaron Keith",
+ "testscreenings": "Florian Meyer",
+ "tetron": "Peter Amstutz",
+ "thomasl": "Thomas Larsson",
+ "venomgfx": "Pablo Vazquez",
+ "wiseman303": "Adam Wiseman",
}
@@ -277,6 +338,9 @@
for key, value in author_name_mapping.items():
author_name_mapping_reverse[value] = key
+# store users we complained about missing already
+alert_users = set()
+
# ----------------------------------------------------------------------------
# Since we cant detect some authors to credits, store spesific revisions
author_overrides = {
@@ -387,7 +451,7 @@
return False
def is_path_valid(path):
- if not path.startswith("/trunk/blender/"):
+ if not (path.startswith("/trunk/blender/") or path.startswith("/trunk/py/scripts/addons")):
return False
for p in ignore_dir:
if path.startswith(p):
@@ -406,7 +470,7 @@
return True
-def main():
+def main_credits(min_rev=0, min_rev_ext=0):
# ------------------------------------------------------------------------
# Parse Args
@@ -421,8 +485,12 @@
parser = argparse.ArgumentParser(description=usage_text)
parser.add_argument("-s", "--svn_log", dest="svn_log",
metavar='FILE', required=True,
- help="File path pointing to svn log, generated by "
- "'svn log . -v --xml'")
+ help="File path pointing to svn log, "
+ "generated by 'svn log . -v --xml'")
+ parser.add_argument("-se", "--svn_log_ext", dest="svn_log_ext",
+ metavar='FILE', required=True,
+ help="File path pointing to svn log (for extensions), "
+ "generated by 'svn log . -v --xml'")
parser.add_argument("-c", "--tracker_csv", dest="tracker_csv",
metavar='FILE', required=True,
help="File path pointing to CSV file saved by the patch tracker")
@@ -431,13 +499,15 @@
tracker_csv = args.tracker_csv
svn_log = args.svn_log
+ svn_log_ext = args.svn_log_ext
# ------------------------------------------------------------------------
# Main Logic
patch_map = build_patch_name_map(tracker_csv)
- commits = parse_commits(svn_log)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list