Software Freedom Conservancy

Software Freedom Law Center

Changeset 102

Show
Ignore:
Timestamp:
05/01/08 21:43:04 (2 months ago)
Author:
bkuhn
Message:

r105@hughes: bkuhn | 2008-05-01 21:35:38 -0400

  • Merged up to r6969 from trac upstream
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/trac.upstream-r6969/cgi-bin/trac.cgi

    r52 r102  
    22# -*- coding: utf-8 -*- 
    33# 
    4 # Copyright (C) 2003-2004 Edgewall Software 
     4# Copyright (C) 2003-2008 Edgewall Software 
    55# Copyright (C) 2003-2004 Jonas Borgström <jonas@edgewall.com> 
    66# All rights reserved. 

  • branches/trac.upstream-r6969/cgi-bin/trac.fcgi

    r52 r102  
    22# -*- coding: utf-8 -*- 
    33# 
    4 # Copyright (C) 2003-2004 Edgewall Software 
     4# Copyright (C) 2003-2008 Edgewall Software 
    55# Copyright (C) 2003-2004 Jonas Borgström <jonas@edgewall.com> 
    66# All rights reserved. 

  • branches/trac.upstream-r6969/ChangeLog

    r55 r102  
    1 Trac 0.11b2 'Genshi' (March 12, 2008) 
    2 http://svn.edgewall.org/repos/trac/tags/trac-0.11b2 
    3  
    4  Trac 0.11b2 contains a great number of new features, improvements and 
     1Trac 0.11rc1 'Genshi' (April 30, 2008) 
     2http://svn.edgewall.org/repos/trac/tags/trac-0.11rc1 
     3 
     4 Trac 0.11rc1 contains a great number of new features, improvements and 
    55 bug fixes. The following list contains only a few highlights: 
    66 
    …… 
    1414 * any user to select their time zone and disable access keys 
    1515 * The WebAdmin plugin is now an integral part of Trac 
     16 * Paging of timeline and query results. 
    1617 
    1718 A more complete list of new features can be found in the RELEASE file. 
    1819 The complete list of closed tickets can be found here: 
    1920   http://trac.edgewall.org/query?status=closed&milestone=0.11 
     21 
     22Trac 0.11b2 'Genshi' (March 12, 2008) 
     23http://svn.edgewall.org/repos/trac/tags/trac-0.11b2 
     24 
     25  See 0.11rc1 
    2026 
    2127Trac 0.11b1 'Genshi' (December 18, 2007) 

  • branches/trac.upstream-r6969/contrib/bugzilla2trac.py

    r46 r102  
    1515Many enhancements, Bill Soudan <bill@soudan.net> 
    1616Other enhancements, Florent Guillaume <fg@nuxeo.com> 
    17 Reworked, Jeroen Ruigrok van der Werven <asmodai@tendra.org> 
     17Reworked, Jeroen Ruigrok van der Werven <asmodai@in-nomine.org> 
    1818 
    1919$Id$ 
    …… 
    2929# 
    3030# Currently, the following bugzilla versions are known to work: 
    31 #   2.11 (2110), 2.16.5 (2165), 2.18.3 (2183), 2.19.1 (2191) 
     31#   2.11 (2110), 2.16.5 (2165), 2.18.3 (2183), 2.19.1 (2191), 2.23.3 (2233) 
    3232# 
    3333# If you run this script on a version not listed here and it is successful, 
    34 # please report it to the Trac mailing list and drop a note to 
    35 # asmodai@tendra.org so we can update the list. 
     34# please file a ticket at http://trac.edgewall.org/ and assign it to 
     35# jruigrok. 
    3636BZ_VERSION = 2180 
    3737 
    …… 
    428428    def getFieldName(self, cursor, fieldid): 
    429429        if fieldid not in self.fieldNameCache: 
    430             cursor.execute("SELECT * FROM fielddefs WHERE fieldid = %s", 
    431                            (fieldid)) 
     430            # fielddefs.fieldid got changed to fielddefs.id in Bugzilla 
     431            # 2.23.3. 
     432            if BZ_VERSION >= 2233: 
     433                cursor.execute("SELECT * FROM fielddefs WHERE id = %s", 
     434                               (fieldid)) 
     435            else: 
     436                cursor.execute("SELECT * FROM fielddefs WHERE fieldid = %s", 
     437                               (fieldid)) 
    432438            fieldName = cursor.fetchall() 
    433439 

  • branches/trac.upstream-r6969/contrib/htdigest.py

    r52 r102  
    2323from getpass import getpass 
    2424 
    25 def get_digest(userprefix): 
     25def ask_pass(): 
    2626    pass1 = getpass('New password: ') 
    2727    pass2 = getpass('Re-type new password: ') 
    …… 
    2929        print >>sys.stderr, "They don't match, sorry" 
    3030        sys.exit(1) 
    31     return userprefix + md5.new(userprefix + pass1).hexdigest() 
     31    return pass1 
    3232 
    33 usage = "%prog [-c] passwordfile realm username" 
     33def get_digest(userprefix, password=None): 
     34    if password == None: 
     35        password = ask_pass() 
     36    return make_digest(userprefix, password) 
     37 
     38def make_digest(userprefix, password): 
     39    return userprefix + md5.new(userprefix + password).hexdigest() 
     40 
     41usage = "%prog [-c] [-b] passwordfile realm username" 
    3442parser = OptionParser(usage=usage) 
    3543parser.add_option('-c', action='store_true', dest='create', default=False, 
    3644                  help='Create a new file') 
     45parser.add_option('-b', action='store_true', dest='batch', default=False, 
     46                  help='Batch mode, password on the commandline.') 
    3747 
    3848opts, args = parser.parse_args() 
    3949 
    4050try: 
    41     filename, realm, username = args 
     51    if opts.batch: 
     52        filename, realm, username, password = args 
     53    else: 
     54        filename, realm, username = args 
     55        password = None 
    4256except ValueError: 
    4357    parser.error('Wrong number of arguments') 
    …… 
    5569            raise 
    5670    try: 
    57         print >>f, get_digest(prefix) 
     71        print >>f, get_digest(prefix, password) 
    5872    finally: 
    5973        f.close() 
    …… 
    6478            if line.startswith(prefix): 
    6579                if not matched: 
    66                     print get_digest(prefix) 
     80                    print get_digest(prefix, password) 
    6781                matched = True 
    6882            else: 
    …… 
    7185            f = open(filename, 'a') 
    7286            try: 
    73                 print >>f, get_digest(prefix) 
     87                print >>f, get_digest(prefix, password) 
    7488            finally: 
    7589                f.close() 

  • branches/trac.upstream-r6969/COPYING

    r46 r102  
    1 Copyright (C) 2003-2007 Edgewall Software 
     1Copyright (C) 2003-2008 Edgewall Software 
    22All rights reserved. 
    33 

  • branches/trac.upstream-r6969/RELEASE

    r55 r102  
    1 Release Notes for Trac 0.11 beta2 Genshi Release 
    2 ================================================ 
    3 March 12, 2008 
     1Release Notes for Trac 0.11 rc1 Genshi Release 
     2============================================== 
     3April 30, 2008 
    44 
    55Highlights 
    …… 
    1414 * any user to select their time zone and disable access keys 
    1515 * The WebAdmin plugin is now an integral part of Trac 
     16 * Paging of timeline and query results. 
    1617 
    1718Detailed User Visible Changes 

  • branches/trac.upstream-r6969/sample-plugins/permissions/authz_policy.py

    r46 r102  
    11# -*- coding: utf-8 -*- 
    22# 
    3 # Copyright (C) 2007 Edgewall Software 
     3# Copyright (C) 2007-2008 Edgewall Software 
    44# Copyright (C) 2007 Alec Thomas <alec@swapoff.org> 
    55# All rights reserved. 
    …… 
    1515# Author: Alec Thomas <alec@swapoff.org> 
    1616 
    17 revision = "$Rev: 2 $" 
     17revision = "$Rev: 155 $" 
    1818url = "$URL: /mirror/sample-plugins/permissions/authz_policy.py $" 
    1919 

  • branches/trac.upstream-r6969/setup.py

    r55 r102  
    22# -*- coding: utf-8 -*- 
    33# 
    4 # Copyright (C) 2003-2007 Edgewall Software 
     4# Copyright (C) 2003-2008 Edgewall Software 
    55# All rights reserved. 
    66# 
    …… 
    1717setup( 
    1818    name = 'Trac', 
    19     version = '0.11', 
     19    version = '0.12', 
    2020    description = 'Integrated SCM, wiki, issue tracker and project environment', 
    2121    long_description = """ 

  • branches/trac.upstream-r6969/trac/about.py

    r46 r102  
    11# -*- coding: utf-8 -*- 
    22# 
    3 # Copyright (C) 2004-2006 Edgewall Software 
     3# Copyright (C) 2004-2008 Edgewall Software 
    44# Copyright (C) 2004-2005 Jonas Borgström <jonas@edgewall.com> 
    55# Copyright (C) 2004-2005 Daniel Lundin <daniel@edgewall.com> 

  • branches/trac.upstream-r6969/trac/admin/console.py

    r60 r102  
    22# -*- coding: utf-8 -*- 
    33#  
    4 # Copyright (C) 2003-2006 Edgewall Software 
     4# Copyright (C) 2003-2008 Edgewall Software 
    55# All rights reserved. 
    66# 
    …… 
    3333from trac.perm import PermissionSystem 
    3434from trac.ticket.model import * 
     35from trac.util import arity 
    3536from trac.util.datefmt import parse_date, format_date, format_datetime, utc 
    3637from trac.util.html import html 
    …… 
    114115        print """Welcome to trac-admin %(version)s 
    115116Interactive Trac administration console. 
    116 Copyright (c) 2003-2007 Edgewall Software 
     117Copyright (c) 2003-2008 Edgewall Software 
    117118 
    118119Type:  '?' or 'help' for help on commands. 
    …… 
    255256    def all_docs(cls): 
    256257        return (cls._help_help + cls._help_initenv + cls._help_hotcopy + 
    257                 cls._help_resync + cls._help_upgrade + cls._help_copystatic + 
     258                cls._help_resync + cls._help_upgrade + cls._help_deploy + 
    258259                cls._help_permission + cls._help_wiki + 
    259260                cls._help_ticket + cls._help_ticket_type +  
    …… 
    605606 
    606607    def _resync_feedback(self, rev): 
    607         print ' [%s]\r' % rev, 
     608        sys.stdout.write(' [%s]\r' % rev) 
     609        sys.stdout.flush() 
    608610         
    609611    ## Resync 
    …… 
    11501152        print 'Hotcopy done.' 
    11511153 
    1152     _help_copystatic = [('copystatic <directory>', 
    1153                          'Extract static resources from Trac and all plugins.')] 
    1154  
    1155     def do_copystatic(self, line): 
     1154    _help_deploy = [('deploy <directory>', 
     1155                     'Extract static resources from Trac and all plugins.')] 
     1156 
     1157    def do_deploy(self, line): 
    11561158        argv = self.arg_tokenize(line) 
    11571159        if not argv[0]: 
    1158             self.do_help('copystatic') 
     1160            self.do_help('deploy') 
    11591161            return 
    11601162 
    …… 
    11621164        if os.path.exists(target): 
    11631165            raise TracError('Destination already exists. Remove and retry.') 
    1164  
     1166        chrome_target = os.path.join(target, 'htdocs') 
     1167        script_target = os.path.join(target, 'cgi-bin') 
     1168 
     1169        # Copy static content 
    11651170        os.makedirs(target) 
     1171        os.makedirs(chrome_target) 
    11661172        from trac.web.chrome import Chrome 
    11671173        print 'Copying resources from:' 
    …… 
    11751181                print '   ', source 
    11761182                if os.path.exists(source): 
    1177                     dest = os.path.join(target, key) 
     1183                    dest = os.path.join(chrome_target, key) 
    11781184                    copytree(source, dest) 
     1185         
     1186        # Create and copy scripts 
     1187        os.makedirs(script_target) 
     1188        print 'Creating scripts.' 
     1189        data = {'env': self.env_open()} 
     1190        for script in ('cgi', 'fcgi', 'wsgi'): 
     1191            dest = os.path.join(script_target, 'trac.'+script) 
     1192            template = Chrome(self.env_open()).load_template('deploy_trac.'+script, 'text') 
     1193            stream = template.generate(**data) 
     1194            out = open(dest, 'w') 
     1195            if arity(stream.render) == 3: 
     1196                # TODO: remove this when we depend on Genshi >= 0.5 
     1197                out.write(stream.render('text')) 
     1198            else: 
     1199                stream.render('text', out=out) 
     1200            out.close() 
    11791201 
    11801202 
    …… 
    12191241            return admin.onecmd('help') 
    12201242        elif args[0] in ('-v','--version'): 
    1221             print '%s %s' % (os.path.basename(args[0]), TRAC_VERSION) 
     1243            print '%s %s' % (os.path.basename(sys.argv[0]), TRAC_VERSION) 
    12221244        else: 
    12231245            admin.env_set(os.path.abspath(args[0])) 

  • branches/trac.upstream-r6969/trac/admin/templates/admin.html

    r46 r102  
    1212  </head></py:match> 
    1313 
    14   <py:match path="body" once="true"><body> 
     14  <py:match path="body" once="true" buffer="false"><body> 
    1515    <div id="content" class="admin"> 
    1616      <h1>Administration</h1> 

  • branches/trac.upstream-r6969/trac/admin/templates/admin_basics.html

    r46 r102  
    3434      </fieldset> 
    3535      <div class="buttons"> 
    36         <input type="submit" value="Apply changes"/> 
     36        <input type="submit" value="${_('Apply changes')}" /> 
    3737      </div> 
    3838    </form> 

  • branches/trac.upstream-r6969/trac/admin/templates/admin_components.html

    r46 r102  
    5252          </div> 
    5353          <div class="buttons"> 
    54             <input type="submit" name="cancel" value="Cancel" /> 
    55             <input type="submit" name="save" value="Save" /> 
     54            <input type="submit" name="cancel" value="${_('Cancel')}" /> 
     55            <input type="submit" name="save" value="${_('Save')}" /> 
    5656          </div> 
    5757        </fieldset> 
    …… 
    5959 
    6060      <py:otherwise> 
    61         <form class="addnew" id="addcomp" method="post"> 
     61        <form class="addnew" id="addcomp" name="addcomponent" method="post"> 
    6262          <fieldset> 
    6363            <legend>Add Component:</legend> 
    …… 
    6767            ${owner_field()} 
    6868            <div class="buttons"> 
    69               <input type="submit" name="add" value="Add"/> 
     69              <input type="submit" name="add" value="${_('Add')}"/> 
    7070            </div> 
    7171          </fieldset> 
    …… 
    9595            </table> 
    9696            <div class="buttons"> 
    97               <input type="submit" name="remove" value="Remove selected items" /> 
    98               <input type="submit" name="apply" value="Apply changes" /> 
     97              <input type="submit" name="remove" value="${_('Remove selected items')}" /> 
     98              <input type="submit" name="apply" value="${_('Apply changes')}" /> 
    9999            </div> 
    100100            <p class="help"> 

  • branches/trac.upstream-r6969/trac/admin/templates/admin_enums.html