Modified: bloodhound/branches/trac-1.0.2-integration/trac/contrib/trac-svn-hook URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/contrib/trac-svn-hook?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/contrib/trac-svn-hook (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/contrib/trac-svn-hook Sat Nov 15 01:14:46 2014 @@ -1,4 +1,17 @@ #!/bin/sh +# -*- coding: utf-8 -*- +# +# Copyright (C) 2009-2013 Edgewall Software +# Copyright (C) 2009 Christian Boos <[email protected]> +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. # # = trac-svn-hook = #
Modified: bloodhound/branches/trac-1.0.2-integration/trac/contrib/trac-svn-post-commit-hook.cmd URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/contrib/trac-svn-post-commit-hook.cmd?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/contrib/trac-svn-post-commit-hook.cmd (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/contrib/trac-svn-post-commit-hook.cmd Sat Nov 15 01:14:46 2014 @@ -1,8 +1,19 @@ @ECHO OFF :: +:: Copyright (C) 2007-2013 Edgewall Software +:: Copyright (C) 2007 Markus Tacker <[email protected]> +:: Copyright (C) 2007 Christian Boos <[email protected]> +:: All rights reserved. +:: +:: This software is licensed as described in the file COPYING, which +:: you should have received as part of this distribution. The terms +:: are also available at http://trac.edgewall.com/license.html. +:: +:: This software consists of voluntary contributions made by many +:: individuals. For the exact contribution history, see the revision +:: history and logs, available at http://trac.edgewall.org/. :: Trac post-commit-hook script for Windows :: -:: Contributed by markus, modified by cboos. :: Modified for the multirepos branch to use the `changeset` command. :: Usage: Modified: bloodhound/branches/trac-1.0.2-integration/trac/contrib/workflow/migrate_original_to_basic.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/contrib/workflow/migrate_original_to_basic.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/contrib/workflow/migrate_original_to_basic.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/contrib/workflow/migrate_original_to_basic.py Sat Nov 15 01:14:46 2014 @@ -1,9 +1,24 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Copyright (C) 2007-2013 Edgewall Software +# Copyright (C) 2007 Eli Carter <[email protected]> +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. + import sys import trac.env from trac.ticket.default_workflow import load_workflow_config_snippet + def main(): """Rewrite the ticket-workflow section of the config; and change all 'assigned' tickets to 'accepted'. Modified: bloodhound/branches/trac-1.0.2-integration/trac/contrib/workflow/showworkflow URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/contrib/workflow/showworkflow?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/contrib/workflow/showworkflow (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/contrib/workflow/showworkflow Sat Nov 15 01:14:46 2014 @@ -1,4 +1,17 @@ #!/bin/bash -x +# -*- coding: utf-8 -*- +# +# Copyright (C) 2007-2013 Edgewall Software +# Copyright (C) 2007 Eli Carter <[email protected]> +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. basedir=`dirname $0` options="" Modified: bloodhound/branches/trac-1.0.2-integration/trac/contrib/workflow/workflow_parser.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/contrib/workflow/workflow_parser.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/contrib/workflow/workflow_parser.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/contrib/workflow/workflow_parser.py Sat Nov 15 01:14:46 2014 @@ -1,4 +1,17 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# Copyright (C) 2007-2013 Edgewall Software +# Copyright (C) 2007 Eli Carter <[email protected]> +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. import sys import getopt Modified: bloodhound/branches/trac-1.0.2-integration/trac/doc/conf.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/doc/conf.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/doc/conf.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/doc/conf.py Sat Nov 15 01:14:46 2014 @@ -1,5 +1,17 @@ # -*- coding: utf-8 -*- # +# Copyright (C) 2008-2013 Edgewall Software +# Copyright (C) 2008 Noah Kantrowitz <[email protected]> +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. + # Trac documentation build configuration file, created by # sphinx-quickstart on Wed May 14 09:05:13 2008. # @@ -24,9 +36,9 @@ url = 'http://trac.edgewall.org' # other places throughout the built documents. # # The short X.Y version. -version = '1.0.1' +version = '1.0.2' # The full version, including alpha/beta/rc tags. -release = '1.0.1' +release = '1.0.2' # Devel or Release mode for the documentation (if devel, include TODOs, # can also be used in conditionals: .. ifconfig :: devel) Modified: bloodhound/branches/trac-1.0.2-integration/trac/doc/dev/testing-intro.rst URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/doc/dev/testing-intro.rst?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/doc/dev/testing-intro.rst (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/doc/dev/testing-intro.rst Sat Nov 15 01:14:46 2014 @@ -42,6 +42,14 @@ database. See :ref:`Using an alternate Provide additional options to the standalone :command:`tracd` server used for the functional tests. +.. envvar:: TRAC_TEST_ENV_PATH + +Use the specified path for the test environment directory. + +.. envvar:: TRAC_TEST_PORT + +Use the specified port for running the standalone :command:`tracd` server. + The :file:`Makefile` is actually written in a way that allow you to get more control, if you want. Modified: bloodhound/branches/trac-1.0.2-integration/trac/doc/utils/checkapidoc.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/doc/utils/checkapidoc.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/doc/utils/checkapidoc.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/doc/utils/checkapidoc.py Sat Nov 15 01:14:46 2014 @@ -1,4 +1,16 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- +# +# Copyright (C) 2012-2013 Edgewall Software +# Copyright (C) 2012 Christian Boos <[email protected]> +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. """Trac API doc checker Modified: bloodhound/branches/trac-1.0.2-integration/trac/doc/utils/runepydoc.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/doc/utils/runepydoc.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/doc/utils/runepydoc.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/doc/utils/runepydoc.py Sat Nov 15 01:14:46 2014 @@ -1,3 +1,17 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2010-2013 Edgewall Software +# Copyright (C) 2010 Christian Boos <[email protected]> +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. + # Simple wrapper script needed to run epydoc import sys @@ -52,4 +66,3 @@ _DocumentPseudoWriter.get_transforms = p # Run epydoc cli() - Modified: bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/HelloWorld.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/HelloWorld.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/HelloWorld.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/HelloWorld.py Sat Nov 15 01:14:46 2014 @@ -1,7 +1,21 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2007-2013 Edgewall Software +# Copyright (C) 2007 Christian Boos <[email protected]> +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. + """Example macro.""" -revision = "$Rev: 11490 $" -url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.1/sample-plugins/HelloWorld.py $" +revision = "$Rev: 12412 $" +url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.2/sample-plugins/HelloWorld.py $" # # The following shows the code for macro, old-style. @@ -12,6 +26,7 @@ url = "$URL: http://svn.edgewall.org/rep # ---- (ignore in your own macro) ---- # -- from trac.util import escape +from trac.util.translation import cleandoc_ def execute(hdf, txt, env): # Currently hdf is set only when the macro is called @@ -49,16 +64,16 @@ class HelloWorldMacro(WikiMacroBase): the !MacroList macro (usually used in the TracWikiMacros page). """) - def expand_macro(self, formatter, name, args): + def expand_macro(self, formatter, name, content): """Return some output that will be displayed in the Wiki content. `name` is the actual name of the macro (no surprise, here it'll be `'HelloWorld'`), - `args` is the text enclosed in parenthesis at the call of the macro. - Note that if there are ''no'' parenthesis (like in, e.g. - [[HelloWorld]]), then `args` is `None`. + `content` is the text enclosed in parenthesis at the call of the + macro. Note that if there are ''no'' parenthesis (like in, e.g. + [[HelloWorld]]), then `content` is `None`. """ - return 'Hello World, args = ' + unicode(args) + return 'Hello World, content = ' + unicode(content) # Note that there's no need to HTML escape the returned data, # as the template engine (Genshi) will do it for us. Modified: bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/Timestamp.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/Timestamp.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/Timestamp.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/Timestamp.py Sat Nov 15 01:14:46 2014 @@ -1,7 +1,21 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2007-2013 Edgewall Software +# Copyright (C) 2007 Christian Boos <[email protected]> +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. + """Inserts the current time (in seconds) into the wiki page.""" -revision = "$Rev: 10617 $" -url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.1/sample-plugins/Timestamp.py $" +revision = "$Rev: 12743 $" +url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.2/sample-plugins/Timestamp.py $" # # The following shows the code for macro, old-style. @@ -36,8 +50,8 @@ from trac.wiki.macros import WikiMacroBa class TimestampMacro(WikiMacroBase): _description = "Inserts the current time (in seconds) into the wiki page." - def expand_macro(self, formatter, name, args): + def expand_macro(self, formatter, name, content, args=None): t = datetime.now(utc) - return tag.b(format_datetime(t, '%c')) + return tag.strong(format_datetime(t, '%c')) # -- # ---- (reuse for your own macro) ---- Modified: bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/milestone_to_version.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/milestone_to_version.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/milestone_to_version.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/milestone_to_version.py Sat Nov 15 01:14:46 2014 @@ -1,3 +1,17 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2009-2013 Edgewall Software +# Copyright (C) 2009 Remy Blank <[email protected]> +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. + import re from trac.config import Option @@ -6,8 +20,8 @@ from trac.resource import ResourceNotFou from trac.ticket.api import IMilestoneChangeListener from trac.ticket.model import Version -revision = "$Rev: 11490 $" -url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.1/sample-plugins/milestone_to_version.py $" +revision = "$Rev: 12164 $" +url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.2/sample-plugins/milestone_to_version.py $" class MilestoneToVersion(Component): Modified: bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/permissions/debug_perm.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/permissions/debug_perm.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/permissions/debug_perm.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/permissions/debug_perm.py Sat Nov 15 01:14:46 2014 @@ -1,3 +1,17 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2007-2013 Edgewall Software +# Copyright (C) 2007 Christian Boos <[email protected]> +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. + from trac.core import * from trac.perm import IPermissionPolicy, PermissionCache from trac.resource import Resource Modified: bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/permissions/public_wiki_policy.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/permissions/public_wiki_policy.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/permissions/public_wiki_policy.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/permissions/public_wiki_policy.py Sat Nov 15 01:14:46 2014 @@ -1,11 +1,25 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2007-2013 Edgewall Software +# Copyright (C) 2007 Christian Boos <[email protected]> +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. + from fnmatch import fnmatchcase from trac.config import Option from trac.core import * from trac.perm import IPermissionPolicy -revision = "$Rev: 11490 $" -url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.1/sample-plugins/permissions/public_wiki_policy.py $" +revision = "$Rev: 12500 $" +url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.2/sample-plugins/permissions/public_wiki_policy.py $" class PublicWikiPolicy(Component): """Allow public access to some wiki pages. @@ -60,4 +74,3 @@ class PublicWikiPolicy(Component): if action.startswith('WIKI_'): return True # this policy ''may'' grant permissions on some wiki pages - Modified: bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/permissions/vulnerability_tickets.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/permissions/vulnerability_tickets.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/permissions/vulnerability_tickets.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/permissions/vulnerability_tickets.py Sat Nov 15 01:14:46 2014 @@ -1,8 +1,22 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2007-2013 Edgewall Software +# Copyright (C) 2007 Alec Thomas <[email protected]> +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. + from trac.core import * from trac.perm import IPermissionPolicy, IPermissionRequestor -revision = "$Rev: 11490 $" -url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.1/sample-plugins/permissions/vulnerability_tickets.py $" +revision = "$Rev: 12164 $" +url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.2/sample-plugins/permissions/vulnerability_tickets.py $" class SecurityTicketsPolicy(Component): """Prevent public access to security sensitive tickets. Modified: bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/revision_links.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/revision_links.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/revision_links.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/revision_links.py Sat Nov 15 01:14:46 2014 @@ -1,3 +1,17 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2007-2013 Edgewall Software +# Copyright (C) 2007 Christian Boos <[email protected]> +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. + """Sample Wiki syntax extension plugin.""" from genshi.builder import tag @@ -8,8 +22,8 @@ from trac.versioncontrol.api import NoSu from trac.versioncontrol.web_ui import ChangesetModule from trac.wiki.api import IWikiSyntaxProvider -revision = "$Rev: 11490 $" -url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.1/sample-plugins/revision_links.py $" +revision = "$Rev: 12500 $" +url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.2/sample-plugins/revision_links.py $" class RevisionLinks(Component): """Adds a few more ways to refer to changesets.""" @@ -53,4 +67,3 @@ class RevisionLinks(Component): pass return tag.a(label, class_="missing changeset", rel="nofollow", href=formatter.href.changeset(rev)) - Modified: bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/CodeReview.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/CodeReview.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/CodeReview.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/CodeReview.py Sat Nov 15 01:14:46 2014 @@ -1,13 +1,26 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2007-2013 Edgewall Software +# Copyright (C) 2007 Eli Carter <[email protected]> +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. + from genshi.builder import tag -from trac.core import implements,Component +from trac.core import Component, implements +from trac.perm import IPermissionRequestor from trac.ticket.api import ITicketActionController from trac.ticket.default_workflow import ConfigurableTicketWorkflow -from trac.perm import IPermissionRequestor -from trac.config import Option, ListOption -revision = "$Rev: 11490 $" -url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.1/sample-plugins/workflow/CodeReview.py $" +revision = "$Rev: 12731 $" +url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.2/sample-plugins/workflow/CodeReview.py $" class CodeReviewActionController(Component): """Support for simple code reviews. Modified: bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/DeleteTicket.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/DeleteTicket.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/DeleteTicket.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/DeleteTicket.py Sat Nov 15 01:14:46 2014 @@ -1,11 +1,23 @@ -from genshi.builder import tag +# -*- coding: utf-8 -*- +# +# Copyright (C) 2007-2013 Edgewall Software +# Copyright (C) 2007 Eli Carter <[email protected]> +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. from trac.core import implements,Component from trac.ticket.api import ITicketActionController from trac.perm import IPermissionRequestor -revision = "$Rev: 11490 $" -url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.1/sample-plugins/workflow/DeleteTicket.py $" +revision = "$Rev: 12731 $" +url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.2/sample-plugins/workflow/DeleteTicket.py $" class DeleteTicketActionController(Component): """Provides the admin with a way to delete a ticket. Modified: bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/MilestoneOperation.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/MilestoneOperation.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/MilestoneOperation.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/MilestoneOperation.py Sat Nov 15 01:14:46 2014 @@ -1,14 +1,16 @@ # -*- coding: utf-8 -*- # +# Copyright (C) 2002-2013 Edgewall Software # Copyright (C) 2012 Franz Mayer <[email protected]> +# All rights reserved. # -# "THE BEER-WARE LICENSE" (Revision 42): -# <[email protected]> wrote this file. As long as you retain this -# notice you can do whatever you want with this stuff. If we meet some day, -# and you think this stuff is worth it, you can buy me a beer in return. -# Franz Mayer +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. # -# Author: Franz Mayer <[email protected]> +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. from genshi.builder import tag Modified: bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/StatusFixer.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/StatusFixer.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/StatusFixer.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/StatusFixer.py Sat Nov 15 01:14:46 2014 @@ -1,11 +1,25 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2007-2013 Edgewall Software +# Copyright (C) 2007 Eli Carter <[email protected]> +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. + from genshi.builder import tag from trac.core import Component, implements from trac.ticket.api import ITicketActionController, TicketSystem from trac.perm import IPermissionRequestor -revision = "$Rev: 11075 $" -url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.1/sample-plugins/workflow/StatusFixer.py $" +revision = "$Rev: 12164 $" +url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.2/sample-plugins/workflow/StatusFixer.py $" class StatusFixerActionController(Component): """Provides the admin with a way to correct a ticket's status. Modified: bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/VoteOperation.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/VoteOperation.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/VoteOperation.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/VoteOperation.py Sat Nov 15 01:14:46 2014 @@ -1,3 +1,17 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2007-2013 Edgewall Software +# Copyright (C) 2007 Eli Carter <[email protected]> +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.com/license.html. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/. + from genshi.builder import tag from trac.core import implements,Component @@ -6,8 +20,8 @@ from trac.ticket.default_workflow import from trac.ticket.model import Priority, Ticket #from trac.perm import IPermissionRequestor # (TODO) -revision = "$Rev: 11490 $" -url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.1/sample-plugins/workflow/VoteOperation.py $" +revision = "$Rev: 12164 $" +url = "$URL: http://svn.edgewall.org/repos/trac/tags/trac-1.0.2/sample-plugins/workflow/VoteOperation.py $" class VoteOperation(Component): """Provides a simplistic vote feature. Modified: bloodhound/branches/trac-1.0.2-integration/trac/setup.cfg URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/setup.cfg?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/setup.cfg (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/setup.cfg Sat Nov 15 01:14:46 2014 @@ -1,4 +1,4 @@ -[egg_info] +#[egg_info] #tag_build = dev #tag_svn_revision = true Modified: bloodhound/branches/trac-1.0.2-integration/trac/setup.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/setup.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/setup.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/setup.py Sat Nov 15 01:14:46 2014 @@ -18,10 +18,10 @@ from setuptools import setup, find_packa min_python = (2, 5) if sys.version_info < min_python: - print "Trac requires Python %d.%d or later" % min_python + print("Trac requires Python %d.%d or later" % min_python) sys.exit(1) if sys.version_info >= (3,): - print "Trac doesn't support Python 3 (yet)" + print("Trac doesn't support Python 3 (yet)") sys.exit(1) extra = {} @@ -49,13 +49,13 @@ except ImportError: try: import genshi except ImportError: - print "Genshi is needed by Trac setup, pre-installing" + print("Genshi is needed by Trac setup, pre-installing") # give some context to the warnings we might get when installing Genshi setup( name = 'Trac', - version = '1.0.1', + version = '1.0.2', description = 'Integrated SCM, wiki, issue tracker and project environment', long_description = """ Trac is a minimalistic web-based software project management and bug/issue @@ -105,8 +105,9 @@ facilities. ], extras_require = { 'Babel': ['Babel>=0.9.5'], + 'ConfigObj': ['ConfigObj'], 'Pygments': ['Pygments>=0.6'], - 'reST': ['docutils>=0.3'], + 'reST': ['docutils>=0.3.9'], 'SilverCity': ['SilverCity>=0.9.4'], 'Textile': ['textile>=2.0'], }, @@ -141,6 +142,7 @@ facilities. trac.versioncontrol.svn_authz = trac.versioncontrol.svn_authz trac.versioncontrol.web_ui = trac.versioncontrol.web_ui trac.web.auth = trac.web.auth + trac.web.main = trac.web.main trac.web.session = trac.web.session trac.wiki.admin = trac.wiki.admin trac.wiki.interwiki = trac.wiki.interwiki @@ -150,7 +152,7 @@ facilities. tracopt.mimeview.enscript = tracopt.mimeview.enscript tracopt.mimeview.php = tracopt.mimeview.php tracopt.mimeview.silvercity = tracopt.mimeview.silvercity[SilverCity] - tracopt.perm.authz_policy = tracopt.perm.authz_policy + tracopt.perm.authz_policy = tracopt.perm.authz_policy[ConfigObj] tracopt.perm.config_perm_provider = tracopt.perm.config_perm_provider tracopt.ticket.clone = tracopt.ticket.clone tracopt.ticket.commit_updater = tracopt.ticket.commit_updater Modified: bloodhound/branches/trac-1.0.2-integration/trac/trac/TRAC_VERSION URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/trac/TRAC_VERSION?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/trac/TRAC_VERSION (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/trac/TRAC_VERSION Sat Nov 15 01:14:46 2014 @@ -1 +1 @@ -1.0.1 +1.0.2 Modified: bloodhound/branches/trac-1.0.2-integration/trac/trac/__init__.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/trac/__init__.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/trac/__init__.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/trac/__init__.py Sat Nov 15 01:14:46 2014 @@ -16,7 +16,7 @@ from pkg_resources import DistributionNo try: __version__ = get_distribution('Trac').version except DistributionNotFound: - __version__ = '1.0.1' + __version__ = '1.0.2' try: from hooks import install_global_hooks Modified: bloodhound/branches/trac-1.0.2-integration/trac/trac/about.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/trac/about.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/trac/about.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/trac/about.py Sat Nov 15 01:14:46 2014 @@ -26,7 +26,7 @@ from trac.loader import get_plugin_info from trac.perm import IPermissionRequestor from trac.util.translation import _ from trac.web import IRequestHandler -from trac.web.chrome import INavigationContributor +from trac.web.chrome import Chrome, INavigationContributor class AboutModule(Component): @@ -62,6 +62,7 @@ class AboutModule(Component): if 'CONFIG_VIEW' in req.perm('config', 'systeminfo'): # Collect system information data['systeminfo'] = self.env.get_systeminfo() + Chrome(self.env).add_jquery_ui(req) if 'CONFIG_VIEW' in req.perm('config', 'plugins'): # Collect plugin information Modified: bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/api.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/api.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/api.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/api.py Sat Nov 15 01:14:46 2014 @@ -11,15 +11,18 @@ # individuals. For the exact contribution history, see the revision # history and logs, available at http://trac.edgewall.org/log/. +import os import os.path import sys import traceback from trac.core import * from trac.util.text import levenshtein_distance -from trac.util.translation import _ +from trac.util.translation import _, get_negotiated_locale, has_babel +LANG = os.environ.get('LANG') + console_date_format = '%Y-%m-%d' console_datetime_format = '%Y-%m-%d %H:%M:%S' console_date_format_hint = 'YYYY-MM-DD' @@ -192,3 +195,21 @@ def get_dir_list(path, dirs_only=False): except OSError: pass return result + + +def get_console_locale(env=None, lang=LANG): + """Return negotiated locale for console by LANG environment and + [trac] default_language.""" + if has_babel: + from babel.core import Locale, UnknownLocaleError, parse_locale + try: + lang = '_'.join(filter(None, parse_locale(lang))) + except: + lang = None + default = env.config.get('trac', 'default_language', '') \ + if env else None + try: + return get_negotiated_locale([lang, default]) or Locale.default() + except UnknownLocaleError: + pass + return None Modified: bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/console.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/console.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/console.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/console.py Sat Nov 15 01:14:46 2014 @@ -15,7 +15,6 @@ from __future__ import with_statement import cmd -import locale import os.path import pkg_resources from shlex import shlex @@ -24,24 +23,25 @@ import sys import traceback from trac import __version__ as VERSION -from trac.admin import AdminCommandError, AdminCommandManager +from trac.admin.api import AdminCommandError, AdminCommandManager, \ + get_console_locale from trac.core import TracError from trac.env import Environment from trac.ticket.model import * -from trac.util import translation +from trac.util import translation, warn_setuptools_issue from trac.util.html import html from trac.util.text import console_print, exception_to_unicode, printout, \ printerr, raw_input, to_unicode, \ getpreferredencoding -from trac.util.translation import _, ngettext, get_negotiated_locale, \ - has_babel, cleandoc_ +from trac.util.translation import _, ngettext, has_babel, cleandoc_ from trac.versioncontrol.api import RepositoryManager from trac.wiki.admin import WikiAdmin from trac.wiki.macros import WikiMacroBase + TRAC_VERSION = pkg_resources.get_distribution('Trac').version rl_completion_suppress_append = None -LANG = os.environ.get('LANG') + def find_readline_lib(): """Return the name (and possibly the full path) of the readline library @@ -67,6 +67,7 @@ class TracAdmin(cmd.Cmd): envname = None __env = None needs_upgrade = None + cmd_mgr = None def __init__(self, envdir=None): cmd.Cmd.__init__(self) @@ -146,6 +147,7 @@ Type: '?' or 'help' for help on command self.prompt = "Trac [%s]> " % self.envname if env is not None: self.__env = env + self.cmd_mgr = AdminCommandManager(env) def env_check(self): if not self.__env: @@ -168,12 +170,13 @@ Type: '?' or 'help' for help on command def _init_env(self): self.__env = env = Environment(self.envname) + negotiated = None # fixup language according to env settings if has_babel: - default = env.config.get('trac', 'default_language', '') - negotiated = get_negotiated_locale([LANG, default]) + negotiated = get_console_locale(env) if negotiated: translation.activate(negotiated) + self.cmd_mgr = AdminCommandManager(env) ## ## Utility methods @@ -240,9 +243,8 @@ Type: '?' or 'help' for help on command if line and line[-1] == ' ': # Space starts new argument args.append('') if self.env_check(): - cmd_mgr = AdminCommandManager(self.env) try: - comp = cmd_mgr.complete_command(args, cmd_only) + comp = self.cmd_mgr.complete_command(args, cmd_only) except Exception, e: printerr() printerr(_('Completion error: %(err)s', @@ -281,8 +283,7 @@ Type: '?' or 'help' for help on command raise TracError(_('The Trac Environment needs to be upgraded.\n\n' 'Run "trac-admin %(path)s upgrade"', path=self.envname)) - cmd_mgr = AdminCommandManager(self.env) - return cmd_mgr.execute_command(*args) + return self.cmd_mgr.execute_command(*args) ## ## Available Commands @@ -304,9 +305,10 @@ Type: '?' or 'help' for help on command def do_help(self, line=None): arg = self.arg_tokenize(line) if arg[0]: + cmd_mgr = None doc = getattr(self, "_help_" + arg[0], None) if doc is None and self.env_check(): - cmd_mgr = AdminCommandManager(self.env) + cmd_mgr = self.cmd_mgr doc = cmd_mgr.get_command_help(arg) if doc: self.print_doc(doc) @@ -314,7 +316,9 @@ Type: '?' or 'help' for help on command printerr(_("No documentation found for '%(cmd)s'." " Use 'help' to see the list of commands.", cmd=' '.join(arg))) - cmds = cmd_mgr.get_similar_commands(arg[0]) + cmds = None + if cmd_mgr: + cmds = cmd_mgr.get_similar_commands(arg[0]) if cmds: printout('') printout(ngettext("Did you mean this?", @@ -555,21 +559,16 @@ class TracAdminHelpMacro(WikiMacroBase): doc = TracAdmin.all_docs(self.env) buf = StringIO.StringIO() TracAdmin.print_doc(doc, buf, long=True) - return html.PRE(buf.getvalue(), class_='wiki') + return html.PRE(buf.getvalue().decode('utf-8'), class_='wiki') def run(args=None): """Main entry point.""" if args is None: args = sys.argv[1:] - locale = None if has_babel: - import babel - try: - locale = get_negotiated_locale([LANG]) or babel.Locale.default() - except babel.UnknownLocaleError: - pass - translation.activate(locale) + translation.activate(get_console_locale()) + warn_setuptools_issue() admin = TracAdmin() if len(args) > 0: if args[0] in ('-h', '--help', 'help'): Modified: bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin.html URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin.html?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin.html (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin.html Sat Nov 15 01:14:46 2014 @@ -1,3 +1,13 @@ +<!--! Copyright (C) 2006-2014 Edgewall Software + + This software is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at http://trac.edgewall.com/license.html. + + This software consists of voluntary contributions made by many + individuals. For the exact contribution history, see the revision + history and logs, available at http://trac.edgewall.org/. +--> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> Modified: bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_basics.html URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_basics.html?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_basics.html (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_basics.html Sat Nov 15 01:14:46 2014 @@ -1,3 +1,13 @@ +<!--! Copyright (C) 2006-2014 Edgewall Software + + This software is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at http://trac.edgewall.com/license.html. + + This software consists of voluntary contributions made by many + individuals. For the exact contribution history, see the revision + history and logs, available at http://trac.edgewall.org/. +--> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> @@ -39,15 +49,25 @@ ${project.descr}</textarea> selected="${tzname == default_timezone or None}">${tzname}</option> </select> </label> + <span py:if="not has_pytz" class="hint"> + Install pytz for a complete list of timezones. + </span> </div> <div class="field"> <label>Default language:<br /> - <select name="default_language"> + <select name="default_language" disabled="${not languages or None}" + title="${_('Translations are currently unavailable') if not languages else None}"> <option value="">Browser's language</option> <option py:for="locale, language in languages" value="${locale}" selected="${locale == default_language or None}">${language}</option> </select> </label> + <span py:if="not has_babel" class="hint"> + Install Babel for extended language support. + </span> + <span py:if="has_babel and not languages" class="hint"> + Message catalogs have not been compiled. + </span> </div> <div class="field"> <label>Default date format:<br /> @@ -57,6 +77,9 @@ ${project.descr}</textarea> selected="${default_date_format == 'iso8601' or None}">ISO 8601 format</option> </select> </label> + <span py:if="not has_babel" class="hint"> + Install Babel for localized date formats. + </span> </div> </fieldset> <div class="buttons"> Modified: bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_legacy.html URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_legacy.html?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_legacy.html (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_legacy.html Sat Nov 15 01:14:46 2014 @@ -1,3 +1,13 @@ +<!--! Copyright (C) 2007-2014 Edgewall Software + + This software is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at http://trac.edgewall.com/license.html. + + This software consists of voluntary contributions made by many + individuals. For the exact contribution history, see the revision + history and logs, available at http://trac.edgewall.org/. +--> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> Modified: bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_logging.html URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_logging.html?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_logging.html (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_logging.html Sat Nov 15 01:14:46 2014 @@ -1,3 +1,13 @@ +<!--! Copyright (C) 2006-2014 Edgewall Software + + This software is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at http://trac.edgewall.com/license.html. + + This software consists of voluntary contributions made by many + individuals. For the exact contribution history, see the revision + history and logs, available at http://trac.edgewall.org/. +--> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> Modified: bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_perms.html URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_perms.html?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_perms.html (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_perms.html Sat Nov 15 01:14:46 2014 @@ -1,3 +1,13 @@ +<!--! Copyright (C) 2006-2014 Edgewall Software + + This software is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at http://trac.edgewall.com/license.html. + + This software consists of voluntary contributions made by many + individuals. For the exact contribution history, see the revision + history and logs, available at http://trac.edgewall.org/. +--> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> @@ -13,7 +23,7 @@ <body> <h2>Manage Permissions and Groups</h2> - <py:if test="'PERMISSION_GRANT' in perm"> + <py:if test="'PERMISSION_GRANT' in perm('admin', 'general/perm')"> <form id="addperm" class="addnew" method="post" action=""> <fieldset> <legend>Grant Permission:</legend> @@ -22,13 +32,14 @@ </div> <div class="field"> <label>Action: - <select id="action" name="action"> - <option py:for="action in sorted(actions)">$action</option> + <select id="action" name="action" + py:with="allowed_actions = [a for a in actions if a in perm]"> + <option py:for="action in sorted(allowed_actions)">$action</option> </select> </label> </div> <div class="buttons"> - <input type="submit" name="add" value="${_('Add')}" /> + <input type="submit" name="add" class="trac-disable-on-submit" value="${_('Add')}" /> </div> <p class="help"> Grant permission for an action to a subject, which can be either a user @@ -47,7 +58,7 @@ <label>Group: <input id="sg_group" type="text" name="group" /></label> </div> <div class="buttons"> - <input type="submit" name="add" value="${_('Add')}"/> + <input type="submit" name="add" class="trac-disable-on-submit" value="${_('Add')}"/> </div> <p class="help"> Add a user or group to an existing permission group. @@ -56,7 +67,7 @@ </form> </py:if> - <form id="revokeform" method="post" action="" py:with="can_revoke = 'PERMISSION_REVOKE' in perm"> + <form id="revokeform" method="post" action="" py:with="can_revoke = 'PERMISSION_REVOKE' in perm('admin', 'general/perm')"> <h3>Permissions</h3> <table class="listing" id="permlist"> <thead> @@ -67,14 +78,18 @@ class="${'odd' if idx % 2 else 'even'}"> <td>$subject</td> <td> - <label py:for="subject, action in perm_group"> + <label py:for="subject, action in perm_group" + py:with="invalid = action not in actions; has_perm = action in perm"> <!--! base64 makes it safe to use ':' as separator when passing both subject and action as one query parameter --> <input py:if="can_revoke" type="checkbox" name="sel" + title="${_('You don\'t have permission to revoke this action') + if not has_perm else None}" value="${'%s:%s' % (unicode_to_base64(subject), - unicode_to_base64(action))}"/> - <span py:strip="action in actions" class="missing" - title="Action is no longer defined">${action}</span> + unicode_to_base64(action))}" + disabled="${'disabled' if not has_perm else None}" /> + <span class="${classes(missing=invalid)}" + title="${_('%(action)s is no longer defined', action=action) if invalid else action}">${action}</span> </label> </td> </tr> Modified: bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_plugins.html URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_plugins.html?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_plugins.html (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_plugins.html Sat Nov 15 01:14:46 2014 @@ -1,3 +1,13 @@ +<!--! Copyright (C) 2006-2014 Edgewall Software + + This software is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at http://trac.edgewall.com/license.html. + + This software consists of voluntary contributions made by many + individuals. For the exact contribution history, see the revision + history and logs, available at http://trac.edgewall.org/. +--> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> @@ -54,7 +64,7 @@ </head> <body> - <h2>Manage Plugins</h2> + <h2>Manage Plugins <span class="trac-count">(${len(plugins)})</span></h2> <form id="addplug" class="addnew" method="post" enctype="multipart/form-data" action=""> <fieldset> @@ -65,8 +75,8 @@ </label> </div> <div class="buttons"> - <input type="submit" name="install" value="${_('Install')}" - disabled="${readonly or None}" /> + <input type="submit" name="install" class="trac-disable-on-submit" + value="${_('Install')}" disabled="${readonly or None}" /> </div> <p class="help" py:choose="readonly"> <py:when test="True"> @@ -80,7 +90,7 @@ </fieldset> </form> - <form py:for="idx, plugin in enumerate(plugins)" method="post" action=""> + <form py:for="idx, plugin in enumerate(plugins)" id="edit-plugin-${plugin.name.lower()}" method="post" action=""> <div class="plugin" id="trac-plugin-${plugin.name}"> <h3 class="foldable">${plugin.name} ${plugin.version}</h3> <!--! FIXME: Plugin uninstall disabled as it is unreliable (#3545) @@ -148,7 +158,7 @@ </p> <div py:if="module.description" xml:space="preserve">${safe_wiki_to_html(context, module.description)}</div> </td> - <td class="sel"></td> + <td class="sel trac-module"></td> </tr> <tr py:for="component_name, component in sorted(module.components.iteritems())"> <td py:with="show_doc = show == plugin.name or show == component.full_name" id="trac-comp-${component.full_name}" @@ -164,7 +174,7 @@ </p> <div py:if="component.description" xml:space="preserve">${safe_wiki_to_html(context, component.description)}</div> </td> - <td class="sel"> + <td class="sel trac-component"> <input py:if="not component.required" type="hidden" name="component" value="${module_name}.${component_name}" /> <input type="checkbox" name="enable" Modified: bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/tests/__init__.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/tests/__init__.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/tests/__init__.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/tests/__init__.py Sat Nov 15 01:14:46 2014 @@ -1,3 +1,16 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2005-2013 Edgewall Software +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.org/wiki/TracLicense. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/log/. + import unittest from trac.admin.tests import console Modified: bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/tests/console-tests.txt URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/tests/console-tests.txt?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/tests/console-tests.txt (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/tests/console-tests.txt Sat Nov 15 01:14:46 2014 @@ -54,7 +54,7 @@ resolution remove Remove a resolution session add Create a session for the given sid session delete Delete the session of the specified sid session list List the name and email for the given sids -session purge Purge all anonymous sessions older than the given age +session purge Purge anonymous sessions older than the given age or date session set Set the name or email attribute of the given sid severity add Add a severity value option severity change Change a severity value @@ -87,6 +87,8 @@ wiki upgrade Upgrade default wik Name Size Author Date Description ------------------------------------- +===== test_attachment_add_nonexistent_resource ===== +ResourceNotFound: NonExistentPage doesn't exist, can't create attachment ===== test_config_get ===== Test project ===== test_config_set ===== @@ -357,9 +359,11 @@ Available actions: WIKI_MODIFY, WIKI_RENAME, WIKI_VIEW ===== test_permission_remove_unknown_user ===== -Error: Cannot remove permission TICKET_VIEW for user joe. +Error: Cannot remove permission TICKET_VIEW for user joe. The user has not been granted the permission. ===== test_permission_remove_action_not_granted ===== -Error: Cannot remove permission TICKET_CREATE for user anonymous. +Error: Cannot remove permission TICKET_CREATE for user anonymous. The user has not been granted the permission. +===== test_permission_remove_action_granted_through_meta_permission ===== +Error: Cannot remove permission WIKI_VIEW for user joe. The permission is granted through a meta-permission or group. ===== test_permission_export_ok ===== anonymous,BROWSER_VIEW,CHANGESET_VIEW,FILE_VIEW,LOG_VIEW,MILESTONE_VIEW,REPORT_SQL_VIEW,REPORT_VIEW,ROADMAP_VIEW,SEARCH_VIEW,TICKET_VIEW,TIMELINE_VIEW,WIKI_VIEW authenticated,TICKET_CREATE,TICKET_MODIFY,WIKI_CREATE,WIKI_MODIFY @@ -412,6 +416,14 @@ Name Owner ----------------------- component1 somebody component2 somebody +new_component + +===== test_component_add_optional_owner_ok ===== + +Name Owner +----------------------- +component1 somebody +component2 somebody new_component new_user ===== test_component_add_error_already_exists ===== @@ -720,6 +732,8 @@ milestone4 ===== test_milestone_add_error_already_exists ===== IntegrityError: [...] +===== test_milestone_add_invalid_date ===== +TracError: "<add>" is an invalid date, or the date format is not known. Try "%(hint)s" or "%(isohint)s" instead. ===== test_milestone_rename_ok ===== Name Due Completed @@ -751,6 +765,8 @@ milestone4 ===== test_milestone_due_error_bad_milestone ===== ResourceNotFound: Milestone bad_milestone does not exist. +===== test_milestone_due_invalid_date ===== +TracError: "<due>" is an invalid date, or the date format is not known. Try "%(hint)s" or "%(isohint)s" instead. ===== test_milestone_completed_ok ===== Name Due Completed @@ -762,6 +778,8 @@ milestone4 ===== test_milestone_completed_error_bad_milestone ===== ResourceNotFound: Milestone bad_milestone does not exist. +===== test_milestone_completed_invalid_date ===== +TracError: "<com>" is an invalid date, or the date format is not known. Try "%(hint)s" or "%(isohint)s" instead. ===== test_milestone_remove_ok ===== Name Due Completed @@ -1013,3 +1031,5 @@ name17 0 2010-01-18 val17 val17 name18 0 2010-01-19 val18 val18 name19 0 2010-01-20 val19 val19 +===== test_session_purge_invalid_date ===== +TracError: "<purge>" is an invalid date, or the date format is not known. Try "%(hint)s" or "%(isohint)s" instead.
