+ +

Context Navigation

@@ -41,6 +43,7 @@

Warning: diff -Nru trac-0.11.7/trac/test.py trac-0.12.1~ppa2/trac/test.py --- trac-0.11.7/trac/test.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/test.py 2010-04-23 14:23:43.000000000 +0100 @@ -17,20 +17,25 @@ # Author: Jonas Borgström # Christopher Lenz +import doctest import os import unittest import sys -import pkg_resources -from fnmatch import fnmatch + +try: + from babel import Locale +except ImportError: + Locale = None from trac.config import Configuration -from trac.core import Component, ComponentManager, ExtensionPoint +from trac.core import Component, ComponentManager from trac.env import Environment from trac.db.api import _parse_db_str, DatabaseManager from trac.db.sqlite_backend import SQLiteConnection import trac.db.postgres_backend import trac.db.mysql_backend from trac.ticket.default_workflow import load_workflow_config_snippet +from trac.util import translation def Mock(bases=(), *initargs, **kw): @@ -85,7 +90,7 @@ bases = (bases,) cls = type('Mock', bases, {}) mock = cls(*initargs) - for k,v in kw.items(): + for k, v in kw.items(): setattr(mock, k, v) return mock @@ -93,6 +98,9 @@ class MockPerm(object): """Fake permission class. Necessary as Mock can not be used with operator overloading.""" + + username = '' + def has_permission(self, action, realm_or_resource=None, id=False, version=False): return True @@ -127,16 +135,10 @@ for test in self._tests: if hasattr(test, 'setFixture'): test.setFixture(self.fixture) - for test in self._tests: # Content of unittest.TestSuite.run() - if result.shouldStop: # copied here for Python 2.3 compatibility - break - test(result) + unittest.TestSuite.run(self, result) self.tearDown() return result - def __call__(self, *args, **kwds): # Python 2.3 compatibility - return self.run(*args, **kwds) - class TestCaseSetup(unittest.TestCase): def setFixture(self, fixture): @@ -233,8 +235,7 @@ """ ComponentManager.__init__(self) Component.__init__(self) - self.enabled_components = enable or ['trac.*'] - self.systeminfo = [('Python', sys.version)] + self.systeminfo = [] import trac self.path = os.path.dirname(trac.__file__) @@ -249,6 +250,11 @@ load_workflow_config_snippet(self.config, 'basic-workflow.ini') self.config.set('logging', 'log_level', 'DEBUG') self.config.set('logging', 'log_type', 'stderr') + if enable is not None: + self.config.set('components', 'trac.*', 'disabled') + for name_or_class in enable or (): + config_key = self._component_name(name_or_class) + self.config.set('components', config_key, 'enabled') # -- logging from trac.log import logger_factory @@ -267,15 +273,7 @@ self.abs_href = Href('http://example.org/trac.cgi') self.known_users = [] - - def is_component_enabled(self, cls): - for component in self.enabled_components: - if component is cls: - return True - if isinstance(component, basestring) and \ - fnmatch(cls.__module__ + '.' + cls.__name__, component): - return True - return False + translation.activate(Locale and Locale('en', 'US')) def get_db_cnx(self, destroying=False): if self.db: @@ -368,7 +366,7 @@ for t in tables: cursor.execute('DROP TABLE IF EXISTS `%s`' % t) db.commit() - except Exception, e: + except Exception: db.rollback() def get_known_users(self, cnx=None): @@ -380,7 +378,6 @@ Returns the fully-qualified path, or None. """ - import os exec_suffix = os.name == 'nt' and '.exe' or '' for p in ["."] + os.environ['PATH'].split(os.pathsep): @@ -403,6 +400,7 @@ import trac.versioncontrol.web_ui.tests import trac.web.tests import trac.wiki.tests + import tracopt.mimeview.tests suite = unittest.TestSuite() suite.addTest(trac.tests.basicSuite()) @@ -417,19 +415,12 @@ suite.addTest(trac.versioncontrol.web_ui.tests.suite()) suite.addTest(trac.web.tests.suite()) suite.addTest(trac.wiki.tests.suite()) + suite.addTest(tracopt.mimeview.tests.suite()) + suite.addTest(doctest.DocTestSuite(sys.modules[__name__])) return suite if __name__ == '__main__': - import doctest, sys - doctest.testmod(sys.modules[__name__]) - - # Clean up after doctest or spambayes gets unhappy - try: - del __builtins__._ - except NameError: - pass - #FIXME: this is a bit inelegant if '--skip-functional-tests' in sys.argv: sys.argv.remove('--skip-functional-tests') diff -Nru trac-0.11.7/trac/tests/attachment.py trac-0.12.1~ppa2/trac/tests/attachment.py --- trac-0.11.7/trac/tests/attachment.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/tests/attachment.py 2010-03-17 19:57:05.000000000 +0000 @@ -1,18 +1,15 @@ # -*- coding: utf-8 -*- -import os +import os.path import shutil +from StringIO import StringIO import tempfile import unittest -import time -from trac.attachment import Attachment, AttachmentModule, \ - LegacyAttachmentPolicy +from trac.attachment import Attachment from trac.core import Component, implements -from trac.log import logger_factory from trac.perm import IPermissionPolicy, PermissionCache -from trac.test import EnvironmentStub, Mock -from trac.wiki.formatter import Formatter +from trac.test import EnvironmentStub class TicketOnlyViewsTicket(Component): @@ -74,9 +71,9 @@ def test_insert(self): attachment = Attachment(self.env, 'ticket', 42) - attachment.insert('foo.txt', tempfile.TemporaryFile(), 0, 1) + attachment.insert('foo.txt', StringIO(''), 0, 1) attachment = Attachment(self.env, 'ticket', 42) - attachment.insert('bar.jpg', tempfile.TemporaryFile(), 0, 2) + attachment.insert('bar.jpg', StringIO(''), 0, 2) attachments = Attachment.select(self.env, 'ticket', 42) self.assertEqual('foo.txt', attachments.next().filename) @@ -85,22 +82,22 @@ def test_insert_unique(self): attachment = Attachment(self.env, 'ticket', 42) - attachment.insert('foo.txt', tempfile.TemporaryFile(), 0) + attachment.insert('foo.txt', StringIO(''), 0) self.assertEqual('foo.txt', attachment.filename) attachment = Attachment(self.env, 'ticket', 42) - attachment.insert('foo.txt', tempfile.TemporaryFile(), 0) + attachment.insert('foo.txt', StringIO(''), 0) self.assertEqual('foo.2.txt', attachment.filename) def test_insert_outside_attachments_dir(self): attachment = Attachment(self.env, '../../../../../sth/private', 42) self.assertRaises(AssertionError, attachment.insert, 'foo.txt', - tempfile.TemporaryFile(), 0) + StringIO(''), 0) def test_delete(self): attachment1 = Attachment(self.env, 'wiki', 'SomePage') - attachment1.insert('foo.txt', tempfile.TemporaryFile(), 0) + attachment1.insert('foo.txt', StringIO(''), 0) attachment2 = Attachment(self.env, 'wiki', 'SomePage') - attachment2.insert('bar.jpg', tempfile.TemporaryFile(), 0) + attachment2.insert('bar.jpg', StringIO(''), 0) attachments = Attachment.select(self.env, 'wiki', 'SomePage') self.assertEqual(2, len(list(attachments))) @@ -120,11 +117,37 @@ doesn't exist for some reason. """ attachment = Attachment(self.env, 'wiki', 'SomePage') - attachment.insert('foo.txt', tempfile.TemporaryFile(), 0) + attachment.insert('foo.txt', StringIO(''), 0) os.unlink(attachment.path) attachment.delete() + def test_reparent(self): + attachment1 = Attachment(self.env, 'wiki', 'SomePage') + attachment1.insert('foo.txt', StringIO(''), 0) + path1 = attachment1.path + attachment2 = Attachment(self.env, 'wiki', 'SomePage') + attachment2.insert('bar.jpg', StringIO(''), 0) + + attachments = Attachment.select(self.env, 'wiki', 'SomePage') + self.assertEqual(2, len(list(attachments))) + attachments = Attachment.select(self.env, 'ticket', 123) + self.assertEqual(0, len(list(attachments))) + assert os.path.exists(path1) and os.path.exists(attachment2.path) + + attachment1.reparent('ticket', 123) + self.assertEqual('ticket', attachment1.parent_realm) + self.assertEqual('ticket', attachment1.resource.parent.realm) + self.assertEqual('123', attachment1.parent_id) + self.assertEqual('123', attachment1.resource.parent.id) + + attachments = Attachment.select(self.env, 'wiki', 'SomePage') + self.assertEqual(1, len(list(attachments))) + attachments = Attachment.select(self.env, 'ticket', 123) + self.assertEqual(1, len(list(attachments))) + assert not os.path.exists(path1) and os.path.exists(attachment1.path) + assert os.path.exists(attachment2.path) + def test_legacy_permission_on_parent(self): """Ensure that legacy action tests are done on parent. As `ATTACHMENT_VIEW` maps to `TICKET_VIEW`, the `TICKET_VIEW` is tested diff -Nru trac-0.11.7/trac/tests/config.py trac-0.12.1~ppa2/trac/tests/config.py --- trac-0.11.7/trac/tests/config.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/tests/config.py 2010-03-18 02:23:37.000000000 +0000 @@ -13,22 +13,20 @@ # history and logs, available at http://trac.edgewall.org/log/. import os -from StringIO import StringIO import tempfile import time import unittest from trac.config import * from trac.test import Configuration +from trac.util import create_file class ConfigurationTestCase(unittest.TestCase): - if not hasattr(unittest.TestCase, "assertTrue"): - assertTrue = unittest.TestCase.failUnless # Python 2.3 compatibility - def setUp(self): - self.filename = os.path.join(tempfile.gettempdir(), 'trac-test.ini') + tmpdir = os.path.realpath(tempfile.gettempdir()) + self.filename = os.path.join(tmpdir, 'trac-test.ini') self._write([]) self._orig_registry = Option.registry Option.registry = {} @@ -70,7 +68,8 @@ def test_default_int(self): config = self._read() - self.assertRaises(ConfigurationError, config.getint, 'a', 'option', 'b') + self.assertRaises(ConfigurationError, + config.getint, 'a', 'option', 'b') self.assertEquals(0, config.getint('a', 'option')) self.assertEquals(1, config.getint('a', 'option', '1')) self.assertEquals(1, config.getint('a', 'option', 1)) @@ -80,6 +79,20 @@ self.assertEquals(2, config.getint('a', 'option')) + def test_default_float(self): + config = self._read() + self.assertRaises(ConfigurationError, + config.getfloat, 'a', 'option', 'b') + self.assertEquals(0.0, config.getfloat('a', 'option')) + self.assertEquals(1.2, config.getfloat('a', 'option', '1.2')) + self.assertEquals(1.2, config.getfloat('a', 'option', 1.2)) + self.assertEquals(1.0, config.getfloat('a', 'option', 1)) + + class Foo(object): + option_a = Option('a', 'option', '2.5') + + self.assertEquals(2.5, config.getfloat('a', 'option')) + def test_default_path(self): config = self._read() class Foo(object): @@ -126,6 +139,16 @@ self.assertEquals(25, config.getint('b', 'option2', 25)) self.assertEquals(25, config.getint('b', 'option2', '25')) + def test_read_and_getfloat(self): + self._write(['[a]', 'option = 42.5']) + config = self._read() + self.assertEquals(42.5, config.getfloat('a', 'option')) + self.assertEquals(42.5, config.getfloat('a', 'option', 25.3)) + self.assertEquals(0, config.getfloat('b', 'option2')) + self.assertEquals(25.3, config.getfloat('b', 'option2', 25.3)) + self.assertEquals(25.0, config.getfloat('b', 'option2', 25)) + self.assertEquals(25.3, config.getfloat('b', 'option2', '25.3')) + def test_read_and_getlist(self): self._write(['[a]', 'option = foo, bar, baz']) config = self._read() @@ -151,15 +174,34 @@ self.assertEquals(['', 'bar', 'baz'], config.getlist('a', 'option', keep_empty=True)) + def test_read_and_choice(self): + self._write(['[a]', 'option = 2', 'invalid = d']) + config = self._read() + + class Foo(object): + option = ChoiceOption('a', 'option', ['Item1', 2, '3']) + other = ChoiceOption('a', 'other', [1, 2, 3]) + invalid = ChoiceOption('a', 'invalid', ['a', 'b', 'c']) + + def __init__(self): + self.config = config + + foo = Foo() + self.assertEquals('2', foo.option) + self.assertEquals('1', foo.other) + self.assertRaises(ConfigurationError, getattr, foo, 'invalid') + def test_getpath(self): + base = os.path.dirname(self.filename) config = self._read() - config.set('a', 'path_a', '/somewhere/file.txt') - config.set('a', 'path_b', 'file.txt') - config.set('a', 'path_c', './file.txt') - self.assertEquals('/somewhere/file.txt', os.path.splitdrive( - config.getpath('a', 'path_a'))[1].replace('\\', '/')) - self.assertNotEquals('file.txt', config.getpath('a', 'path_b')) - self.assertEquals(config.getpath('a', 'path_b'), + config.set('a', 'path_a', os.path.join(base, 'here', 'absolute.txt')) + config.set('a', 'path_b', 'thisdir.txt') + config.set('a', 'path_c', os.path.join(os.pardir, 'parentdir.txt')) + self.assertEquals(os.path.join(base, 'here', 'absolute.txt'), + config.getpath('a', 'path_a')) + self.assertEquals(os.path.join(base, 'thisdir.txt'), + config.getpath('a', 'path_b')) + self.assertEquals(os.path.join(os.path.dirname(base), 'parentdir.txt'), config.getpath('a', 'path_c')) def test_set_and_save(self): @@ -335,6 +377,42 @@ self.assertEqual(True, 'a' in config) self._test_with_inherit(testcb) + def test_inherit_multiple(self): + class Foo(object): + option_b = Option('b', 'option2', 'default') + base = os.path.dirname(self.filename) + relsite1 = os.path.join('sub1', 'trac-site1.ini') + site1 = os.path.join(base, relsite1) + relsite2 = os.path.join('sub2', 'trac-site2.ini') + site2 = os.path.join(base, relsite2) + os.mkdir(os.path.dirname(site1)) + create_file(site1, '[a]\noption1 = x\n' + '[c]\noption = 1\npath1 = site1\n') + try: + os.mkdir(os.path.dirname(site2)) + create_file(site2, '[b]\noption2 = y\n' + '[c]\noption = 2\npath2 = site2\n') + try: + self._write(['[inherit]', + 'file = %s, %s' % (relsite1, relsite2)]) + config = self._read() + self.assertEqual('x', config.get('a', 'option1')) + self.assertEqual('y', config.get('b', 'option2')) + self.assertEqual('1', config.get('c', 'option')) + self.assertEqual(os.path.join(base, 'site1'), + config.getpath('c', 'path1')) + self.assertEqual(os.path.join(base, 'site2'), + config.getpath('c', 'path2')) + self.assertEqual('', + config.getpath('c', 'path3')) + self.assertEqual(os.path.join(base, 'site4'), + config.getpath('c', 'path4', 'site4')) + finally: + os.remove(site2) + os.rmdir(os.path.dirname(site2)) + finally: + os.remove(site1) + os.rmdir(os.path.dirname(site1)) def _test_with_inherit(self, testcb): sitename = os.path.join(tempfile.gettempdir(), 'trac-site.ini') diff -Nru trac-0.11.7/trac/tests/contentgen.py trac-0.12.1~ppa2/trac/tests/contentgen.py --- trac-0.11.7/trac/tests/contentgen.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/tests/contentgen.py 2010-03-01 09:28:24.000000000 +0000 @@ -38,18 +38,18 @@ def random_sentence(word_count=None): if word_count == None: - word_count = random.randint(1,20) - words = [random.choice(all_words) for x in range(word_count)] + word_count = random.randint(1, 20) + words = [random_word() for x in range(word_count)] return '%s.' % ' '.join(words) def random_paragraph(sentence_count=None): if sentence_count == None: - sentence_count = random.randint(1,10) - sentences = [random_sentence(random.randint(2,15)) for x in range(sentence_count)] + sentence_count = random.randint(1, 10) + sentences = [random_sentence(random.randint(2, 15)) for x in range(sentence_count)] return ' '.join(sentences) def random_page(paragraph_count=None): if paragraph_count == None: - paragraph_count = random.randint(1,10) - paragraphs = [random_paragraph(random.randint(1,5)) for x in range(paragraph_count)] + paragraph_count = random.randint(1, 10) + paragraphs = [random_paragraph(random.randint(1, 5)) for x in range(paragraph_count)] return '\r\n\r\n'.join(paragraphs) diff -Nru trac-0.11.7/trac/tests/core.py trac-0.12.1~ppa2/trac/tests/core.py --- trac-0.11.7/trac/tests/core.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/tests/core.py 2009-10-29 18:37:45.000000000 +0000 @@ -24,6 +24,11 @@ """Dummy function.""" +class IOtherTest(Interface): + def other_test(): + """Other dummy function.""" + + class ComponentTestCase(unittest.TestCase): def setUp(self): @@ -66,7 +71,8 @@ Make sure the component manager refuses to manage classes not derived from `Component`. """ - class NoComponent(object): pass + class NoComponent(object): + pass self.assertRaises(TracError, self.compmgr.__getitem__, NoComponent) def test_component_registration(self): @@ -127,22 +133,30 @@ """ try: implements() - self.fail('Expected AssertionError') except AssertionError: pass + else: + self.fail('Expected AssertionError') - def test_implements_called_twice(self): + def test_implements_multiple(self): """ - Verify that calling implements() twice in a class definition raises an - `AssertionError`. + Verify that a component "implementing" an interface more than once + (e.g. through inheritance) is not called more than once from an + extension point. """ - try: - class ComponentA(Component): - implements() - implements() - self.fail('Expected AssertionError') - except AssertionError: - pass + log = [] + class Parent(Component): + abstract = True + implements(ITest) + class Child(Parent): + implements(ITest) + def test(self): + log.append("call") + class Other(Component): + tests = ExtensionPoint(ITest) + for test in Other(self.compmgr).tests: + test.test() + self.assertEqual(["call"], log) def test_attribute_access(self): """ @@ -195,7 +209,8 @@ tests = ExtensionPoint(ITest) class ComponentB(Component): implements(ITest) - def test(self): return 'x' + def test(self): + return 'x' tests = iter(ComponentA(self.compmgr).tests) self.assertEquals('x', tests.next().test()) self.assertRaises(StopIteration, tests.next) @@ -209,14 +224,14 @@ tests = ExtensionPoint(ITest) class ComponentB(Component): implements(ITest) - def test(self): return 'x' + def test(self): + return 'x' class ComponentC(Component): implements(ITest) - def test(self): return 'y' - tests = iter(ComponentA(self.compmgr).tests) - self.assertEquals('x', tests.next().test()) - self.assertEquals('y', tests.next().test()) - self.assertRaises(StopIteration, tests.next) + def test(self): + return 'y' + results = [test.test() for test in ComponentA(self.compmgr).tests] + self.assertEquals(['x', 'y'], sorted(results)) def test_inherited_extension_point(self): """ @@ -228,7 +243,8 @@ pass class ExtendingComponent(Component): implements(ITest) - def test(self): return 'x' + def test(self): + return 'x' tests = iter(ConcreteComponent(self.compmgr).tests) self.assertEquals('x', tests.next().test()) self.assertRaises(StopIteration, tests.next) @@ -244,8 +260,25 @@ class ConcreteComponent(BaseComponent): pass from trac.core import ComponentMeta - assert ConcreteComponent in ComponentMeta._registry[ITest] + assert ConcreteComponent in ComponentMeta._registry.get(ITest, []) + def test_inherited_implements_multilevel(self): + """ + Verify that extension point interfaces are inherited for more than + one level of inheritance. + """ + class BaseComponent(Component): + implements(ITest) + abstract = True + class ChildComponent(BaseComponent): + implements(IOtherTest) + abstract = True + class ConcreteComponent(ChildComponent): + pass + from trac.core import ComponentMeta + assert ConcreteComponent in ComponentMeta._registry.get(ITest, []) + assert ConcreteComponent in ComponentMeta._registry.get(IOtherTest, []) + def test_component_manager_component(self): """ Verify that a component manager can itself be a component with its own @@ -259,7 +292,8 @@ self.foo, self.bar = foo, bar class Extender(Component): implements(ITest) - def test(self): return 'x' + def test(self): + return 'x' mgr = ManagerComponent('Test', 42) assert id(mgr) == id(mgr[ManagerComponent]) tests = iter(mgr.tests) diff -Nru trac-0.11.7/trac/tests/env.py trac-0.12.1~ppa2/trac/tests/env.py --- trac-0.11.7/trac/tests/env.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/tests/env.py 2009-10-29 18:37:45.000000000 +0000 @@ -1,5 +1,4 @@ from trac import db_default -from trac.db import sqlite_backend from trac.env import Environment import os.path @@ -36,7 +35,7 @@ ('joe', 1, 'email', 'joe@example.com'), ('jane', 1, 'name', 'Jane')]) users = {} - for username,name,email in self.env.get_known_users(self.db): + for username, name, email in self.env.get_known_users(self.db): users[username] = (name, email) assert not users.has_key('anonymous') diff -Nru trac-0.11.7/trac/tests/figleaf-exclude trac-0.12.1~ppa2/trac/tests/figleaf-exclude --- trac-0.11.7/trac/tests/figleaf-exclude 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/tests/figleaf-exclude 2010-04-23 14:23:43.000000000 +0100 @@ -7,4 +7,4 @@ genshi/ pygments/ .*.html -/tests/ +\\lib\\ \ No newline at end of file diff -Nru trac-0.11.7/trac/tests/functional/better_twill.py trac-0.12.1~ppa2/trac/tests/functional/better_twill.py --- trac-0.11.7/trac/tests/functional/better_twill.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/tests/functional/better_twill.py 2010-03-23 08:55:39.000000000 +0000 @@ -41,11 +41,21 @@ # #5497). Therefore we turn it off here. twill.commands.config('use_tidy', '0') + # We use a transparent proxy to access the global browser object through + # twill.get_browser(), as the browser can be destroyed by browser_reset() + # (see #7472). + class _BrowserProxy(object): + def __getattribute__(self, name): + return getattr(twill.get_browser(), name) + + def __setattr__(self, name, value): + setattr(twill.get_browser(), name, value) + # setup short names to reduce typing # This twill browser (and the tc commands that use it) are essentially # global, and not tied to our test fixture. tc = twill.commands - b = twill.get_browser() + b = _BrowserProxy() # Setup XHTML validation for all retrieved pages try: @@ -91,7 +101,12 @@ return etree.clear_error_log() try: - doc = etree.parse(StringIO(page), base_url=b.get_url()) + # lxml will try to convert the URL to unicode by itself, + # this won't work for non-ascii URLs, so help him + url = b.get_url() + if isinstance(url, str): + url = unicode(url, 'latin1') + etree.parse(StringIO(page), base_url=url) except etree.XMLSyntaxError, e: raise twill.errors.TwillAssertionError( _format_error_log(page, e.error_log)) diff -Nru trac-0.11.7/trac/tests/functional/__init__.py trac-0.12.1~ppa2/trac/tests/functional/__init__.py --- trac-0.11.7/trac/tests/functional/__init__.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/tests/functional/__init__.py 2009-11-30 20:08:10.000000000 +0000 @@ -78,7 +78,6 @@ from trac.tests.contentgen import random_sentence, random_page, random_word, \ random_unique_camel -from trac.util.compat import sorted, reversed from trac.test import TestSetup, TestCaseSetup internal_error = 'Trac detected an internal error:' diff -Nru trac-0.11.7/trac/tests/functional/svntestenv.py trac-0.12.1~ppa2/trac/tests/functional/svntestenv.py --- trac-0.11.7/trac/tests/functional/svntestenv.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/tests/functional/svntestenv.py 2009-10-03 14:57:00.000000000 +0100 @@ -65,8 +65,10 @@ f.write(data) f.close() self.call_in_workdir(['svn', 'add', filename]) + environ = os.environ.copy() + environ['LC_ALL'] = 'C' # Force English messages in svn output = self.call_in_workdir(['svn', '--username=admin', 'commit', '-m', - 'Add %s' % filename, filename]) + 'Add %s' % filename, filename], environ=environ) try: revision = re.search(r'Committed revision ([0-9]+)\.', output).group(1) diff -Nru trac-0.11.7/trac/tests/functional/testcases.py trac-0.12.1~ppa2/trac/tests/functional/testcases.py --- trac-0.11.7/trac/tests/functional/testcases.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/tests/functional/testcases.py 2010-03-21 10:29:47.000000000 +0000 @@ -1,9 +1,7 @@ +# -*- encoding: utf-8 -*- #!/usr/bin/python import os -from subprocess import call -from tempfile import mkdtemp from trac.tests.functional import * -from trac.util.datefmt import format_date, utc class RegressionTestRev6017(FunctionalTwillTestCaseSetup): @@ -154,6 +152,31 @@ tc.notfind('Second Attachment') +class ErrorPageValidation(FunctionalTwillTestCaseSetup): + def runTest(self): + """Validate the error page""" + url = self._tester.url + '/wiki/WikiStart' + tc.go(url + '?version=bug') + tc.url(url) + tc.find('Trac detected an internal error:') + + +class RegressionTestTicket3663(FunctionalTwillTestCaseSetup): + def runTest(self): + """Regression test for non-UTF-8 PATH_INFO (#3663) + + Verify that URLs not encoded with UTF-8 are reported as invalid. + """ + # invalid PATH_INFO + self._tester.go_to_wiki(u'été'.encode('latin1')) + tc.code(404) + tc.find('Invalid URL encoding') + # invalid SCRIPT_NAME + tc.go(u'été'.encode('latin1')) + tc.code(404) + tc.find('Invalid URL encoding') + + def functionalSuite(): suite = FunctionalTestSuite() return suite @@ -168,6 +191,8 @@ suite.addTest(RegressionTestTicket3833c()) suite.addTest(RegressionTestTicket5572()) suite.addTest(RegressionTestTicket7209()) + suite.addTest(ErrorPageValidation()) + suite.addTest(RegressionTestTicket3663()) import trac.versioncontrol.tests trac.versioncontrol.tests.functionalSuite(suite) diff -Nru trac-0.11.7/trac/tests/functional/testenv.py trac-0.12.1~ppa2/trac/tests/functional/testenv.py --- trac-0.11.7/trac/tests/functional/testenv.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/tests/functional/testenv.py 2010-04-23 17:00:31.000000000 +0100 @@ -13,26 +13,26 @@ import locale from subprocess import call, Popen, PIPE, STDOUT -from trac.db.api import _parse_db_str from trac.env import open_environment from trac.test import EnvironmentStub, get_dburi from trac.tests.functional.compat import rmtree, close_fds from trac.tests.functional import logfile from trac.tests.functional.better_twill import tc, ConnectError -from trac.db.mysql_backend import MySQLConnection -from trac.db.postgres_backend import PostgreSQLConnection from trac.util.compat import close_fds -# TODO: refactor to support testing multiple frontends, backends (and maybe -# repositories and authentication). -# Frontends: -# tracd, ap2+mod_python, ap2+mod_wsgi, ap2+mod_fastcgi, ap2+cgi, -# lighty+fastcgi, lighty+cgi, cherrypy+wsgi -# Backends: -# sqlite2+pysqlite, sqlite3+pysqlite2, postgres python bindings #1, -# postgres python bindings #2, mysql with server v4, mysql with server v5 -# (those need to test search escaping, among many other things like long -# paths in browser and unicode chars being allowed/translating...) +# TODO: refactor to support testing multiple frontends, backends +# (and maybe repositories and authentication). +# +# Frontends:: +# tracd, ap2+mod_python, ap2+mod_wsgi, ap2+mod_fastcgi, ap2+cgi, +# lighty+fastcgi, lighty+cgi, cherrypy+wsgi +# +# Backends:: +# sqlite2+pysqlite, sqlite3+pysqlite2, postgres python bindings #1, +# postgres python bindings #2, mysql with server v4, mysql with server v5 +# (those need to test search escaping, among many other things like long +# paths in browser and unicode chars being allowed/translating...) + class FunctionalTestEnvironment(object): """Common location for convenience functions that work with the test environment on Trac. Subclass this and override some methods if you are @@ -155,14 +155,19 @@ """Starts the webserver, and waits for it to come up.""" if 'FIGLEAF' in os.environ: exe = os.environ['FIGLEAF'] + if ' ' in exe: # e.g. 'coverage run' + args = exe.split() + else: + args = [exe] else: - exe = sys.executable + args = [sys.executable] options = ["--port=%s" % self.port, "-s", "--hostname=127.0.0.1", "--basic-auth=trac,%s," % self.htpasswd] if 'TRAC_TEST_TRACD_OPTIONS' in os.environ: options += os.environ['TRAC_TEST_TRACD_OPTIONS'].split() - server = Popen([exe, os.path.join(self.trac_src, 'trac', 'web', - 'standalone.py')] + options + [self.tracdir], + args.append(os.path.join(self.trac_src, 'trac', 'web', + 'standalone.py')) + server = Popen(args + options + [self.tracdir], stdout=logfile, stderr=logfile, close_fds=close_fds, cwd=self.command_cwd, @@ -182,11 +187,14 @@ tc.url(self.url) def stop(self): - """Stops the webserver, if running""" + """Stops the webserver, if running + + FIXME: probably needs a nicer way to exit for coverage to work + """ if self.pid: if os.name == 'nt': # Untested - call(["taskkill", "/f", "/pid", str(self.pid)], + res = call(["taskkill", "/f", "/pid", str(self.pid)], stdin=PIPE, stdout=PIPE, stderr=PIPE) else: os.kill(self.pid, signal.SIGINT) @@ -209,9 +217,9 @@ """Default to no repository""" return "''" # needed for Python 2.3 and 2.4 on win32 - def call_in_workdir(self, args): + def call_in_workdir(self, args, environ=None): proc = Popen(args, stdout=PIPE, stderr=logfile, - close_fds=close_fds, cwd=self.work_dir()) + close_fds=close_fds, cwd=self.work_dir(), env=environ) (data, _) = proc.communicate() if proc.wait(): raise Exception('Unable to run command %s in %s' % diff -Nru trac-0.11.7/trac/tests/functional/tester.py trac-0.12.1~ppa2/trac/tests/functional/tester.py --- trac-0.11.7/trac/tests/functional/tester.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/tests/functional/tester.py 2010-03-17 19:57:05.000000000 +0000 @@ -3,17 +3,10 @@ working with a Trac environment to make test cases more succinct. """ -import os -import re -from datetime import datetime, timedelta -from subprocess import call, Popen, PIPE -from tempfile import mkdtemp - -from trac.tests.functional import internal_error, logfile, close_fds, rmtree +from trac.tests.functional import internal_error from trac.tests.functional.better_twill import tc, b from trac.tests.contentgen import random_page, random_sentence, random_word, \ random_unique_camel -from trac.util.datefmt import format_date, utc from trac.util.text import unicode_quote try: @@ -183,6 +176,7 @@ tc.formvalue('attachment', 'replace', True) tc.submit() tc.url(self.url + '/attachment/ticket/%s/$' % ticketid) + return tempfilename def clone_ticket(self, ticketid): """Create a clone of the given ticket id using the clone button.""" @@ -205,7 +199,7 @@ page_url = self.url + "/wiki/" + page tc.go(page_url) tc.url(page_url) - tc.find("Describe %s here." % page) + tc.find("The page %s does not exist." % page) tc.formvalue('modifypage', 'action', 'edit') tc.submit() tc.url(page_url + '\\?action=edit') @@ -239,15 +233,14 @@ tc.formvalue('attachment', 'description', random_sentence()) tc.submit() tc.url(self.url + '/attachment/wiki/%s/$' % name) + return tempfilename def create_milestone(self, name=None, due=None): """Creates the specified milestone, with a random name if none is provided. Returns the name of the milestone. """ - find = False if name == None: name = random_unique_camel() - find = True milestone_url = self.url + "/admin/ticket/milestones" tc.go(milestone_url) tc.url(milestone_url) diff -Nru trac-0.11.7/trac/tests/__init__.py trac-0.12.1~ppa2/trac/tests/__init__.py --- trac-0.11.7/trac/tests/__init__.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/tests/__init__.py 2009-10-29 18:37:45.000000000 +0000 @@ -1,4 +1,3 @@ -import doctest import unittest from trac.tests import attachment, config, core, env, perm, resource, \ diff -Nru trac-0.11.7/trac/tests/notification.py trac-0.12.1~ppa2/trac/tests/notification.py --- trac-0.11.7/trac/tests/notification.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/tests/notification.py 2009-10-29 18:37:45.000000000 +0000 @@ -110,8 +110,8 @@ ST_QUIT = 5 def __init__(self, socket, impl): - self.impl = impl; - self.socket = socket; + self.impl = impl + self.socket = socket self.state = SMTPServerEngine.ST_INIT def chug(self): @@ -130,7 +130,7 @@ # this out. while not completeLine: try: - lump = self.socket.recv(1024); + lump = self.socket.recv(1024) if len(lump): data += lump if (len(data) >= 2) and data[-2:] == '\r\n': @@ -319,7 +319,7 @@ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) try: s.connect(('127.0.0.1', self.port)) - r = s.send("QUIT\r\n"); + r = s.send("QUIT\r\n") except socket.error: pass s.close() @@ -415,7 +415,7 @@ headers[lh][-1] = headers[lh][-1] + val else: # splits header name from value - (h,v) = line.split(':',1) + (h, v) = line.split(':', 1) val = decode_header(v.strip()) if headers.has_key(h): if isinstance(headers[h], tuple): diff -Nru trac-0.11.7/trac/tests/perm.py trac-0.12.1~ppa2/trac/tests/perm.py --- trac-0.11.7/trac/tests/perm.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/tests/perm.py 2009-08-30 09:55:02.000000000 +0100 @@ -1,7 +1,6 @@ from trac import perm from trac.core import * from trac.test import EnvironmentStub -from trac.util.compat import sorted, set import unittest @@ -89,8 +88,6 @@ class PermissionSystemTestCase(unittest.TestCase): def setUp(self): - from trac.core import ComponentMeta - self.env = EnvironmentStub(enable=[perm.PermissionSystem, perm.DefaultPermissionStore, TestPermissionRequestor]) diff -Nru trac-0.11.7/trac/tests/wikisyntax.py trac-0.12.1~ppa2/trac/tests/wikisyntax.py --- trac-0.11.7/trac/tests/wikisyntax.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/tests/wikisyntax.py 2009-11-30 20:08:10.000000000 +0000 @@ -11,7 +11,7 @@ from trac.web.href import Href from trac.wiki.tests import formatter -SEARCH_TEST_CASES=""" +SEARCH_TEST_CASES = """ ============================== search: link resolver search:foo search:"foo bar" @@ -40,7 +40,7 @@ ------------------------------ """ -ATTACHMENT_TEST_CASES=""" +ATTACHMENT_TEST_CASES = """ ============================== attachment: link resolver (deprecated) attachment:wiki:WikiStart:file.txt (deprecated) attachment:ticket:123:file.txt (deprecated) diff -Nru trac-0.11.7/trac/ticket/admin.py trac-0.12.1~ppa2/trac/ticket/admin.py --- trac-0.11.7/trac/ticket/admin.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/admin.py 2010-05-01 17:01:31.000000000 +0100 @@ -13,29 +13,39 @@ from datetime import datetime -from trac.admin import IAdminPanelProvider +from trac.admin import * from trac.core import * from trac.perm import PermissionSystem from trac.resource import ResourceNotFound from trac.ticket import model +from trac.util import getuser from trac.util.datefmt import utc, parse_date, get_date_format_hint, \ - get_datetime_format_hint -from trac.util.text import exception_to_unicode -from trac.util.translation import _ -from trac.web.chrome import add_link, add_notice, add_script, add_warning + get_datetime_format_hint, format_date, \ + format_datetime +from trac.util.text import print_table, printout, exception_to_unicode +from trac.util.translation import _, N_, gettext +from trac.web.chrome import Chrome, add_notice, add_warning class TicketAdminPanel(Component): - implements(IAdminPanelProvider) + implements(IAdminPanelProvider, IAdminCommandProvider) abstract = True + _label = (N_('(Undefined)'), N_('(Undefined)')) + + # i18n note: use gettext() whenever refering to the above as text labels, + # and don't use it whenever using them as field names (after + # a call to `.lower()`) + + # IAdminPanelProvider methods def get_admin_panels(self, req): if 'TICKET_ADMIN' in req.perm: - yield ('ticket', 'Ticket System', self._type, self._label[1]) + yield ('ticket', _('Ticket System'), self._type, + gettext(self._label[1])) def render_admin_panel(self, req, cat, page, version): req.perm.require('TICKET_ADMIN') @@ -63,7 +73,7 @@ class ComponentAdminPanel(TicketAdminPanel): _type = 'components' - _label = ('Component', 'Components') + _label = (N_('Component'), N_('Components')) # TicketAdminPanel methods @@ -82,7 +92,7 @@ elif req.args.get('cancel'): req.redirect(req.href.admin(cat, page)) - add_script(req, 'common/js/wikitoolbar.js') + Chrome(self.env).add_wiki_toolbars(req) data = {'view': 'detail', 'component': comp} else: @@ -92,7 +102,7 @@ if req.args.get('add') and req.args.get('name'): name = req.args.get('name') try: - model.Component(self.env, name=name) + comp = model.Component(self.env, name=name) except ResourceNotFound: comp = model.Component(self.env) comp.name = name @@ -103,7 +113,10 @@ 'added.', name=name)) req.redirect(req.href.admin(cat, page)) else: - raise TracError(_('Component %s already exists.') % name) + if comp.name is None: + raise TracError(_('Invalid component name.')) + raise TracError(_('Component %(name)s already exists.', + name=name)) # Remove components elif req.args.get('remove'): @@ -112,11 +125,11 @@ raise TracError(_('No component selected')) if not isinstance(sel, list): sel = [sel] - db = self.env.get_db_cnx() - for name in sel: - comp = model.Component(self.env, name, db=db) - comp.delete(db=db) - db.commit() + @self.env.with_transaction() + def do_remove(db): + for name in sel: + comp = model.Component(self.env, name, db=db) + comp.delete() add_notice(req, _('The selected components have been ' 'removed.')) req.redirect(req.href.admin(cat, page)) @@ -148,11 +161,84 @@ return 'admin_components.html', data + # IAdminCommandProvider methods + + def get_admin_commands(self): + yield ('component list', '', + 'Show available components', + None, self._do_list) + yield ('component add', ' ', + 'Add a new component', + self._complete_add, self._do_add) + yield ('component rename', ' ', + 'Rename a component', + self._complete_remove_rename, self._do_rename) + yield ('component remove', '', + 'Remove/uninstall a component', + self._complete_remove_rename, self._do_remove) + yield ('component chown', ' ', + 'Change component ownership', + self._complete_chown, self._do_chown) + + def get_component_list(self): + return [c.name for c in model.Component.select(self.env)] + + def get_user_list(self): + db = self.env.get_db_cnx() + cursor = db.cursor() + cursor.execute("SELECT DISTINCT username FROM permission") + return [row[0] for row in cursor] + + def _complete_add(self, args): + if len(args) == 2: + return self.get_user_list() + + def _complete_remove_rename(self, args): + if len(args) == 1: + return self.get_component_list() + + def _complete_chown(self, args): + if len(args) == 1: + return self.get_component_list() + elif len(args) == 2: + return self.get_user_list() + + def _do_list(self): + print_table([(c.name, c.owner) + for c in model.Component.select(self.env)], + [_('Name'), _('Owner')]) + + def _do_add(self, name, owner): + component = model.Component(self.env) + component.name = name + component.owner = owner + component.insert() + + def _do_rename(self, name, newname): + @self.env.with_transaction() + def do_rename(db): + component = model.Component(self.env, name, db=db) + component.name = newname + component.update() + + def _do_remove(self, name): + @self.env.with_transaction() + def do_remove(db): + component = model.Component(self.env, name, db=db) + component.delete() + + def _do_chown(self, name, owner): + @self.env.with_transaction() + def do_chown(db): + component = model.Component(self.env, name, db=db) + component.owner = owner + component.update() + class MilestoneAdminPanel(TicketAdminPanel): _type = 'milestones' - _label = ('Milestone', 'Milestones') + _label = (N_('Milestone'), N_('Milestones')) # IAdminPanelProvider methods @@ -191,7 +277,7 @@ elif req.args.get('cancel'): req.redirect(req.href.admin(cat, page)) - add_script(req, 'common/js/wikitoolbar.js') + Chrome(self.env).add_wiki_toolbars(req) data = {'view': 'detail', 'milestone': mil} else: @@ -202,7 +288,7 @@ req.perm.require('MILESTONE_CREATE') name = req.args.get('name') try: - model.Milestone(self.env, name=name) + mil = model.Milestone(self.env, name=name) except ResourceNotFound: mil = model.Milestone(self.env) mil.name = name @@ -214,7 +300,10 @@ 'added.', name=name)) req.redirect(req.href.admin(cat, page)) else: - raise TracError(_('Milestone %s already exists.') % name) + if mil.name is None: + raise TracError(_('Invalid milestone name.')) + raise TracError(_('Milestone %(name)s already exists.', + name=name)) # Remove milestone elif req.args.get('remove'): @@ -224,11 +313,11 @@ raise TracError(_('No milestone selected')) if not isinstance(sel, list): sel = [sel] - db = self.env.get_db_cnx() - for name in sel: - mil = model.Milestone(self.env, name, db=db) - mil.delete(db=db, author=req.authname) - db.commit() + @self.env.with_transaction() + def do_remove(db): + for name in sel: + mil = model.Milestone(self.env, name, db=db) + mil.delete(author=req.authname) add_notice(req, _('The selected milestones have been ' 'removed.')) req.redirect(req.href.admin(cat, page)) @@ -261,11 +350,94 @@ }) return 'admin_milestones.html', data + # IAdminCommandProvider methods + + def get_admin_commands(self): + yield ('milestone list', '', + 'Show milestones', + None, self._do_list) + yield ('milestone add', ' [due]', + 'Add milestone', + None, self._do_add) + yield ('milestone rename', ' ', + 'Rename milestone', + self._complete_name, self._do_rename) + yield ('milestone due', ' ', + """Set milestone due date + + The date must be specified in the "%s" format. + Alternatively, "now" can be used to set the due date to the + current time. To remove the due date from a milestone, specify + an empty string (""). + """ % console_date_format_hint, + self._complete_name, self._do_due) + yield ('milestone completed', ' ', + """Set milestone complete date + + The date must be specified in the "%s" format. + Alternatively, "now" can be used to set the completion date to + the current time. To remove the completion date from a + milestone, specify an empty string (""). + """ % console_date_format_hint, + self._complete_name, self._do_completed) + yield ('milestone remove', '', + 'Remove milestone', + self._complete_name, self._do_remove) + + def get_milestone_list(self): + return [m.name for m in model.Milestone.select(self.env)] + + def _complete_name(self, args): + if len(args) == 1: + return self.get_milestone_list() + + def _do_list(self): + print_table([(m.name, m.due and + format_date(m.due, console_date_format), + m.completed and + format_datetime(m.completed, console_datetime_format)) + for m in model.Milestone.select(self.env)], + [_('Name'), _('Due'), _('Completed')]) + + def _do_add(self, name, due=None): + milestone = model.Milestone(self.env) + milestone.name = name + if due is not None: + milestone.due = parse_date(due) + milestone.insert() + + def _do_rename(self, name, newname): + @self.env.with_transaction() + def do_rename(db): + milestone = model.Milestone(self.env, name, db=db) + milestone.name = newname + milestone.update() + + def _do_due(self, name, due): + @self.env.with_transaction() + def do_due(db): + milestone = model.Milestone(self.env, name, db=db) + milestone.due = due and parse_date(due) + milestone.update() + + def _do_completed(self, name, completed): + @self.env.with_transaction() + def do_completed(db): + milestone = model.Milestone(self.env, name, db=db) + milestone.completed = completed and parse_date(completed) + milestone.update() + + def _do_remove(self, name): + @self.env.with_transaction() + def do_remove(db): + milestone = model.Milestone(self.env, name, db=db) + milestone.delete(author=getuser()) + class VersionAdminPanel(TicketAdminPanel): _type = 'versions' - _label = ('Version', 'Versions') + _label = (N_('Version'), N_('Versions')) # TicketAdminPanel methods @@ -287,7 +459,7 @@ elif req.args.get('cancel'): req.redirect(req.href.admin(cat, page)) - add_script(req, 'common/js/wikitoolbar.js') + Chrome(self.env).add_wiki_toolbars(req) data = {'view': 'detail', 'version': ver} else: @@ -297,7 +469,7 @@ if req.args.get('add') and req.args.get('name'): name = req.args.get('name') try: - model.Version(self.env, name=name) + ver = model.Version(self.env, name=name) except ResourceNotFound: ver = model.Version(self.env) ver.name = name @@ -309,7 +481,10 @@ 'added.', name=name)) req.redirect(req.href.admin(cat, page)) else: - raise TracError(_('Version %s already exists.') % name) + if ver.name is None: + raise TracError(_('Invalid version name.')) + raise TracError(_('Version %(name)s already exists.', + name=name)) # Remove versions elif req.args.get('remove'): @@ -318,11 +493,11 @@ raise TracError(_('No version selected')) if not isinstance(sel, list): sel = [sel] - db = self.env.get_db_cnx() - for name in sel: - ver = model.Version(self.env, name, db=db) - ver.delete(db=db) - db.commit() + @self.env.with_transaction() + def do_remove(db): + for name in sel: + ver = model.Version(self.env, name, db=db) + ver.delete() add_notice(req, _('The selected versions have been ' 'removed.')) req.redirect(req.href.admin(cat, page)) @@ -345,20 +520,84 @@ }) return 'admin_versions.html', data + # IAdminCommandProvider methods + + def get_admin_commands(self): + yield ('version list', '', + 'Show versions', + None, self._do_list) + yield ('version add', ' [time]', + 'Add version', + None, self._do_add) + yield ('version rename', ' ', + 'Rename version', + self._complete_name, self._do_rename) + yield ('version time', ' ', + """Set version date + + The must be specified in the "%s" format. Alternatively, + "now" can be used to set the version date to the current time. + To remove the date from a version, specify an empty string + (""). + """ % console_date_format_hint, + self._complete_name, self._do_time) + yield ('version remove', '', + 'Remove version', + self._complete_name, self._do_remove) + + def get_version_list(self): + return [v.name for v in model.Version.select(self.env)] + + def _complete_name(self, args): + if len(args) == 1: + return self.get_version_list() + + def _do_list(self): + print_table([(v.name, + v.time and format_date(v.time, console_date_format)) + for v in model.Version.select(self.env)], + [_('Name'), _('Time')]) + + def _do_add(self, name, time=None): + version = model.Version(self.env) + version.name = name + if time is not None: + version.time = time and parse_date(time) + version.insert() + + def _do_rename(self, name, newname): + @self.env.with_transaction() + def do_rename(db): + version = model.Version(self.env, name, db=db) + version.name = newname + version.update() + + def _do_time(self, name, time): + @self.env.with_transaction() + def do_time(db): + version = model.Version(self.env, name, db=db) + version.time = time and parse_date(time) + version.update() + + def _do_remove(self, name): + @self.env.with_transaction() + def do_remove(db): + version = model.Version(self.env, name, db=db) + version.delete() + class AbstractEnumAdminPanel(TicketAdminPanel): - implements(IAdminPanelProvider) + abstract = True _type = 'unknown' _enum_cls = None - _label = ('(Undefined)', '(Undefined)') # TicketAdminPanel methods def _render_admin_panel(self, req, cat, page, path_info): - data = {'label_singular': self._label[0], - 'label_plural': self._label[1]} + label = [gettext(each) for each in self._label] + data = {'label_singular': label[0], 'label_plural': label[1]} # Detail view? if path_info: @@ -380,19 +619,22 @@ if req.args.get('add') and req.args.get('name'): name = req.args.get('name') try: - self._enum_cls(self.env, name=name) + enum = self._enum_cls(self.env, name=name) except: enum = self._enum_cls(self.env) enum.name = name enum.insert() - add_notice(req, _('The %(field)s "%(name)s" has been ' - 'added.', - field=self._label[0].lower(), - name=name)) + add_notice(req, _('The %(field)s value "%(name)s" has ' + 'been added.', + field=label[0], name=name)) req.redirect(req.href.admin(cat, page)) else: - raise TracError(_('%s %s already exists') % (self._type.title(), name)) - + if enum.name is None: + raise TracError(_('Invalid %(type)s value.', + type=label[0])) + raise TracError(_('%(type)s value "%(name)s" already ' + 'exists', type=label[0], name=name)) + # Remove enums elif req.args.get('remove'): sel = req.args.get('sel') @@ -400,19 +642,18 @@ raise TracError(_('No %s selected') % self._type) if not isinstance(sel, list): sel = [sel] - db = self.env.get_db_cnx() - for name in sel: - enum = self._enum_cls(self.env, name, db=db) - enum.delete(db=db) - db.commit() - add_notice(req, _('The selected %(fields)s have been ' - 'removed.', - fields=self._label[1].lower())) + @self.env.with_transaction() + def do_remove(db): + for name in sel: + enum = self._enum_cls(self.env, name, db=db) + enum.delete() + add_notice(req, _('The selected %(field)s values have ' + 'been removed.', field=label[0])) req.redirect(req.href.admin(cat, page)) - # Appy changes + # Apply changes elif req.args.get('apply'): - changed = False + changed = [False] # Set default value name = req.args.get('default') @@ -423,7 +664,7 @@ name) try: self.config.save() - changed = True + changed[0] = True except Exception, e: self.log.error('Error writing to trac.ini: %s', exception_to_unicode(e)) @@ -441,16 +682,16 @@ values = dict([(val, True) for val in order.values()]) if len(order) != len(values): raise TracError(_('Order numbers must be unique')) - db = self.env.get_db_cnx() - for enum in self._enum_cls.select(self.env, db=db): - new_value = order[enum.value] - if new_value != enum.value: - enum.value = new_value - enum.update(db=db) - changed = True - db.commit() + @self.env.with_transaction() + def do_change(db): + for enum in self._enum_cls.select(self.env, db=db): + new_value = order[enum.value] + if new_value != enum.value: + enum.value = new_value + enum.update() + changed[0] = True - if changed: + if changed[0]: add_notice(req, _('Your changes have been saved.')) req.redirect(req.href.admin(cat, page)) @@ -458,26 +699,143 @@ default=default, view='list')) return 'admin_enums.html', data + # IAdminCommandProvider methods + + _command_help = { + 'list': 'Show possible ticket %s', + 'add': 'Add a %s value option', + 'change': 'Change a %s value', + 'remove': 'Remove a %s value', + 'order': 'Move a %s value up or down in the list', + } + + def get_admin_commands(self): + enum_type = getattr(self, '_command_type', self._type) + label = tuple(each.lower() for each in self._label) + yield ('%s list' % enum_type, '', + self._command_help['list'] % label[1], + None, self._do_list) + yield ('%s add' % enum_type, '', + self._command_help['add'] % label[0], + None, self._do_add) + yield ('%s change' % enum_type, ' ', + self._command_help['change'] % label[0], + self._complete_change_remove, self._do_change) + yield ('%s remove' % enum_type, '', + self._command_help['remove'] % label[0], + self._complete_change_remove, self._do_remove) + yield ('%s order' % enum_type, ' up|down', + self._command_help['order'] % label[0], + self._complete_order, self._do_order) + + def get_enum_list(self): + return [e.name for e in self._enum_cls.select(self.env)] + + def _complete_change_remove(self, args): + if len(args) == 1: + return self.get_enum_list() + + def _complete_order(self, args): + if len(args) == 1: + return self.get_enum_list() + elif len(args) == 2: + return ['up', 'down'] + + def _do_list(self): + print_table([(e.name,) for e in self._enum_cls.select(self.env)], + [_('Possible Values')]) + + def _do_add(self, name): + enum = self._enum_cls(self.env) + enum.name = name + enum.insert() + + def _do_change(self, name, newname): + @self.env.with_transaction() + def do_change(db): + enum = self._enum_cls(self.env, name, db=db) + enum.name = newname + enum.update() + + def _do_remove(self, value): + @self.env.with_transaction() + def do_remove(db): + enum = self._enum_cls(self.env, value, db=db) + enum.delete() + + def _do_order(self, name, up_down): + if up_down not in ('up', 'down'): + raise AdminCommandError(_("Invalid up/down value: %(value)s", + value=up_down)) + direction = up_down == 'up' and -1 or 1 + db = self.env.get_db_cnx() + enum1 = self._enum_cls(self.env, name, db=db) + enum1.value = int(float(enum1.value) + direction) + for enum2 in self._enum_cls.select(self.env, db=db): + if int(float(enum2.value)) == enum1.value: + enum2.value = int(float(enum2.value) - direction) + break + else: + return + @self.env.with_transaction() + def do_order(db): + enum1.update() + enum2.update() + class PriorityAdminPanel(AbstractEnumAdminPanel): _type = 'priority' _enum_cls = model.Priority - _label = ('Priority', 'Priorities') + _label = (N_('Priority'), N_('Priorities')) class ResolutionAdminPanel(AbstractEnumAdminPanel): _type = 'resolution' _enum_cls = model.Resolution - _label = ('Resolution', 'Resolutions') + _label = (N_('Resolution'), N_('Resolutions')) class SeverityAdminPanel(AbstractEnumAdminPanel): _type = 'severity' _enum_cls = model.Severity - _label = ('Severity', 'Severities') + _label = (N_('Severity'), N_('Severities')) class TicketTypeAdminPanel(AbstractEnumAdminPanel): _type = 'type' _enum_cls = model.Type - _label = ('Ticket Type', 'Ticket Types') + _label = (N_('Ticket Type'), N_('Ticket Types')) + + _command_type = 'ticket_type' + _command_help = { + 'list': 'Show possible %s', + 'add': 'Add a %s', + 'change': 'Change a %s', + 'remove': 'Remove a %s', + 'order': 'Move a %s up or down in the list', + } + + +class TicketAdmin(Component): + """trac-admin command provider for ticket administration.""" + + implements(IAdminCommandProvider) + + # IAdminCommandProvider methods + + def get_admin_commands(self): + yield ('ticket remove', '', + 'Remove ticket', + None, self._do_remove) + + def _do_remove(self, number): + try: + number = int(number) + except ValueError: + raise AdminCommandError(_(' must be a number')) + @self.env.with_transaction() + def do_remove(db): + ticket = model.Ticket(self.env, number, db=db) + ticket.delete() + printout(_('Ticket #%(num)s and all associated data removed.', + num=number)) diff -Nru trac-0.11.7/trac/ticket/api.py trac-0.12.1~ppa2/trac/ticket/api.py --- trac-0.11.7/trac/ticket/api.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/api.py 2010-04-05 14:16:58.000000000 +0100 @@ -14,24 +14,19 @@ # # Author: Jonas Borgström +import copy import re -from datetime import datetime -try: - import threading -except ImportError: - import dummy_threading as threading from genshi.builder import tag +from trac.cache import cached from trac.config import * from trac.core import * from trac.perm import IPermissionRequestor, PermissionCache, PermissionSystem from trac.resource import IResourceManager from trac.util import Ranges -from trac.util.compat import set, sorted -from trac.util.datefmt import utc -from trac.util.text import shorten_line, obfuscate_email_address -from trac.util.translation import _ +from trac.util.text import shorten_line +from trac.util.translation import _, N_, gettext from trac.wiki import IWikiSyntaxProvider, WikiParser @@ -143,10 +138,31 @@ ticket. Therefore, a return value of `[]` means everything is OK.""" +class IMilestoneChangeListener(Interface): + """Extension point interface for components that require notification + when milestones are created, modified, or deleted.""" + + def milestone_created(milestone): + """Called when a milestone is created.""" + + def milestone_changed(milestone, old_values): + """Called when a milestone is modified. + + `old_values` is a dictionary containing the previous values of the + milestone properties that changed. Currently those properties can be + 'name', 'due', 'completed', or 'description'. + """ + + def milestone_deleted(milestone): + """Called when a milestone is deleted.""" + + class TicketSystem(Component): implements(IPermissionRequestor, IWikiSyntaxProvider, IResourceManager) change_listeners = ExtensionPoint(ITicketChangeListener) + milestone_change_listeners = ExtensionPoint(IMilestoneChangeListener) + action_controllers = OrderedExtensionsOption('ticket', 'workflow', ITicketActionController, default='ConfigurableTicketWorkflow', include_missing=False, @@ -160,13 +176,46 @@ [TracTickets#Assign-toasDrop-DownList Assign-to as Drop-Down List] (''since 0.9'').""") - _fields = None - _custom_fields = None + default_version = Option('ticket', 'default_version', '', + """Default version for newly created tickets.""") + + default_type = Option('ticket', 'default_type', 'defect', + """Default type for newly created tickets (''since 0.9'').""") + + default_priority = Option('ticket', 'default_priority', 'major', + """Default priority for newly created tickets.""") + + default_milestone = Option('ticket', 'default_milestone', '', + """Default milestone for newly created tickets.""") + + default_component = Option('ticket', 'default_component', '', + """Default component for newly created tickets.""") + + default_severity = Option('ticket', 'default_severity', '', + """Default severity for newly created tickets.""") + + default_summary = Option('ticket', 'default_summary', '', + """Default summary (title) for newly created tickets.""") + + default_description = Option('ticket', 'default_description', '', + """Default description for newly created tickets.""") + + default_keywords = Option('ticket', 'default_keywords', '', + """Default keywords for newly created tickets.""") + + default_owner = Option('ticket', 'default_owner', '', + """Default owner for newly created tickets.""") + + default_cc = Option('ticket', 'default_cc', '', + """Default cc: list for newly created tickets.""") + + default_resolution = Option('ticket', 'default_resolution', 'fixed', + """Default resolution for resolving (closing) tickets + (''since 0.11'').""") def __init__(self): self.log.debug('action controllers for ticket workflow: %r' % [c.__class__.__name__ for c in self.action_controllers]) - self._fields_lock = threading.RLock() # Public API @@ -193,65 +242,69 @@ valid_states.update(controller.get_all_status()) return sorted(valid_states) + def get_ticket_field_labels(self): + """Produce a (name,label) mapping from `get_ticket_fields`.""" + return dict((f['name'], f['label']) for f in + TicketSystem(self.env).get_ticket_fields()) + def get_ticket_fields(self): - """Returns the list of fields available for tickets.""" - # This is now cached - as it makes quite a number of things faster, - # e.g. #6436 - if self._fields is None: - self._fields_lock.acquire() - try: - if self._fields is None: # double-check (race after 1st check) - self._fields = self._get_ticket_fields() - finally: - self._fields_lock.release() - return [f.copy() for f in self._fields] + """Returns list of fields available for tickets. + + Each field is a dict with at least the 'name', 'label' (localized) + and 'type' keys. + It may in addition contain the 'custom' key, the 'optional' and the + 'options' keys. When present 'custom' and 'optional' are always `True`. + """ + fields = copy.deepcopy(self.fields) + label = 'label' # workaround gettext extraction bug + for f in fields: + f[label] = gettext(f[label]) + return fields def reset_ticket_fields(self): - self._fields_lock.acquire() - try: - self._fields = None - self.config.touch() # brute force approach for now - finally: - self._fields_lock.release() + """Invalidate ticket field cache.""" + del self.fields - def _get_ticket_fields(self): + @cached + def fields(self, db): + """Return the list of fields available for tickets.""" from trac.ticket import model - db = self.env.get_db_cnx() fields = [] # Basic text fields - for name in ('summary', 'reporter'): - field = {'name': name, 'type': 'text', 'label': name.title()} - fields.append(field) + fields.append({'name': 'summary', 'type': 'text', + 'label': N_('Summary')}) + fields.append({'name': 'reporter', 'type': 'text', + 'label': N_('Reporter')}) # Owner field, by default text but can be changed dynamically # into a drop-down depending on configuration (restrict_owner=true) - field = {'name': 'owner', 'label': 'Owner'} + field = {'name': 'owner', 'label': N_('Owner')} field['type'] = 'text' fields.append(field) # Description fields.append({'name': 'description', 'type': 'textarea', - 'label': 'Description'}) + 'label': N_('Description')}) # Default select and radio fields - selects = [('type', model.Type), - ('status', model.Status), - ('priority', model.Priority), - ('milestone', model.Milestone), - ('component', model.Component), - ('version', model.Version), - ('severity', model.Severity), - ('resolution', model.Resolution)] - for name, cls in selects: + selects = [('type', N_('Type'), model.Type), + ('status', N_('Status'), model.Status), + ('priority', N_('Priority'), model.Priority), + ('milestone', N_('Milestone'), model.Milestone), + ('component', N_('Component'), model.Component), + ('version', N_('Version'), model.Version), + ('severity', N_('Severity'), model.Severity), + ('resolution', N_('Resolution'), model.Resolution)] + for name, label, cls in selects: options = [val.name for val in cls.select(self.env, db=db)] if not options: # Fields without possible values are treated as if they didn't # exist continue - field = {'name': name, 'type': 'select', 'label': name.title(), - 'value': self.config.get('ticket', 'default_' + name), + field = {'name': name, 'type': 'select', 'label': label, + 'value': getattr(self, 'default_' + name, ''), 'options': options} if name in ('status', 'resolution'): field['type'] = 'radio' @@ -261,9 +314,15 @@ fields.append(field) # Advanced text fields - for name in ('keywords', 'cc', ): - field = {'name': name, 'type': 'text', 'label': name.title()} - fields.append(field) + fields.append({'name': 'keywords', 'type': 'text', + 'label': N_('Keywords')}) + fields.append({'name': 'cc', 'type': 'text', 'label': N_('Cc')}) + + # Date/time fields + fields.append({'name': 'time', 'type': 'time', + 'label': N_('Created')}) + fields.append({'name': 'changetime', 'type': 'time', + 'label': N_('Modified')}) for field in self.get_custom_fields(): if field['name'] in [f['name'] for f in fields]: @@ -285,19 +344,14 @@ reserved_field_names = ['report', 'order', 'desc', 'group', 'groupdesc', 'col', 'row', 'format', 'max', 'page', 'verbose', - 'comment'] + 'comment', 'or'] def get_custom_fields(self): - if self._custom_fields is None: - self._fields_lock.acquire() - try: - if self._custom_fields is None: # double-check - self._custom_fields = self._get_custom_fields() - finally: - self._fields_lock.release() - return [f.copy() for f in self._custom_fields] + return copy.deepcopy(self.custom_fields) - def _get_custom_fields(self): + @cached + def custom_fields(self, db): + """Return the list of custom ticket fields available for tickets.""" fields = [] config = self.config['ticket-custom'] for name in [option for option, value in config.options() @@ -325,6 +379,12 @@ fields.sort(lambda x, y: cmp(x['order'], y['order'])) return fields + def get_field_synonyms(self): + """Return a mapping from field name synonyms to field names. + The synonyms are supposed to be more intuitive for custom queries.""" + # i18n TODO - translated keys + return {'created': 'time', 'modified': 'changetime'} + def eventually_restrict_owner(self, field, ticket=None): """Restrict given owner field to be a list of users having the TICKET_MODIFY permission (for the given ticket) @@ -347,10 +407,12 @@ def get_permission_actions(self): return ['TICKET_APPEND', 'TICKET_CREATE', 'TICKET_CHGPROP', 'TICKET_VIEW', 'TICKET_EDIT_CC', 'TICKET_EDIT_DESCRIPTION', + 'TICKET_EDIT_COMMENT', ('TICKET_MODIFY', ['TICKET_APPEND', 'TICKET_CHGPROP']), ('TICKET_ADMIN', ['TICKET_CREATE', 'TICKET_MODIFY', 'TICKET_VIEW', 'TICKET_EDIT_CC', - 'TICKET_EDIT_DESCRIPTION'])] + 'TICKET_EDIT_DESCRIPTION', + 'TICKET_EDIT_COMMENT'])] # IWikiSyntaxProvider methods diff -Nru trac-0.11.7/trac/ticket/default_workflow.py trac-0.12.1~ppa2/trac/ticket/default_workflow.py --- trac-0.11.7/trac/ticket/default_workflow.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/default_workflow.py 2010-04-23 11:29:22.000000000 +0100 @@ -25,8 +25,8 @@ from trac.env import IEnvironmentSetupParticipant from trac.config import Configuration from trac.ticket.api import ITicketActionController, TicketSystem -from trac.util.compat import set -from trac.util.translation import _ +from trac.ticket.model import Resolution +from trac.util.translation import _, tag_ # -- Utilities for the ConfigurableTicketWorkflow @@ -98,8 +98,10 @@ class ConfigurableTicketWorkflow(Component): """Ticket action controller which provides actions according to a - workflow defined in the TracIni configuration file, inside the - [ticket-workflow] section. + workflow defined in trac.ini. + + The workflow is idefined in the `[ticket-workflow]` section of the + [wiki:TracIni#ticket-workflow-section trac.ini] configuration file. """ def __init__(self, *args, **kwargs): @@ -171,30 +173,31 @@ # once and get really confused. status = ticket._old.get('status', ticket['status']) or 'new' + ticket_perm = req.perm(ticket.resource) allowed_actions = [] for action_name, action_info in self.actions.items(): oldstates = action_info['oldstates'] if oldstates == ['*'] or status in oldstates: # This action is valid in this state. Check permissions. - allowed = 0 required_perms = action_info['permissions'] - if required_perms: - for permission in required_perms: - if permission in req.perm(ticket.resource): - allowed = 1 - break - else: - allowed = 1 - if allowed: + if self._is_action_allowed(ticket_perm, required_perms): allowed_actions.append((action_info['default'], action_name)) if not (status in ['new', 'closed'] or \ status in TicketSystem(self.env).get_all_status()) \ - and 'TICKET_ADMIN' in req.perm(ticket.resource): + and 'TICKET_ADMIN' in ticket_perm: # State no longer exists - add a 'reset' action if admin. allowed_actions.append((0, '_reset')) return allowed_actions + def _is_action_allowed(self, ticket_perm, required_perms): + if not required_perms: + return True + for permission in required_perms: + if permission in ticket_perm: + return True + return False + def get_all_status(self): """Return a list of all states described by the configuration. @@ -207,7 +210,6 @@ return all_status def render_ticket_action_control(self, req, ticket, action): - from trac.ticket import model self.log.debug('render_ticket_action_control: action "%s"' % action) @@ -239,27 +241,31 @@ if owners == None: owner = req.args.get(id, req.authname) - control.append(tag(['to ', tag.input(type='text', id=id, - name=id, value=owner)])) - hints.append(_("The owner will change from %(current_owner)s", + control.append(tag_('to %(owner)s', + owner=tag.input(type='text', id=id, + name=id, value=owner))) + hints.append(_("The owner will be changed from " + "%(current_owner)s", current_owner=current_owner)) elif len(owners) == 1: - control.append(tag('to %s ' % owners[0])) + control.append(tag_('to %(owner)s ', owner=owners[0])) if ticket['owner'] != owners[0]: - hints.append(_("The owner will change from " + hints.append(_("The owner will be changed from " "%(current_owner)s to %(selected_owner)s", current_owner=current_owner, selected_owner=owners[0])) else: - control.append(tag([_("to "), tag.select( - [tag.option(x, selected=(x == selected_owner or None)) + control.append(tag_('to %(owner)s', owner=tag.select( + [tag.option(x, value=x, + selected=(x == selected_owner or None)) for x in owners], - id=id, name=id)])) - hints.append(_("The owner will change from %(current_owner)s", + id=id, name=id))) + hints.append(_("The owner will be changed from " + "%(current_owner)s", current_owner=current_owner)) if 'set_owner_to_self' in operations and \ ticket._old.get('owner', ticket['owner']) != req.authname: - hints.append(_("The owner will change from %(current_owner)s " + hints.append(_("The owner will be changed from %(current_owner)s " "to %(authname)s", current_owner=current_owner, authname=req.authname)) if 'set_resolution' in operations: @@ -267,33 +273,36 @@ resolutions = [x.strip() for x in this_action['set_resolution'].split(',')] else: - resolutions = [val.name for val in - model.Resolution.select(self.env)] + resolutions = [val.name for val in Resolution.select(self.env)] if not resolutions: raise TracError(_("Your workflow attempts to set a resolution " "but none is defined (configuration issue, " "please contact your Trac admin).")) if len(resolutions) == 1: - control.append(tag('as %s' % resolutions[0])) - hints.append(_("The resolution will be set to %s") % - resolutions[0]) + control.append(tag_('as %(resolution)s', + resolution=resolutions[0])) + hints.append(_("The resolution will be set to %(name)s", + name=resolutions[0])) else: id = 'action_%s_resolve_resolution' % action - selected_option = req.args.get(id, - self.config.get('ticket', 'default_resolution')) - control.append(tag(['as ', tag.select( - [tag.option(x, selected=(x == selected_option or None)) + selected_option = req.args.get(id, + TicketSystem(self.env).default_resolution) + control.append(tag_('as %(resolution)s', + resolution=tag.select( + [tag.option(x, value=x, + selected=(x == selected_option or None)) for x in resolutions], - id=id, name=id)])) + id=id, name=id))) hints.append(_("The resolution will be set")) if 'del_resolution' in operations: hints.append(_("The resolution will be deleted")) if 'leave_status' in operations: - control.append('as %s ' % ticket._old.get('status', - ticket['status'])) + control.append(_('as %(status)s ', + status= ticket._old.get('status', + ticket['status']))) else: if status != '*': - hints.append(_("Next status will be '%s'") % status) + hints.append(_("Next status will be '%(name)s'", name=status)) return (this_action['name'], tag(*control), '. '.join(hints)) def get_ticket_changes(self, req, ticket, action): @@ -314,7 +323,7 @@ for operation in this_action['operations']: if operation == 'reset_workflow': updated['status'] = 'new' - if operation == 'del_owner': + elif operation == 'del_owner': updated['owner'] = '' elif operation == 'set_owner': newowner = req.args.get('action_%s_reassign_owner' % action, @@ -326,8 +335,7 @@ updated['owner'] = newowner elif operation == 'set_owner_to_self': updated['owner'] = req.authname - - if operation == 'del_resolution': + elif operation == 'del_resolution': updated['resolution'] = '' elif operation == 'set_resolution': newresolution = req.args.get('action_%s_resolve_resolution' % \ diff -Nru trac-0.11.7/trac/ticket/model.py trac-0.12.1~ppa2/trac/ticket/model.py --- trac-0.11.7/trac/ticket/model.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/model.py 2010-04-28 22:18:37.000000000 +0100 @@ -18,16 +18,15 @@ # Christopher Lenz import re -import sys -import time from datetime import date, datetime from trac.attachment import Attachment from trac.core import TracError from trac.resource import Resource, ResourceNotFound from trac.ticket.api import TicketSystem -from trac.util import embedded_numbers, partition, sorted -from trac.util.datefmt import utc, utcmax, to_timestamp +from trac.util import embedded_numbers, partition +from trac.util.text import empty +from trac.util.datefmt import from_utimestamp, to_utimestamp, utc, utcmax from trac.util.translation import _ __all__ = ['Ticket', 'Type', 'Status', 'Resolution', 'Priority', 'Severity', @@ -37,30 +36,34 @@ class Ticket(object): # Fields that must not be modified directly by the user - protected_fields = ('resolution', 'status') - - id_is_valid = staticmethod(lambda num: 0 < int(num) <= 1L << 31) + protected_fields = ('resolution', 'status', 'time', 'changetime') + @staticmethod + def id_is_valid(num): + return 0 < int(num) <= 1L << 31 + + # 0.11 compatibility + time_created = property(lambda self: self.values.get('time')) + time_changed = property(lambda self: self.values.get('changetime')) + def __init__(self, env, tkt_id=None, db=None, version=None): self.env = env + if tkt_id is not None: + tkt_id = int(tkt_id) self.resource = Resource('ticket', tkt_id, version) self.fields = TicketSystem(self.env).get_ticket_fields() + self.time_fields = [f['name'] for f in self.fields + if f['type'] == 'time'] self.values = {} if tkt_id is not None: self._fetch_ticket(tkt_id, db) else: self._init_defaults(db) - self.id = self.time_created = self.time_changed = None + self.id = None self._old = {} def _get_db(self, db): - return db or self.env.get_db_cnx() - - def _get_db_for_write(self, db): - if db: - return (db, False) - else: - return (self.env.get_db_cnx(), True) + return db or self.env.get_read_db() exists = property(fget=lambda self: self.id is not None) @@ -92,35 +95,43 @@ db = self._get_db(db) # Fetch the standard ticket fields - std_fields = [f['name'] for f in self.fields if not f.get('custom')] + std_fields = [f['name'] for f in self.fields + if not f.get('custom')] cursor = db.cursor() - cursor.execute("SELECT %s,time,changetime FROM ticket WHERE id=%%s" + cursor.execute("SELECT %s FROM ticket WHERE id=%%s" % ','.join(std_fields), (tkt_id,)) row = cursor.fetchone() if not row: - raise ResourceNotFound('Ticket %s does not exist.' % tkt_id, - 'Invalid Ticket Number') + raise ResourceNotFound(_('Ticket %(id)s does not exist.', + id=tkt_id), _('Invalid ticket number')) self.id = tkt_id - for i in range(len(std_fields)): - if row[i] is not None: - self.values[std_fields[i]] = row[i] - self.time_created = datetime.fromtimestamp(row[len(std_fields)], utc) - self.time_changed = datetime.fromtimestamp(row[len(std_fields) + 1], utc) + for i, field in enumerate(std_fields): + value = row[i] + if field in self.time_fields: + self.values[field] = from_utimestamp(value) + elif value is None: + self.values[field] = empty + else: + self.values[field] = value # Fetch custom fields if available custom_fields = [f['name'] for f in self.fields if f.get('custom')] cursor.execute("SELECT name,value FROM ticket_custom WHERE ticket=%s", (tkt_id,)) for name, value in cursor: - if name in custom_fields and value is not None: - self.values[name] = value + if name in custom_fields: + if value is None: + self.values[name] = empty + else: + self.values[name] = value def __getitem__(self, name): return self.values.get(name) def __setitem__(self, name, value): - """Log ticket modifications so the table ticket_change can be updated""" + """Log ticket modifications so the table ticket_change can be updated + """ if name in self.values and self.values[name] == value: return if name not in self._old: # Changed field @@ -136,15 +147,17 @@ self.values[name] = value def get_value_or_default(self, name): - """Return the value of a field or the default value if it is - undefined""" + """Return the value of a field or the default value if it is undefined + """ try: - return self.values[name] - except KeyError: + value = self.values[name] + if value is not empty: + return value field = [field for field in self.fields if field['name'] == name] if field: - return field[0].get('value') - return None + return field[0].get('value', '') + except KeyError: + pass def populate(self, values): """Populate the ticket with 'suitable' values from a dictionary""" @@ -159,16 +172,16 @@ self[name[9:]] = '0' def insert(self, when=None, db=None): - """Add ticket to database""" + """Add ticket to database. + + The `db` argument is deprecated in favor of `with_transaction()`. + """ assert not self.exists, 'Cannot insert an existing ticket' - db, handle_ta = self._get_db_for_write(db) # Add a timestamp if when is None: when = datetime.now(utc) - self.time_created = self.time_changed = when - - cursor = db.cursor() + self.values['time'] = self.values['changetime'] = when # The owner field defaults to the component owner if self.values.get('component') and not self.values.get('owner'): @@ -176,13 +189,17 @@ component = Component(self.env, self['component'], db=db) if component.owner: self['owner'] = component.owner - except ResourceNotFound, e: + except ResourceNotFound: # No such component exists pass + # Perform type conversions + values = dict(self.values) + for field in self.time_fields: + if field in values: + values[field] = to_utimestamp(values[field]) + # Insert ticket record - created = to_timestamp(self.time_created) - changed = to_timestamp(self.time_changed) std_fields = [] custom_fields = [] for f in self.fields: @@ -192,22 +209,25 @@ custom_fields.append(fname) else: std_fields.append(fname) - cursor.execute("INSERT INTO ticket (%s,time,changetime) VALUES (%s)" - % (','.join(std_fields), - ','.join(['%s'] * (len(std_fields) + 2))), - [self[name] for name in std_fields] + [created, changed]) - tkt_id = db.get_last_id(cursor, 'ticket') - - # Insert custom fields - if custom_fields: - cursor.executemany("INSERT INTO ticket_custom (ticket,name,value) " - "VALUES (%s,%s,%s)", [(tkt_id, name, self[name]) - for name in custom_fields]) - if handle_ta: - db.commit() - self.id = tkt_id - self.resource = self.resource(id=tkt_id) + tkt_id = [None] + @self.env.with_transaction(db) + def do_insert(db): + cursor = db.cursor() + cursor.execute("INSERT INTO ticket (%s) VALUES (%s)" + % (','.join(std_fields), + ','.join(['%s'] * len(std_fields))), + [values[name] for name in std_fields]) + tkt_id[0] = db.get_last_id(cursor, 'ticket') + + # Insert custom fields + if custom_fields: + cursor.executemany(""" + INSERT INTO ticket_custom (ticket,name,value) VALUES (%s,%s,%s) + """, [(tkt_id[0], name, self[name]) for name in custom_fields]) + + self.id = tkt_id[0] + self.resource = self.resource(id=tkt_id[0]) self._old = {} for listener in TicketSystem(self.env).change_listeners: @@ -215,40 +235,40 @@ return self.id - def save_changes(self, author, comment, when=None, db=None, cnum=''): + def save_changes(self, author=None, comment=None, when=None, db=None, cnum=''): """ Store ticket changes in the database. The ticket must already exist in the database. Returns False if there were no changes to save, True otherwise. + + The `db` argument is deprecated in favor of `with_transaction()`. """ assert self.exists, 'Cannot update a new ticket' if not self._old and not comment: return False # Not modified - db, handle_ta = self._get_db_for_write(db) - cursor = db.cursor() if when is None: when = datetime.now(utc) - when_ts = to_timestamp(when) + when_ts = to_utimestamp(when) if 'component' in self.values: - # If the component is changed on a 'new' ticket then owner field - # is updated accordingly. (#623). + # If the component is changed on a 'new' ticket + # then owner field is updated accordingly. (#623). if self.values.get('status') == 'new' \ and 'component' in self._old \ and 'owner' not in self._old: try: - old_comp = Component(self.env, self._old['component'], db) + old_comp = Component(self.env, self._old['component']) old_owner = old_comp.owner or '' current_owner = self.values.get('owner') or '' if old_owner == current_owner: - new_comp = Component(self.env, self['component'], db) + new_comp = Component(self.env, self['component']) if new_comp.owner: self['owner'] = new_comp.owner - except TracError, e: - # If the old component has been removed from the database we - # just leave the owner as is. + except TracError: + # If the old component has been removed from the database + # we just leave the owner as is. pass # Fix up cc list separators and remove duplicates @@ -259,41 +279,75 @@ cclist.append(cc) self.values['cc'] = ', '.join(cclist) - custom_fields = [f['name'] for f in self.fields if f.get('custom')] - for name in self._old.keys(): - if name in custom_fields: - cursor.execute("SELECT * FROM ticket_custom " - "WHERE ticket=%s and name=%s", (self.id, name)) - if cursor.fetchone(): - cursor.execute("UPDATE ticket_custom SET value=%s " - "WHERE ticket=%s AND name=%s", - (self[name], self.id, name)) - else: - cursor.execute("INSERT INTO ticket_custom (ticket,name," - "value) VALUES(%s,%s,%s)", - (self.id, name, self[name])) - else: - cursor.execute("UPDATE ticket SET %s=%%s WHERE id=%%s" % name, - (self[name], self.id)) - cursor.execute("INSERT INTO ticket_change " - "(ticket,time,author,field,oldvalue,newvalue) " - "VALUES (%s, %s, %s, %s, %s, %s)", - (self.id, when_ts, author, name, self._old[name], - self[name])) - # always save comment, even if empty (numbering support for timeline) - cursor.execute("INSERT INTO ticket_change " - "(ticket,time,author,field,oldvalue,newvalue) " - "VALUES (%s,%s,%s,'comment',%s,%s)", - (self.id, when_ts, author, cnum, comment)) + @self.env.with_transaction(db) + def do_save(db): + cursor = db.cursor() - cursor.execute("UPDATE ticket SET changetime=%s WHERE id=%s", - (when_ts, self.id)) + # find cnum if it isn't provided + comment_num = cnum + if not comment_num: + num = 0 + cursor.execute(""" + SELECT DISTINCT tc1.time,COALESCE(tc2.oldvalue,'') + FROM ticket_change AS tc1 + LEFT OUTER JOIN + (SELECT time,oldvalue FROM ticket_change + WHERE field='comment') AS tc2 + ON (tc1.time = tc2.time) + WHERE ticket=%s ORDER BY tc1.time DESC + """, (self.id,)) + for ts, old in cursor: + # Use oldvalue if available, else count edits + try: + num += int(old.rsplit('.', 1)[-1]) + break + except ValueError: + num += 1 + comment_num = str(num + 1) + + # store fields + custom_fields = [f['name'] for f in self.fields if f.get('custom')] + + for name in self._old.keys(): + if name in custom_fields: + cursor.execute(""" + SELECT * FROM ticket_custom + WHERE ticket=%s and name=%s + """, (self.id, name)) + if cursor.fetchone(): + cursor.execute(""" + UPDATE ticket_custom SET value=%s + WHERE ticket=%s AND name=%s + """, (self[name], self.id, name)) + else: + cursor.execute(""" + INSERT INTO ticket_custom (ticket,name,value) + VALUES(%s,%s,%s) + """, (self.id, name, self[name])) + else: + cursor.execute("UPDATE ticket SET %s=%%s WHERE id=%%s" + % name, (self[name], self.id)) + cursor.execute(""" + INSERT INTO ticket_change + (ticket,time,author,field,oldvalue,newvalue) + VALUES (%s, %s, %s, %s, %s, %s) + """, (self.id, when_ts, author, name, self._old[name], + self[name])) + + # always save comment, even if empty + # (numbering support for timeline) + cursor.execute(""" + INSERT INTO ticket_change + (ticket,time,author,field,oldvalue,newvalue) + VALUES (%s,%s,%s,'comment',%s,%s) + """, (self.id, when_ts, author, comment_num, comment)) + + cursor.execute("UPDATE ticket SET changetime=%s WHERE id=%s", + (when_ts, self.id)) - if handle_ta: - db.commit() old_values = self._old self._old = {} - self.time_changed = when + self.values['changetime'] = when for listener in TicketSystem(self.env).change_listeners: listener.ticket_changed(self, comment, author, old_values) @@ -309,54 +363,279 @@ """ db = self._get_db(db) cursor = db.cursor() - when_ts = when and to_timestamp(when) or 0 + sid = str(self.id) + when_ts = to_utimestamp(when) if when_ts: - cursor.execute("SELECT time,author,field,oldvalue,newvalue,1 " - "FROM ticket_change WHERE ticket=%s AND time=%s " - "UNION " - "SELECT time,author,'attachment',null,filename,0 " - "FROM attachment WHERE id=%s AND time=%s " - "UNION " - "SELECT time,author,'comment',null,description,0 " - "FROM attachment WHERE id=%s AND time=%s " - "ORDER BY time", - (self.id, when_ts, str(self.id), when_ts, - str(self.id), when_ts)) + cursor.execute(""" + SELECT time,author,field,oldvalue,newvalue, 1 AS permanent + FROM ticket_change WHERE ticket=%s AND time=%s + UNION + SELECT time,author,'attachment',null,filename, 0 AS permanent + FROM attachment WHERE id=%s AND time=%s + UNION + SELECT time,author,'comment',null,description, 0 AS permanent + FROM attachment WHERE id=%s AND time=%s + ORDER BY time,permanent,author + """, (self.id, when_ts, sid, when_ts, sid, when_ts)) else: - cursor.execute("SELECT time,author,field,oldvalue,newvalue,1 " - "FROM ticket_change WHERE ticket=%s " - "UNION " - "SELECT time,author,'attachment',null,filename,0 " - "FROM attachment WHERE id=%s " - "UNION " - "SELECT time,author,'comment',null,description,0 " - "FROM attachment WHERE id=%s " - "ORDER BY time", (self.id, str(self.id), - str(self.id))) + cursor.execute(""" + SELECT time,author,field,oldvalue,newvalue, 1 AS permanent + FROM ticket_change WHERE ticket=%s + UNION + SELECT time,author,'attachment',null,filename, 0 AS permanent + FROM attachment WHERE id=%s + UNION + SELECT time,author,'comment',null,description, 0 AS permanent + FROM attachment WHERE id=%s + ORDER BY time,permanent,author + """, (self.id, sid, sid)) log = [] for t, author, field, oldvalue, newvalue, permanent in cursor: - log.append((datetime.fromtimestamp(int(t), utc), author, field, - oldvalue or '', newvalue or '', permanent)) + log.append((from_utimestamp(t), author, field, + oldvalue or '', newvalue or '', permanent)) return log def delete(self, db=None): - db, handle_ta = self._get_db_for_write(db) - Attachment.delete_all(self.env, 'ticket', self.id, db) - cursor = db.cursor() - cursor.execute("DELETE FROM ticket WHERE id=%s", (self.id,)) - cursor.execute("DELETE FROM ticket_change WHERE ticket=%s", (self.id,)) - cursor.execute("DELETE FROM ticket_custom WHERE ticket=%s", (self.id,)) - - if handle_ta: - db.commit() + """Delete the ticket. + + The `db` argument is deprecated in favor of `with_transaction()`. + """ + @self.env.with_transaction(db) + def do_delete(db): + Attachment.delete_all(self.env, 'ticket', self.id, db) + cursor = db.cursor() + cursor.execute("DELETE FROM ticket WHERE id=%s", (self.id,)) + cursor.execute("DELETE FROM ticket_change WHERE ticket=%s", + (self.id,)) + cursor.execute("DELETE FROM ticket_custom WHERE ticket=%s", + (self.id,)) for listener in TicketSystem(self.env).change_listeners: listener.ticket_deleted(self) + def get_change(self, cnum, db=None): + """Return a ticket change by its number.""" + db = self._get_db(db) + cursor = db.cursor() + row = self._find_change(cnum, db) + if row: + ts, author, comment = row + cursor.execute(""" + SELECT field,author,oldvalue,newvalue + FROM ticket_change WHERE ticket=%s AND time=%s + """, (self.id, ts)) + fields = {} + change = {'date': from_utimestamp(ts), + 'author': author, 'fields': fields} + for field, author, old, new in cursor: + fields[field] = {'author': author, 'old': old, 'new': new} + return change + + def delete_change(self, cnum): + """Delete a ticket change.""" + @self.env.with_transaction() + def do_delete(db): + cursor = db.cursor() + row = self._find_change(cnum, db) + if not row: + return + ts = row[0] + + custom_fields = set(f['name'] for f in self.fields + if f.get('custom')) + + # Find modified fields and their previous value + cursor.execute(""" + SELECT field, oldvalue, newvalue FROM ticket_change + WHERE ticket=%s AND time=%s + """, (self.id, ts)) + fields = [(field, old, new) for field, old, new in cursor + if field != 'comment' and not field.startswith('_')] + for field, oldvalue, newvalue in fields: + # Find the next change + cursor.execute(""" + SELECT time FROM ticket_change + WHERE ticket=%s AND time>%s AND field=%s + LIMIT 1 + """, (self.id, ts, field)) + for next_ts, in cursor: + # Modify the old value of the next change if it is equal + # to the new value of the deleted change + cursor.execute(""" + UPDATE ticket_change SET oldvalue=%s + WHERE ticket=%s AND time=%s AND field=%s + AND oldvalue=%s + """, (oldvalue, self.id, next_ts, field, newvalue)) + break + else: + # No next change, edit ticket field + if field in custom_fields: + cursor.execute(""" + UPDATE ticket_custom SET value=%s + WHERE ticket=%s AND name=%s + """, (oldvalue, self.id, field)) + else: + cursor.execute(""" + UPDATE ticket SET %s=%%s WHERE id=%%s + """ % field, (oldvalue, self.id)) + + # Delete the change + cursor.execute(""" + DELETE FROM ticket_change WHERE ticket=%s AND time=%s + """, (self.id, ts)) + + # Fix the last modification time + cursor.execute(""" + UPDATE ticket SET changetime=( + SELECT time FROM ticket_change WHERE ticket=%s + ORDER BY time DESC LIMIT 1) + WHERE id=%s + """, (self.id, self.id)) + + self._fetch_ticket(self.id) + + def modify_comment(self, cdate, author, comment, when=None): + """Modify a ticket comment specified by its date, while keeping a + history of edits. + """ + ts = to_utimestamp(cdate) + if when is None: + when = datetime.now(utc) + when_ts = to_utimestamp(when) + + @self.env.with_transaction() + def do_modify(db): + cursor = db.cursor() + # Find the current value of the comment + cursor.execute(""" + SELECT newvalue FROM ticket_change + WHERE ticket=%s AND time=%s AND field='comment' + """, (self.id, ts)) + old_comment = False + for old_comment, in cursor: + break + if comment == (old_comment or ''): + return + + # Comment history is stored in fields named "_comment%d" + # Find the next edit number + cursor.execute(""" + SELECT field FROM ticket_change + WHERE ticket=%%s AND time=%%s AND field %s + """ % db.like(), (self.id, ts, + db.like_escape('_comment') + '%')) + fields = list(cursor) + rev = fields and max(int(field[8:]) for field, in fields) + 1 or 0 + cursor.execute(""" + INSERT INTO ticket_change + (ticket,time,author,field,oldvalue,newvalue) + VALUES (%s,%s,%s,%s,%s,%s) + """, (self.id, ts, author, '_comment%d' % rev, + old_comment or '', str(when_ts))) + if old_comment is False: + # There was no comment field, add one, find the original author + # in one of the other changed fields + cursor.execute(""" + SELECT author FROM ticket_change + WHERE ticket=%%s AND time=%%s AND NOT field %s + LIMIT 1 + """ % db.like(), (self.id, ts, db.like_escape('_') + '%')) + old_author = None + for old_author, in cursor: + break + cursor.execute(""" + INSERT INTO ticket_change + (ticket,time,author,field,oldvalue,newvalue) + VALUES (%s,%s,%s,'comment','',%s) + """, (self.id, ts, old_author, comment)) + else: + cursor.execute(""" + UPDATE ticket_change SET newvalue=%s + WHERE ticket=%s AND time=%s AND + field='comment' + """, (comment, self.id, ts)) + + def get_comment_history(self, cnum, db=None): + db = self._get_db(db) + history = [] + cursor = db.cursor() + row = self._find_change(cnum, db) + if row: + ts0, author0, last_comment = row + # Get all fields of the form "_comment%d" + cursor.execute(""" + SELECT field,author,oldvalue,newvalue + FROM ticket_change + WHERE ticket=%%s AND time=%%s AND field %s + """ % db.like(), (self.id, ts0, + db.like_escape('_comment') + '%')) + rows = sorted((int(field[8:]), author, old, new) + for field, author, old, new in cursor) + for rev, author, comment, ts in rows: + history.append((rev, from_utimestamp(long(ts0)), author0, + comment)) + ts0, author0 = ts, author + history.sort() + rev = history and (history[-1][0] + 1) or 0 + history.append((rev, from_utimestamp(long(ts0)), author0, + last_comment)) + return history + + def _find_change(self, cnum, db): + """Find a comment by its number.""" + scnum = str(cnum) + cursor = db.cursor() + cursor.execute(""" + SELECT time,author,newvalue FROM ticket_change + WHERE ticket=%%s AND field='comment' + AND (oldvalue=%%s OR oldvalue %s) + """ % db.like(), (self.id, scnum, + '%' + db.like_escape('.' + scnum))) + for row in cursor: + return row + + # Fallback when comment number is not available in oldvalue + num = 0 + cursor.execute(""" + SELECT DISTINCT tc1.time,COALESCE(tc2.oldvalue,''), + tc2.author,COALESCE(tc2.newvalue,'') + FROM ticket_change AS tc1 + LEFT OUTER JOIN + (SELECT time,author,oldvalue,newvalue + FROM ticket_change + WHERE field='comment') AS tc2 + ON (tc1.time = tc2.time) + WHERE ticket=%s + ORDER BY tc1.time + """, (self.id,)) + for ts, old, author, comment in cursor: + # Use oldvalue if available, else count edits + try: + num = int(old.rsplit('.', 1)[-1]) + except ValueError: + num += 1 + if num == cnum: + break + else: + return + + # Find author if NULL + if author is None: + cursor.execute(""" + SELECT author FROM ticket_change + WHERE ticket=%%s AND time=%%s AND NOT field %s + LIMIT 1 + """ % db.like(), (self.id, ts, db.like_escape('_') + '%')) + for author, in cursor: + break + return (ts, author, comment) + def simplify_whitespace(name): """Strip spaces and remove duplicate spaces within names""" - return ' '.join(name.split()) + if name: + return ' '.join(name.split()) + return name class AbstractEnum(object): @@ -368,17 +647,15 @@ self.ticket_col = self.type self.env = env if name: - name = simplify_whitespace(name) - if name: if not db: - db = self.env.get_db_cnx() + db = self.env.get_read_db() cursor = db.cursor() cursor.execute("SELECT value FROM enum WHERE type=%s AND name=%s", (self.type, name)) row = cursor.fetchone() if not row: raise ResourceNotFound(_('%(type)s %(name)s does not exist.', - type=self.type, name=name)) + type=self.type, name=name)) self.value = self._old_value = row[0] self.name = self._old_name = name else: @@ -388,98 +665,100 @@ exists = property(fget=lambda self: self._old_value is not None) def delete(self, db=None): + """Delete the enum value. + + The `db` argument is deprecated in favor of `with_transaction()`. + """ assert self.exists, 'Cannot delete non-existent %s' % self.type - if not db: - db = self.env.get_db_cnx() - handle_ta = True - else: - handle_ta = False - cursor = db.cursor() - self.env.log.info('Deleting %s %s' % (self.type, self.name)) - cursor.execute("DELETE FROM enum WHERE type=%s AND value=%s", - (self.type, self._old_value)) - # Re-order any enums that have higher value than deleted (close gap) - for enum in list(self.select(self.env)): - try: - if int(enum.value) > int(self._old_value): - enum.value = unicode(int(enum.value) - 1) - enum.update(db=db) - except ValueError: - pass # Ignore cast error for this non-essential operation - - if handle_ta: - db.commit() + @self.env.with_transaction(db) + def do_delete(db): + cursor = db.cursor() + self.env.log.info('Deleting %s %s' % (self.type, self.name)) + cursor.execute("DELETE FROM enum WHERE type=%s AND value=%s", + (self.type, self._old_value)) + # Re-order any enums that have higher value than deleted + # (close gap) + for enum in list(self.select(self.env, db)): + try: + if int(enum.value) > int(self._old_value): + enum.value = unicode(int(enum.value) - 1) + enum.update() + except ValueError: + pass # Ignore cast error for this non-essential operation + TicketSystem(self.env).reset_ticket_fields() self.value = self._old_value = None self.name = self._old_name = None - TicketSystem(self.env).reset_ticket_fields() def insert(self, db=None): + """Add a new enum value. + + The `db` argument is deprecated in favor of `with_transaction()`. + """ assert not self.exists, 'Cannot insert existing %s' % self.type self.name = simplify_whitespace(self.name) - assert self.name, 'Cannot create %s with no name' % self.type - if not db: - db = self.env.get_db_cnx() - handle_ta = True - else: - handle_ta = False + if not self.name: + raise TracError(_('Invalid %(type)s name.', type=self.type)) - cursor = db.cursor() - self.env.log.debug("Creating new %s '%s'" % (self.type, self.name)) - if not self.value: - cursor.execute(("SELECT COALESCE(MAX(%s),0) FROM enum " - "WHERE type=%%s") % db.cast('value', 'int'), - (self.type,)) - self.value = int(float(cursor.fetchone()[0])) + 1 - cursor.execute("INSERT INTO enum (type,name,value) VALUES (%s,%s,%s)", - (self.type, self.name, self.value)) + @self.env.with_transaction(db) + def do_insert(db): + cursor = db.cursor() + self.env.log.debug("Creating new %s '%s'" % (self.type, self.name)) + if not self.value: + cursor.execute(""" + SELECT COALESCE(MAX(%s),0) FROM enum WHERE type=%%s + """ % db.cast('value', 'int'), (self.type,)) + self.value = int(float(cursor.fetchone()[0])) + 1 + cursor.execute("INSERT INTO enum (type,name,value) " + "VALUES (%s,%s,%s)", + (self.type, self.name, self.value)) + TicketSystem(self.env).reset_ticket_fields() - if handle_ta: - db.commit() self._old_name = self.name self._old_value = self.value - TicketSystem(self.env).reset_ticket_fields() def update(self, db=None): + """Update the enum value. + + The `db` argument is deprecated in favor of `with_transaction()`. + """ assert self.exists, 'Cannot update non-existent %s' % self.type self.name = simplify_whitespace(self.name) - assert self.name, 'Cannot update %s with no name' % self.type - if not db: - db = self.env.get_db_cnx() - handle_ta = True - else: - handle_ta = False + if not self.name: + raise TracError(_('Invalid %(type)s name.', type=self.type)) - cursor = db.cursor() - self.env.log.info('Updating %s "%s"' % (self.type, self.name)) - cursor.execute("UPDATE enum SET name=%s,value=%s " - "WHERE type=%s AND name=%s", - (self.name, self.value, self.type, self._old_name)) - if self.name != self._old_name: - # Update tickets - cursor.execute("UPDATE ticket SET %s=%%s WHERE %s=%%s" % - (self.ticket_col, self.ticket_col), - (self.name, self._old_name)) + @self.env.with_transaction(db) + def do_update(db): + cursor = db.cursor() + self.env.log.info('Updating %s "%s"' % (self.type, self.name)) + cursor.execute(""" + UPDATE enum SET name=%s,value=%s + WHERE type=%s AND name=%s + """, (self.name, self.value, self.type, self._old_name)) + if self.name != self._old_name: + # Update tickets + cursor.execute("UPDATE ticket SET %s=%%s WHERE %s=%%s" % + (self.ticket_col, self.ticket_col), + (self.name, self._old_name)) + TicketSystem(self.env).reset_ticket_fields() - if handle_ta: - db.commit() self._old_name = self.name self._old_value = self.value - TicketSystem(self.env).reset_ticket_fields() + @classmethod def select(cls, env, db=None): if not db: - db = env.get_db_cnx() + db = env.get_read_db() cursor = db.cursor() - cursor.execute("SELECT name,value FROM enum WHERE type=%s " - "ORDER BY " + db.cast('value', 'int'), - (cls.type,)) + cursor.execute(""" + SELECT name,value FROM enum WHERE type=%s + ORDER BY + """ + db.cast('value', 'int'), (cls.type,)) for name, value in cursor: obj = cls(env) obj.name = obj._old_name = name obj.value = obj._old_value = value yield obj - select = classmethod(select) class Type(AbstractEnum): @@ -490,12 +769,13 @@ class Status(object): def __init__(self, env): self.env = env + + @classmethod def select(cls, env, db=None): for state in TicketSystem(env).get_all_status(): status = cls(env) status.name = state yield status - select = classmethod(select) class Resolution(AbstractEnum): @@ -515,17 +795,16 @@ def __init__(self, env, name=None, db=None): self.env = env if name: - name = simplify_whitespace(name) - if name: if not db: - db = self.env.get_db_cnx() + db = self.env.get_read_db() cursor = db.cursor() - cursor.execute("SELECT owner,description FROM component " - "WHERE name=%s", (name,)) + cursor.execute(""" + SELECT owner,description FROM component WHERE name=%s + """, (name,)) row = cursor.fetchone() if not row: raise ResourceNotFound(_('Component %(name)s does not exist.', - name=name)) + name=name)) self.name = self._old_name = name self.owner = row[0] or None self.description = row[1] or '' @@ -537,83 +816,81 @@ exists = property(fget=lambda self: self._old_name is not None) def delete(self, db=None): + """Delete the component. + + The `db` argument is deprecated in favor of `with_transaction()`. + """ assert self.exists, 'Cannot delete non-existent component' - if not db: - db = self.env.get_db_cnx() - handle_ta = True - else: - handle_ta = False - - cursor = db.cursor() - self.env.log.info('Deleting component %s' % self.name) - cursor.execute("DELETE FROM component WHERE name=%s", (self.name,)) - self.name = self._old_name = None - - if handle_ta: - db.commit() - TicketSystem(self.env).reset_ticket_fields() + @self.env.with_transaction(db) + def do_delete(db): + cursor = db.cursor() + self.env.log.info('Deleting component %s' % self.name) + cursor.execute("DELETE FROM component WHERE name=%s", (self.name,)) + self.name = self._old_name = None + TicketSystem(self.env).reset_ticket_fields() def insert(self, db=None): + """Insert a new component. + + The `db` argument is deprecated in favor of `with_transaction()`. + """ assert not self.exists, 'Cannot insert existing component' self.name = simplify_whitespace(self.name) - assert self.name, 'Cannot create component with no name' - if not db: - db = self.env.get_db_cnx() - handle_ta = True - else: - handle_ta = False - - cursor = db.cursor() - self.env.log.debug("Creating new component '%s'" % self.name) - cursor.execute("INSERT INTO component (name,owner,description) " - "VALUES (%s,%s,%s)", - (self.name, self.owner, self.description)) - self._old_name = self.name + if not self.name: + raise TracError(_('Invalid component name.')) - if handle_ta: - db.commit() - TicketSystem(self.env).reset_ticket_fields() + @self.env.with_transaction(db) + def do_insert(db): + cursor = db.cursor() + self.env.log.debug("Creating new component '%s'" % self.name) + cursor.execute(""" + INSERT INTO component (name,owner,description) + VALUES (%s,%s,%s) + """, (self.name, self.owner, self.description)) + self._old_name = self.name + TicketSystem(self.env).reset_ticket_fields() def update(self, db=None): + """Update the component. + + The `db` argument is deprecated in favor of `with_transaction()`. + """ assert self.exists, 'Cannot update non-existent component' self.name = simplify_whitespace(self.name) - assert self.name, 'Cannot update component with no name' - if not db: - db = self.env.get_db_cnx() - handle_ta = True - else: - handle_ta = False - - cursor = db.cursor() - self.env.log.info('Updating component "%s"' % self.name) - cursor.execute("UPDATE component SET name=%s,owner=%s,description=%s " - "WHERE name=%s", - (self.name, self.owner, self.description, - self._old_name)) - if self.name != self._old_name: - # Update tickets - cursor.execute("UPDATE ticket SET component=%s WHERE component=%s", - (self.name, self._old_name)) - self._old_name = self.name + if not self.name: + raise TracError(_('Invalid component name.')) - if handle_ta: - db.commit() - TicketSystem(self.env).reset_ticket_fields() + @self.env.with_transaction(db) + def do_update(db): + cursor = db.cursor() + self.env.log.info('Updating component "%s"' % self.name) + cursor.execute(""" + UPDATE component SET name=%s,owner=%s, description=%s + WHERE name=%s + """, (self.name, self.owner, self.description, self._old_name)) + if self.name != self._old_name: + # Update tickets + cursor.execute(""" + UPDATE ticket SET component=%s WHERE component=%s + """, (self.name, self._old_name)) + self._old_name = self.name + TicketSystem(self.env).reset_ticket_fields() + @classmethod def select(cls, env, db=None): if not db: - db = env.get_db_cnx() + db = env.get_read_db() cursor = db.cursor() - cursor.execute("SELECT name,owner,description FROM component " - "ORDER BY name") + cursor.execute(""" + SELECT name,owner,description FROM component ORDER BY name + """) for name, owner, description in cursor: component = cls(env) component.name = component._old_name = name component.owner = owner or None component.description = description or '' yield component - select = classmethod(select) class Milestone(object): @@ -622,11 +899,11 @@ self.env = env if name: self._fetch(name, db) - self._old_name = name else: - self.name = self._old_name = None + self.name = None self.due = self.completed = None self.description = '' + self._to_old() def _get_resource(self): return Resource('milestone', self.name) ### .version !!! @@ -634,105 +911,122 @@ def _fetch(self, name, db=None): if not db: - db = self.env.get_db_cnx() + db = self.env.get_read_db() cursor = db.cursor() - cursor.execute("SELECT name,due,completed,description " - "FROM milestone WHERE name=%s", (name,)) + cursor.execute(""" + SELECT name,due,completed,description + FROM milestone WHERE name=%s + """, (name,)) row = cursor.fetchone() if not row: - raise ResourceNotFound('Milestone %s does not exist.' % name, - 'Invalid Milestone Name') + raise ResourceNotFound(_('Milestone %(name)s does not exist.', + name=name), _('Invalid milestone name')) self._from_database(row) - exists = property(fget=lambda self: self._old_name is not None) + exists = property(fget=lambda self: self._old['name'] is not None) is_completed = property(fget=lambda self: self.completed is not None) is_late = property(fget=lambda self: self.due and \ self.due.date() < date.today()) def _from_database(self, row): name, due, completed, description = row - self.name = self._old_name = name - self.due = due and datetime.fromtimestamp(int(due), utc) or None - self.completed = completed and \ - datetime.fromtimestamp(int(completed), utc) or None + self.name = name + self.due = due and from_utimestamp(due) or None + self.completed = completed and from_utimestamp(completed) or None self.description = description or '' + self._to_old() - def delete(self, retarget_to=None, author=None, db=None): - if not db: - db = self.env.get_db_cnx() - handle_ta = True - else: - handle_ta = False + def _to_old(self): + self._old = {'name': self.name, 'due': self.due, + 'completed': self.completed, + 'description': self.description} - cursor = db.cursor() - self.env.log.info('Deleting milestone %s' % self.name) - cursor.execute("DELETE FROM milestone WHERE name=%s", (self.name,)) + def delete(self, retarget_to=None, author=None, db=None): + """Delete the milestone. + + The `db` argument is deprecated in favor of `with_transaction()`. + """ + @self.env.with_transaction(db) + def do_delete(db): + cursor = db.cursor() + self.env.log.info('Deleting milestone %s' % self.name) + cursor.execute("DELETE FROM milestone WHERE name=%s", (self.name,)) - # Retarget/reset tickets associated with this milestone - now = datetime.now(utc) - cursor.execute("SELECT id FROM ticket WHERE milestone=%s", (self.name,)) - tkt_ids = [int(row[0]) for row in cursor] - for tkt_id in tkt_ids: - ticket = Ticket(self.env, tkt_id, db) - ticket['milestone'] = retarget_to - ticket.save_changes(author, 'Milestone %s deleted' % self.name, - now, db=db) - self.name = self._old_name = None + # Retarget/reset tickets associated with this milestone + now = datetime.now(utc) + cursor.execute("SELECT id FROM ticket WHERE milestone=%s", + (self.name,)) + tkt_ids = [int(row[0]) for row in cursor] + for tkt_id in tkt_ids: + ticket = Ticket(self.env, tkt_id, db) + ticket['milestone'] = retarget_to + ticket.save_changes(author, 'Milestone %s deleted' % self.name, + now) + self._old['name'] = None + TicketSystem(self.env).reset_ticket_fields() - if handle_ta: - db.commit() - TicketSystem(self.env).reset_ticket_fields() + for listener in TicketSystem(self.env).milestone_change_listeners: + listener.milestone_deleted(self) def insert(self, db=None): - assert self.name, 'Cannot create milestone with no name' - if not db: - db = self.env.get_db_cnx() - handle_ta = True - else: - handle_ta = False - + """Insert a new milestone. + + The `db` argument is deprecated in favor of `with_transaction()`. + """ self.name = simplify_whitespace(self.name) - cursor = db.cursor() - self.env.log.debug("Creating new milestone '%s'" % self.name) - cursor.execute("INSERT INTO milestone (name,due,completed,description) " - "VALUES (%s,%s,%s,%s)", - (self.name, to_timestamp(self.due), to_timestamp(self.completed), - self.description)) - self._old_name = self.name + if not self.name: + raise TracError(_('Invalid milestone name.')) - if handle_ta: - db.commit() - TicketSystem(self.env).reset_ticket_fields() + @self.env.with_transaction(db) + def do_insert(db): + cursor = db.cursor() + self.env.log.debug("Creating new milestone '%s'" % self.name) + cursor.execute(""" + INSERT INTO milestone (name,due,completed,description) + VALUES (%s,%s,%s,%s) + """, (self.name, to_utimestamp(self.due), + to_utimestamp(self.completed), self.description)) + self._to_old() + TicketSystem(self.env).reset_ticket_fields() - def update(self, db=None): - assert self.name, 'Cannot update milestone with no name' - if not db: - db = self.env.get_db_cnx() - handle_ta = True - else: - handle_ta = False + for listener in TicketSystem(self.env).milestone_change_listeners: + listener.milestone_created(self) + def update(self, db=None): + """Update the milestone. + + The `db` argument is deprecated in favor of `with_transaction()`. + """ self.name = simplify_whitespace(self.name) - cursor = db.cursor() - self.env.log.info('Updating milestone "%s"' % self.name) - cursor.execute("UPDATE milestone SET name=%s,due=%s," - "completed=%s,description=%s WHERE name=%s", - (self.name, to_timestamp(self.due), to_timestamp(self.completed), - self.description, - self._old_name)) - self.env.log.info('Updating milestone field of all tickets ' - 'associated with milestone "%s"' % self.name) - cursor.execute("UPDATE ticket SET milestone=%s WHERE milestone=%s", - (self.name, self._old_name)) - self._old_name = self.name + if not self.name: + raise TracError(_('Invalid milestone name.')) - if handle_ta: - db.commit() - TicketSystem(self.env).reset_ticket_fields() + @self.env.with_transaction(db) + def do_update(db): + cursor = db.cursor() + self.env.log.info('Updating milestone "%s"' % self.name) + cursor.execute(""" + UPDATE milestone + SET name=%s,due=%s, completed=%s,description=%s WHERE name=%s + """, (self.name, to_utimestamp(self.due), + to_utimestamp(self.completed), + self.description, self._old['name'])) + self.env.log.info('Updating milestone field of all tickets ' + 'associated with milestone "%s"' % self.name) + cursor.execute("UPDATE ticket SET milestone=%s WHERE milestone=%s", + (self.name, self._old['name'])) + TicketSystem(self.env).reset_ticket_fields() + + old_values = dict((k, v) for k, v in self._old.iteritems() + if getattr(self, k) != v) + self._to_old() + for listener in TicketSystem(self.env).milestone_change_listeners: + listener.milestone_changed(self, old_values) + @classmethod def select(cls, env, include_completed=True, db=None): if not db: - db = env.get_db_cnx() + db = env.get_read_db() sql = "SELECT name,due,completed,description FROM milestone " if not include_completed: sql += "WHERE COALESCE(completed,0)=0 " @@ -748,7 +1042,6 @@ m.due or utcmax, embedded_numbers(m.name)) return sorted(milestones, key=milestone_order) - select = classmethod(select) def group_milestones(milestones, include_completed): @@ -774,16 +1067,17 @@ self.env = env if name: if not db: - db = self.env.get_db_cnx() + db = self.env.get_read_db() cursor = db.cursor() - cursor.execute("SELECT time,description FROM version " - "WHERE name=%s", (name,)) + cursor.execute(""" + SELECT time,description FROM version WHERE name=%s + """, (name,)) row = cursor.fetchone() if not row: raise ResourceNotFound(_('Version %(name)s does not exist.', - name=name)) + name=name)) self.name = self._old_name = name - self.time = row[0] and datetime.fromtimestamp(int(row[0]), utc) or None + self.time = row[0] and from_utimestamp(row[0]) or None self.description = row[1] or '' else: self.name = self._old_name = None @@ -793,83 +1087,78 @@ exists = property(fget=lambda self: self._old_name is not None) def delete(self, db=None): + """Delete the version. + + The `db` argument is deprecated in favor of `with_transaction()`. + """ assert self.exists, 'Cannot delete non-existent version' - if not db: - db = self.env.get_db_cnx() - handle_ta = True - else: - handle_ta = False - cursor = db.cursor() - self.env.log.info('Deleting version %s' % self.name) - cursor.execute("DELETE FROM version WHERE name=%s", (self.name,)) - - self.name = self._old_name = None - - if handle_ta: - db.commit() - TicketSystem(self.env).reset_ticket_fields() + @self.env.with_transaction(db) + def do_delete(db): + cursor = db.cursor() + self.env.log.info('Deleting version %s' % self.name) + cursor.execute("DELETE FROM version WHERE name=%s", (self.name,)) + self.name = self._old_name = None + TicketSystem(self.env).reset_ticket_fields() def insert(self, db=None): + """Insert a new version. + + The `db` argument is deprecated in favor of `with_transaction()`. + """ assert not self.exists, 'Cannot insert existing version' self.name = simplify_whitespace(self.name) - assert self.name, 'Cannot create version with no name' - if not db: - db = self.env.get_db_cnx() - handle_ta = True - else: - handle_ta = False - - cursor = db.cursor() - self.env.log.debug("Creating new version '%s'" % self.name) - cursor.execute("INSERT INTO version (name,time,description) " - "VALUES (%s,%s,%s)", - (self.name, to_timestamp(self.time), self.description)) - self._old_name = self.name + if not self.name: + raise TracError(_('Invalid version name.')) - if handle_ta: - db.commit() - TicketSystem(self.env).reset_ticket_fields() + @self.env.with_transaction(db) + def do_insert(db): + cursor = db.cursor() + self.env.log.debug("Creating new version '%s'" % self.name) + cursor.execute(""" + INSERT INTO version (name,time,description) VALUES (%s,%s,%s) + """, (self.name, to_utimestamp(self.time), self.description)) + self._old_name = self.name + TicketSystem(self.env).reset_ticket_fields() def update(self, db=None): + """Update the version. + + The `db` argument is deprecated in favor of `with_transaction()`. + """ assert self.exists, 'Cannot update non-existent version' self.name = simplify_whitespace(self.name) - assert self.name, 'Cannot update version with no name' - if not db: - db = self.env.get_db_cnx() - handle_ta = True - else: - handle_ta = False + if not self.name: + raise TracError(_('Invalid version name.')) - cursor = db.cursor() - self.env.log.info('Updating version "%s"' % self.name) - cursor.execute("UPDATE version SET name=%s,time=%s,description=%s " - "WHERE name=%s", - (self.name, to_timestamp(self.time), self.description, - self._old_name)) - if self.name != self._old_name: - # Update tickets - cursor.execute("UPDATE ticket SET version=%s WHERE version=%s", - (self.name, self._old_name)) - self._old_name = self.name - - if handle_ta: - db.commit() - TicketSystem(self.env).reset_ticket_fields() + @self.env.with_transaction(db) + def do_update(db): + cursor = db.cursor() + self.env.log.info('Updating version "%s"' % self.name) + cursor.execute(""" + UPDATE version SET name=%s,time=%s,description=%s WHERE name=%s + """, (self.name, to_utimestamp(self.time), + self.description, self._old_name)) + if self.name != self._old_name: + # Update tickets + cursor.execute("UPDATE ticket SET version=%s WHERE version=%s", + (self.name, self._old_name)) + self._old_name = self.name + TicketSystem(self.env).reset_ticket_fields() + @classmethod def select(cls, env, db=None): if not db: - db = env.get_db_cnx() + db = env.get_read_db() cursor = db.cursor() cursor.execute("SELECT name,time,description FROM version") versions = [] for name, time, description in cursor: version = cls(env) version.name = version._old_name = name - version.time = time and datetime.fromtimestamp(int(time), utc) or None + version.time = time and from_utimestamp(time) or None version.description = description or '' versions.append(version) def version_order(v): return (v.time or utcmax, embedded_numbers(v.name)) return sorted(versions, key=version_order, reverse=True) - select = classmethod(select) diff -Nru trac-0.11.7/trac/ticket/notification.py trac-0.12.1~ppa2/trac/ticket/notification.py --- trac-0.11.7/trac/ticket/notification.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/notification.py 2010-04-05 20:05:28.000000000 +0100 @@ -16,15 +16,16 @@ # Author: Daniel Lundin # -from trac import __version__ from trac.core import * from trac.config import * from trac.notification import NotifyEmail +from trac.ticket.api import TicketSystem from trac.util import md5 -from trac.util.datefmt import to_timestamp -from trac.util.text import CRLF, wrap, to_unicode, obfuscate_email_address +from trac.util.datefmt import to_utimestamp +from trac.util.text import CRLF, wrap, obfuscate_email_address +from trac.util.translation import deactivate, reactivate -from genshi.template.text import TextTemplate +from genshi.template.text import NewTextTemplate class TicketNotificationSystem(Component): @@ -66,6 +67,17 @@ self.prev_cc = [] def notify(self, ticket, newticket=True, modtime=None): + """Send ticket change notification e-mail (untranslated)""" + t = deactivate() + translated_fields = ticket.fields + try: + ticket.fields = TicketSystem(self.env).get_ticket_fields() + self._notify(ticket, newticket, modtime) + finally: + ticket.fields = translated_fields + reactivate(t) + + def _notify(self, ticket, newticket=True, modtime=None): self.ticket = ticket self.modtime = modtime self.newticket = newticket @@ -132,12 +144,14 @@ changes_body += ' * %s: %s%s' % (field, chg, CRLF) if newv: change_data[field] = {'oldvalue': old, 'newvalue': new} - - self.ticket['description'] = wrap( - self.ticket.values.get('description', ''), self.COLS, + + ticket_values = ticket.values.copy() + ticket_values['id'] = ticket.id + ticket_values['description'] = wrap( + ticket_values.get('description', ''), self.COLS, initial_indent=' ', subsequent_indent=' ', linesep=CRLF) - self.ticket['new'] = self.newticket - self.ticket['link'] = link + ticket_values['new'] = self.newticket + ticket_values['link'] = link subject = self.format_subj(summary) if not self.newticket: @@ -146,7 +160,7 @@ 'ticket_props': self.format_props(), 'ticket_body_hdr': self.format_hdr(), 'subject': subject, - 'ticket': ticket.values, + 'ticket': ticket_values, 'changes_body': changes_body, 'changes_descr': changes_descr, 'change': change_data @@ -155,7 +169,8 @@ def format_props(self): tkt = self.ticket - fields = [f for f in tkt.fields if f['name'] not in ('summary', 'cc')] + fields = [f for f in tkt.fields + if f['name'] not in ('summary', 'cc', 'time', 'changetime')] width = [0, 0, 0, 0] i = 0 for f in [f['name'] for f in fields if f['type'] != 'textarea']: @@ -170,8 +185,8 @@ if len(fval) > width[idx + 1]: width[idx + 1] = len(fval) i += 1 - format = ('%%%is: %%-%is | ' % (width[0], width[1]), - ' %%%is: %%-%is%s' % (width[2], width[3], CRLF)) + format = (u'%%%is: %%-%is | ' % (width[0], width[1]), + u' %%%is: %%-%is%s' % (width[2], width[3], CRLF)) l = (width[0] + width[1] + 5) sep = l * '-' + '+' + (self.COLS - l) * '-' txt = sep + CRLF @@ -185,9 +200,11 @@ if fname in ['owner', 'reporter']: fval = obfuscate_email_address(fval) if f['type'] == 'textarea' or '\n' in unicode(fval): - big.append((fname.capitalize(), CRLF.join(fval.splitlines()))) + big.append((f['label'], CRLF.join(fval.splitlines()))) else: - txt += format[i % 2] % (fname.capitalize(), fval) + # Note: f['label'] is a Babel's LazyObject, make sure its + # __str__ method won't be called. + txt += format[i % 2] % (f['label'], unicode(fval)) i += 1 if i % 2: txt += CRLF @@ -216,11 +233,11 @@ def format_subj(self, summary): template = self.config.get('notification','ticket_subject_template') - template = TextTemplate(template.encode('utf8')) + template = NewTextTemplate(template.encode('utf8')) prefix = self.config.get('notification', 'smtp_subject_prefix') if prefix == '__default__': - prefix = '[%s]' % self.config.get('project', 'name') + prefix = '[%s]' % self.env.project_name data = { 'prefix': prefix, @@ -260,7 +277,7 @@ if notify_updater: cursor.execute("SELECT DISTINCT author,ticket FROM ticket_change " "WHERE ticket=%s", (tktid,)) - for author,ticket in cursor: + for author, ticket in cursor: torecipients.append(author) # Suppress the updater from the recipients @@ -290,8 +307,8 @@ def get_message_id(self, rcpt, modtime=None): """Generate a predictable, but sufficiently unique message ID.""" - s = '%s.%08d.%d.%s' % (self.config.get('project', 'url'), - int(self.ticket.id), to_timestamp(modtime), + s = '%s.%08d.%d.%s' % (self.env.project_url.encode('utf-8'), + int(self.ticket.id), to_utimestamp(modtime), rcpt.encode('ascii', 'ignore')) dig = md5(s).hexdigest() host = self.from_email[self.from_email.find('@') + 1:] @@ -303,7 +320,7 @@ hdrs = {} hdrs['Message-ID'] = self.get_message_id(dest, self.modtime) hdrs['X-Trac-Ticket-ID'] = str(self.ticket.id) - hdrs['X-Trac-Ticket-URL'] = self.ticket['link'] + hdrs['X-Trac-Ticket-URL'] = self.data['ticket']['link'] if not self.newticket: msgid = self.get_message_id(dest) hdrs['In-Reply-To'] = msgid diff -Nru trac-0.11.7/trac/ticket/query.py trac-0.12.1~ppa2/trac/ticket/query.py --- trac-0.11.7/trac/ticket/query.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/query.py 2010-02-22 11:04:30.000000000 +0000 @@ -16,6 +16,7 @@ # Author: Christopher Lenz import csv +from itertools import groupby from math import ceil from datetime import datetime, timedelta import re @@ -30,33 +31,45 @@ from trac.resource import Resource from trac.ticket.api import TicketSystem from trac.util import Ranges -from trac.util.compat import groupby, set -from trac.util.datefmt import to_timestamp, utc +from trac.util.datefmt import format_datetime, from_utimestamp, parse_date, \ + to_timestamp, to_utimestamp, utc from trac.util.presentation import Paginator -from trac.util.text import shorten_line -from trac.util.translation import _ -from trac.web import parse_query_string, IRequestHandler +from trac.util.text import empty, shorten_line, unicode_unquote +from trac.util.translation import _, tag_ +from trac.web import arg_list_to_args, parse_arg_list, IRequestHandler from trac.web.href import Href from trac.web.chrome import add_ctxtnav, add_link, add_script, add_stylesheet, \ - INavigationContributor, Chrome + add_warning, INavigationContributor, Chrome -from trac.wiki.api import IWikiSyntaxProvider, parse_args +from trac.wiki.api import IWikiSyntaxProvider from trac.wiki.macros import WikiMacroBase # TODO: should be moved in .api -class QuerySyntaxError(Exception): +class QuerySyntaxError(TracError): """Exception raised when a ticket query cannot be parsed from a string.""" +class QueryValueError(TracError): + """Exception raised when a ticket query has bad constraint values.""" + def __init__(self, errors): + TracError.__init__(self, _('Invalid query constraint value')) + self.errors = errors + + class Query(object): substitutions = ['$USER'] + clause_re = re.compile(r'(?P\d+)_(?P.+)$') def __init__(self, env, report=None, constraints=None, cols=None, order=None, desc=0, group=None, groupdesc=0, verbose=0, rows=None, page=None, max=None, format=None): self.env = env self.id = report # if not None, it's the corresponding saved query - self.constraints = constraints or {} - self.order = order + constraints = constraints or [] + if isinstance(constraints, dict): + constraints = [constraints] + self.constraints = constraints + synonyms = TicketSystem(self.env).get_field_synonyms() + self.order = synonyms.get(order, order) # 0.11 compatibility self.desc = desc self.group = group self.groupdesc = groupdesc @@ -101,34 +114,47 @@ if verbose and 'description' not in rows: # 0.10 compatibility rows.append('description') self.fields = TicketSystem(self.env).get_ticket_fields() - field_names = [f['name'] for f in self.fields] + self.time_fields = set(f['name'] for f in self.fields + if f['type'] == 'time') + field_names = set(f['name'] for f in self.fields) self.cols = [c for c in cols or [] if c in field_names or - c in ('id', 'time', 'changetime')] + c == 'id'] self.rows = [c for c in rows if c in field_names] if self.order != 'id' and self.order not in field_names: - # TODO: fix after adding time/changetime to the api.py - if order == 'created': - order = 'time' - elif order == 'modified': - order = 'changetime' - if order in ('time', 'changetime'): - self.order = order - else: - self.order = 'priority' + self.order = 'priority' if self.group not in field_names: self.group = None + constraint_cols = {} + for clause in self.constraints: + for k, v in clause.iteritems(): + constraint_cols.setdefault(k, []).append(v) + self.constraint_cols = constraint_cols + + _clause_splitter = re.compile(r'(?=%%s AND %s<%%s)" % (neg and 'NOT ' or '', + col_cast, col_cast), + (start, end)) + elif start is not None: + return ("%s%s>=%%s" % (neg and 'NOT ' or '', col_cast), + (start, )) + elif end is not None: + return ("%s%s<%%s" % (neg and 'NOT ' or '', col_cast), + (end, )) + else: + return None + + if mode == '~' and name == 'keywords': + words = value.split() + clauses, args = [], [] + for word in words: + cneg = '' + if word.startswith('-'): + cneg = 'NOT ' + word = word[1:] + if not word: + continue + clauses.append("COALESCE(%s,'') %s%s" % (col, cneg, + db.like())) + args.append('%' + db.like_escape(word) + '%') + if not clauses: + return None + return ((neg and 'NOT ' or '') + + '(' + ' AND '.join(clauses) + ')', args) + if mode == '': - return ("COALESCE(%s,'')%s=%%s" % (name, neg and '!' or ''), - value) + return ("COALESCE(%s,'')%s=%%s" % (col, neg and '!' or ''), + (value, )) + if not value: return None - db = self.env.get_db_cnx() value = db.like_escape(value) if mode == '~': value = '%' + value + '%' @@ -448,94 +534,101 @@ value = value + '%' elif mode == '$': value = '%' + value - return ("COALESCE(%s,'') %s%s" % (name, neg and 'NOT ' or '', + return ("COALESCE(%s,'') %s%s" % (col, neg and 'NOT ' or '', db.like()), - value) + (value, )) - clauses = [] - args = [] - for k, v in self.constraints.items(): - if req: - v = [val.replace('$USER', req.authname) for val in v] - # Determine the match mode of the constraint (contains, - # starts-with, negation, etc.) - neg = v[0].startswith('!') - mode = '' - if len(v[0]) > neg and v[0][neg] in ('~', '^', '$'): - mode = v[0][neg] + def get_clause_sql(constraints): + db = self.env.get_db_cnx() + clauses = [] + for k, v in constraints.iteritems(): + if req: + v = [val.replace('$USER', req.authname) for val in v] + # Determine the match mode of the constraint (contains, + # starts-with, negation, etc.) + neg = v[0].startswith('!') + mode = '' + if len(v[0]) > neg and v[0][neg] in ('~', '^', '$'): + mode = v[0][neg] - # Special case id ranges - if k == 'id': - ranges = Ranges() - for r in v: - r = r.replace('!', '') - ranges.appendrange(r) - ids = [] - id_clauses = [] - for a,b in ranges.pairs: - if a == b: - ids.append(str(a)) + # Special case id ranges + if k == 'id': + ranges = Ranges() + for r in v: + r = r.replace('!', '') + try: + ranges.appendrange(r) + except Exception: + errors.append(_('Invalid ticket id list: ' + '%(value)s', value=r)) + ids = [] + id_clauses = [] + for a, b in ranges.pairs: + if a == b: + ids.append(str(a)) + else: + id_clauses.append('id BETWEEN %s AND %s') + args.append(a) + args.append(b) + if ids: + id_clauses.append('id IN (%s)' % (','.join(ids))) + if id_clauses: + clauses.append('%s(%s)' % (neg and 'NOT ' or '', + ' OR '.join(id_clauses))) + # Special case for exact matches on multiple values + elif not mode and len(v) > 1 and k not in self.time_fields: + if k not in custom_fields: + col = 't.' + k else: - id_clauses.append('id BETWEEN %s AND %s') - args.append(a) - args.append(b) - if ids: - id_clauses.append('id IN (%s)' % (','.join(ids))) - if id_clauses: - clauses.append('%s(%s)' % (neg and 'NOT ' or '', - ' OR '.join(id_clauses))) - # Special case for exact matches on multiple values - elif not mode and len(v) > 1: - if k not in custom_fields: - col = 't.' + k - else: - col = k + '.value' - clauses.append("COALESCE(%s,'') %sIN (%s)" - % (col, neg and 'NOT ' or '', - ','.join(['%s' for val in v]))) - args += [val[neg:] for val in v] - elif len(v) > 1: - constraint_sql = filter(None, - [get_constraint_sql(k, val, mode, neg) - for val in v]) - if not constraint_sql: - continue - if neg: - clauses.append("(" + " AND ".join( - [item[0] for item in constraint_sql]) + ")") - else: - clauses.append("(" + " OR ".join( - [item[0] for item in constraint_sql]) + ")") - args += [item[1] for item in constraint_sql] - elif len(v) == 1: - constraint_sql = get_constraint_sql(k, v[0], mode, neg) - if constraint_sql: - clauses.append(constraint_sql[0]) - args.append(constraint_sql[1]) + col = '%s.value' % db.quote(k) + clauses.append("COALESCE(%s,'') %sIN (%s)" + % (col, neg and 'NOT ' or '', + ','.join(['%s' for val in v]))) + args.extend([val[neg:] for val in v]) + elif v: + constraint_sql = [get_constraint_sql(k, val, mode, neg) + for val in v] + constraint_sql = filter(None, constraint_sql) + if not constraint_sql: + continue + if neg: + clauses.append("(" + " AND ".join( + [item[0] for item in constraint_sql]) + ")") + else: + clauses.append("(" + " OR ".join( + [item[0] for item in constraint_sql]) + ")") + for item in constraint_sql: + args.extend(item[1]) + return " AND ".join(clauses) - clauses = filter(None, clauses) + args = [] + errors = [] + clauses = filter(None, (get_clause_sql(c) for c in self.constraints)) if clauses: sql.append("\nWHERE ") - sql.append(" AND ".join(clauses)) + sql.append(" OR ".join('(%s)' % c for c in clauses)) if cached_ids: sql.append(" OR ") - sql.append("id in (%s)" % (','.join( - [str(id) for id in cached_ids]))) + sql.append("id in (%s)" % + (','.join([str(id) for id in cached_ids]))) sql.append("\nORDER BY ") order_cols = [(self.order, self.desc)] if self.group and self.group != self.order: order_cols.insert(0, (self.group, self.groupdesc)) + for name, desc in order_cols: - if name in custom_fields or name in enum_columns: + if name in enum_columns: col = name + '.value' + elif name in custom_fields: + col = '%s.value' % db.quote(name) else: col = 't.' + name desc = desc and ' DESC' or '' # FIXME: This is a somewhat ugly hack. Can we also have the # column type for this? If it's an integer, we do first # one, if text, we do 'else' - if name in ('id', 'time', 'changetime'): + if name == 'id' or name in self.time_fields: sql.append("COALESCE(%s,0)=0%s," % (col, desc)) else: sql.append("COALESCE(%s,'')=''%s," % (col, desc)) @@ -558,51 +651,12 @@ if self.order != 'id': sql.append(",t.id") + if errors: + raise QueryValueError(errors) return "".join(sql), args - def template_data(self, context, tickets, orig_list=None, orig_time=None, - req=None): - constraints = {} - for k, v in self.constraints.items(): - constraint = {'values': [], 'mode': ''} - for val in v: - neg = val.startswith('!') - if neg: - val = val[1:] - mode = '' - if val[:1] in ('~', '^', '$') \ - and not val in self.substitutions: - mode, val = val[:1], val[1:] - constraint['mode'] = (neg and '!' or '') + mode - constraint['values'].append(val) - constraints[k] = constraint - - cols = self.get_columns() - labels = dict([(f['name'], f['label']) for f in self.fields]) - wikify = set([f['name'] for f in self.fields - if f['type'] == 'text' and f.get('format') == 'wiki']) - - # TODO: remove after adding time/changetime to the api.py - labels['changetime'] = _('Modified') - labels['time'] = _('Created') - - headers = [{ - 'name': col, 'label': labels.get(col, _('Ticket')), - 'wikify': col in wikify, - 'href': self.get_href(context.href, order=col, - desc=(col == self.order and not self.desc)) - } for col in cols] - - fields = {} - for field in self.fields: - if field['name'] == 'owner' and field['type'] == 'select': - # Make $USER work when restrict_owner = true - field['options'].insert(0, '$USER') - field_data = {} - field_data.update(field) - del field_data['name'] - fields[field['name']] = field_data - + @staticmethod + def get_modes(): modes = {} modes['text'] = [ {'name': _("contains"), 'value': "~"}, @@ -610,7 +664,7 @@ {'name': _("begins with"), 'value': "^"}, {'name': _("ends with"), 'value': "$"}, {'name': _("is"), 'value': ""}, - {'name': _("is not"), 'value': "!"} + {'name': _("is not"), 'value': "!"}, ] modes['textarea'] = [ {'name': _("contains"), 'value': "~"}, @@ -618,8 +672,54 @@ ] modes['select'] = [ {'name': _("is"), 'value': ""}, - {'name': _("is not"), 'value': "!"} + {'name': _("is not"), 'value': "!"}, + ] + modes['id'] = [ + {'name': _("is"), 'value': ""}, + {'name': _("is not"), 'value': "!"}, ] + return modes + + def template_data(self, context, tickets, orig_list=None, orig_time=None, + req=None): + clauses = [] + for clause in self.constraints: + constraints = {} + for k, v in clause.items(): + constraint = {'values': [], 'mode': ''} + for val in v: + neg = val.startswith('!') + if neg: + val = val[1:] + mode = '' + if val[:1] in ('~', '^', '$') \ + and not val in self.substitutions: + mode, val = val[:1], val[1:] + constraint['mode'] = (neg and '!' or '') + mode + constraint['values'].append(val) + constraints[k] = constraint + clauses.append(constraints) + + cols = self.get_columns() + labels = TicketSystem(self.env).get_ticket_field_labels() + wikify = set(f['name'] for f in self.fields + if f['type'] == 'text' and f.get('format') == 'wiki') + + headers = [{ + 'name': col, 'label': labels.get(col, _('Ticket')), + 'wikify': col in wikify, + 'href': self.get_href(context.href, order=col, + desc=(col == self.order and not self.desc)) + } for col in cols] + + fields = {'id': {'type': 'id', 'label': _("Ticket")}} + for field in self.fields: + name = field['name'] + if name == 'owner' and field['type'] == 'select': + # Make $USER work when restrict_owner = true + field = field.copy() + field['options'].insert(0, '$USER') + fields[name] = field groups = {} groupsequence = [] @@ -685,11 +785,10 @@ 'context': context, 'col': cols, 'row': self.rows, - 'constraints': constraints, - 'labels': labels, + 'clauses': clauses, 'headers': headers, 'fields': fields, - 'modes': modes, + 'modes': self.get_modes(), 'tickets': tickets, 'groups': groupsequence or [(None, tickets)], 'last_group_is_partial': last_group_is_partial, @@ -774,23 +873,21 @@ self.log.debug('QueryModule: Using default query: %s', str(qstring)) if qstring.startswith('?'): - ticket_fields = [f['name'] for f in - TicketSystem(self.env).get_ticket_fields()] - ticket_fields.append('id') - args = parse_query_string(qstring[1:]) - constraints = dict([(k, args.getlist(k)) for k in args - if k in ticket_fields]) + arg_list = parse_arg_list(qstring[1:]) + args = arg_list_to_args(arg_list) + constraints = self._get_constraints(arg_list=arg_list) else: constraints = Query.from_string(self.env, qstring).constraints # Substitute $USER, or ensure no field constraints that depend # on $USER are used if we have no username. - for field, vals in constraints.items(): - for (i, val) in enumerate(vals): - if user: - vals[i] = val.replace('$USER', user) - elif val.endswith('$USER'): - del constraints[field] - break + for clause in constraints: + for field, vals in clause.items(): + for (i, val) in enumerate(vals): + if user: + vals[i] = val.replace('$USER', user) + elif val.endswith('$USER'): + del clause[field] + break cols = args.get('col') if isinstance(cols, basestring): @@ -837,43 +934,89 @@ # Internal methods - def _get_constraints(self, req): - constraints = {} - ticket_fields = [f['name'] for f in - TicketSystem(self.env).get_ticket_fields()] - ticket_fields.append('id') - - # For clients without JavaScript, we remove constraints here if - # requested - remove_constraints = {} - to_remove = [k[10:] for k in req.args.keys() - if k.startswith('rm_filter_')] - if to_remove: # either empty or containing a single element - match = re.match(r'(\w+?)_(\d+)$', to_remove[0]) - if match: - remove_constraints[match.group(1)] = int(match.group(2)) - else: - remove_constraints[to_remove[0]] = -1 + remove_re = re.compile(r'rm_filter_\d+_(.+)_(\d+)$') + add_re = re.compile(r'add_(\d+)$') - for field in [k for k in req.args.keys() if k in ticket_fields]: - vals = req.args[field] - if not isinstance(vals, (list, tuple)): - vals = [vals] - if vals: - mode = req.args.get(field + '_mode') - if mode: - vals = [mode + x for x in vals] - if field in remove_constraints: - idx = remove_constraints[field] - if idx >= 0: - del vals[idx] - if not vals: - continue + def _get_constraints(self, req=None, arg_list=[]): + fields = TicketSystem(self.env).get_ticket_fields() + synonyms = TicketSystem(self.env).get_field_synonyms() + fields = dict((f['name'], f) for f in fields) + fields['id'] = {'type': 'id'} + fields.update((k, fields[v]) for k, v in synonyms.iteritems()) + + clauses = [] + if req is not None: + # For clients without JavaScript, we remove constraints here if + # requested + remove_constraints = {} + for k in req.args: + match = self.remove_re.match(k) + if match: + field = match.group(1) + if fields[field]['type'] == 'radio': + index = -1 else: - continue - constraints[field] = vals - - return constraints + index = int(match.group(2)) + remove_constraints[k[10:match.end(1)]] = index + + # Get constraints from form fields, and add a constraint if + # requested for clients without JavaScript + add_num = None + constraints = {} + for k, vals in req.args.iteritems(): + match = self.add_re.match(k) + if match: + add_num = match.group(1) + continue + match = Query.clause_re.match(k) + if not match: + continue + field = match.group('field') + clause_num = int(match.group('clause')) + if field not in fields: + continue + if not isinstance(vals, (list, tuple)): + vals = [vals] + if vals: + mode = req.args.get(k + '_mode') + if mode: + vals = [mode + x for x in vals] + if fields[field]['type'] == 'time': + ends = req.args.getlist(k + '_end') + if ends: + vals = [start + ';' + end + for (start, end) in zip(vals, ends)] + if k in remove_constraints: + idx = remove_constraints[k] + if idx >= 0: + del vals[idx] + if not vals: + continue + else: + continue + field = synonyms.get(field, field) + clause = constraints.setdefault(clause_num, {}) + clause.setdefault(field, []).extend(vals) + if add_num is not None: + field = req.args.get('add_filter_' + add_num, + req.args.get('add_clause_' + add_num)) + if field: + clause = constraints.setdefault(int(add_num), {}) + modes = Query.get_modes().get(fields[field]['type']) + mode = modes and modes[0]['value'] or '' + clause.setdefault(field, []).append(mode) + clauses.extend(each[1] for each in sorted(constraints.iteritems())) + + # Get constraints from query string + clauses.append({}) + for field, val in arg_list or req.arg_list: + if field == "or": + clauses.append({}) + elif field in fields: + clauses[-1].setdefault(field, []).append(val) + clauses = filter(None, clauses) + + return clauses def display_html(self, req, query): db = self.env.get_db_cnx() @@ -884,18 +1027,23 @@ query_time = int(req.session.get('query_time', 0)) query_time = datetime.fromtimestamp(query_time, utc) query_constraints = unicode(query.constraints) - if query_constraints != req.session.get('query_constraints') \ - or query_time < orig_time - timedelta(hours=1): - tickets = query.execute(req, db) - # New or outdated query, (re-)initialize session vars - req.session['query_constraints'] = query_constraints - req.session['query_tickets'] = ' '.join([str(t['id']) - for t in tickets]) - else: - orig_list = [int(id) for id - in req.session.get('query_tickets', '').split()] - tickets = query.execute(req, db, orig_list) - orig_time = query_time + try: + if query_constraints != req.session.get('query_constraints') \ + or query_time < orig_time - timedelta(hours=1): + tickets = query.execute(req, db) + # New or outdated query, (re-)initialize session vars + req.session['query_constraints'] = query_constraints + req.session['query_tickets'] = ' '.join([str(t['id']) + for t in tickets]) + else: + orig_list = [int(id) for id + in req.session.get('query_tickets', '').split()] + tickets = query.execute(req, db, orig_list) + orig_time = query_time + except QueryValueError, e: + tickets = [] + for error in e.errors: + add_warning(req, error) context = Context.from_request(req, 'query') owner_field = [f for f in query.fields if f['name'] == 'owner'] @@ -903,16 +1051,6 @@ TicketSystem(self.env).eventually_restrict_owner(owner_field[0]) data = query.template_data(context, tickets, orig_list, orig_time, req) - # For clients without JavaScript, we add a new constraint here if - # requested - constraints = data['constraints'] - if 'add' in req.args: - field = req.args.get('add_filter') - if field: - constraint = constraints.setdefault(field, {}) - constraint.setdefault('values', []).append('') - # FIXME: '' not always correct (e.g. checkboxes) - req.session['query_href'] = query.get_href(context.href) req.session['query_time'] = to_timestamp(orig_time) req.session['query_tickets'] = ' '.join([str(t['id']) @@ -969,24 +1107,21 @@ if col in ('cc', 'reporter'): value = Chrome(self.env).format_emails(context(ticket), value) + elif col in query.time_fields: + value = format_datetime(value, tzinfo=req.tz) values.append(unicode(value).encode('utf-8')) writer.writerow(values) return (content.getvalue(), '%s;charset=utf-8' % mimetype) def export_rss(self, req, query): + context = Context.from_request(req, 'query', absurls=True) + query_href = query.get_href(context.href) if 'description' not in query.rows: query.rows.append('description') db = self.env.get_db_cnx() results = query.execute(req, db) - query_href = req.abs_href.query(group=query.group, - groupdesc=(query.groupdesc and 1 - or None), - row=query.rows, - page=req.args.get('page'), - max=req.args.get('max'), - **query.constraints) data = { - 'context': Context.from_request(req, 'query', absurls=True), + 'context': context, 'results': results, 'query_href': query_href } @@ -1013,11 +1148,12 @@ href=query.get_href(formatter.context.href), class_='query') except QuerySyntaxError, e: - return tag.em(_('[Error: %(error)s]', error=e), class_='error') + return tag.em(_('[Error: %(error)s]', error=unicode(e)), + class_='error') class TicketQueryMacro(WikiMacroBase): - """Macro that lists tickets that match certain criteria. + """Wiki macro listing tickets that match certain criteria. This macro accepts a comma-separated list of keyed parameters, in the form "key=value". @@ -1025,8 +1161,12 @@ If the key is the name of a field, the value must use the syntax of a filter specifier as defined in TracQuery#QueryLanguage. Note that this is ''not'' the same as the simplified URL syntax - used for `query:` links starting with a `?` character. + used for `query:` links starting with a `?` character. Commas (`,`) + can be included in field values by escaping them with a backslash (`\`). + Groups of field constraints to be OR-ed together can be separated by a + litteral `or` argument. + In addition to filters, several other named parameters can be used to control how the results are presented. All of them are optional. @@ -1062,19 +1202,38 @@ The `rows` parameter can be used to specify which field(s) should be viewed as a row, e.g. `rows=description|summary` - For compatibility with Trac 0.10, if there's a second positional parameter + For compatibility with Trac 0.10, if there's a last positional parameter given to the macro, it will be used to specify the `format`. Also, using "&" as a field separator still works (except for `order`) but is deprecated. """ - def expand_macro(self, formatter, name, content): - req = formatter.req - query_string = '' - argv, kwargs = parse_args(content, strict=False) + _comma_splitter = re.compile(r'(? 0 and not 'format' in kwargs: # 0.10 compatibility hack kwargs['format'] = argv[0] - if 'order' not in kwargs: kwargs['order'] = 'id' if 'max' not in kwargs: @@ -1082,11 +1241,23 @@ format = kwargs.pop('format', 'list').strip().lower() if format in ('list', 'compact'): # we need 'status' and 'summary' - kwargs['col'] = '|'.join(['status', 'summary', - kwargs.get('col', '')]) + if 'col' in kwargs: + kwargs['col'] = 'status|summary|' + kwargs['col'] + else: + kwargs['col'] = 'status|summary' - query_string = '&'.join(['%s=%s' % item - for item in kwargs.iteritems()]) + query_string = '&or&'.join('&'.join('%s=%s' % item + for item in clause.iteritems()) + for clause in clauses) + return query_string, kwargs, format + + def expand_macro(self, formatter, name, content): + req = formatter.req + query_string, kwargs, format = self.parse_args(content) + if query_string: + query_string += '&' + query_string += '&'.join('%s=%s' % item + for item in kwargs.iteritems()) query = Query.from_string(self.env, query_string) if format == 'count': @@ -1131,7 +1302,8 @@ "%(query)s", groupvalue=v, groupname=query.group, query=q.to_string()) # produce the href for the query corresponding to the group - q.constraints[str(query.group)] = v + for constraint in q.constraints: + constraint[str(query.group)] = v q.order = order href = q.get_href(formatter.context) groups.append((v, [t for t in g], href, title)) @@ -1150,8 +1322,10 @@ else: if query.group: return tag.div( - [(tag.p(tag.a(query.group, ' ', v, href=href, - class_='query', title=title)), + [(tag.p(tag_('%(groupvalue)s %(groupname)s tickets:', + groupvalue=tag.a(v, href=href, class_='query', + title=title), + groupname=query.group)), tag.dl([(tag.dt(ticket_anchor(t)), tag.dd(t['summary'])) for t in g], class_='wiki compact')) diff -Nru trac-0.11.7/trac/ticket/report.py trac-0.12.1~ppa2/trac/ticket/report.py --- trac-0.11.7/trac/ticket/report.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/report.py 2010-04-16 09:54:28.000000000 +0100 @@ -28,14 +28,16 @@ from trac.mimeview import Context from trac.perm import IPermissionRequestor from trac.resource import Resource, ResourceNotFound -from trac.util import sorted -from trac.util.datefmt import format_datetime, format_time +from trac.ticket.api import TicketSystem +from trac.util import as_int +from trac.util.datefmt import format_datetime, format_time, from_utimestamp from trac.util.presentation import Paginator -from trac.util.text import to_unicode, unicode_urlencode +from trac.util.text import to_unicode from trac.util.translation import _ from trac.web.api import IRequestHandler, RequestDone -from trac.web.chrome import add_ctxtnav, add_link, add_notice, \ - add_stylesheet, INavigationContributor, Chrome +from trac.web.chrome import add_ctxtnav, add_link, add_notice, add_script, \ + add_stylesheet, add_warning, \ + INavigationContributor, Chrome from trac.wiki import IWikiSyntaxProvider, WikiParser @@ -93,26 +95,29 @@ id = int(req.args.get('id', -1)) action = req.args.get('action', 'view') - db = self.env.get_db_cnx() - data = {} if req.method == 'POST': if action == 'new': - self._do_create(req, db) + self._do_create(req) elif action == 'delete': - self._do_delete(req, db, id) + self._do_delete(req, id) elif action == 'edit': - self._do_save(req, db, id) + self._do_save(req, id) elif action in ('copy', 'edit', 'new'): template = 'report_edit.html' - data = self._render_editor(req, db, id, action=='copy') + data = self._render_editor(req, id, action=='copy') + Chrome(self.env).add_wiki_toolbars(req) elif action == 'delete': template = 'report_delete.html' - data = self._render_confirm_delete(req, db, id) + data = self._render_confirm_delete(req, id) + elif id == -1: + template, data, content_type = self._render_list(req) + if content_type: # i.e. alternate format + return template, data, content_type else: - template, data, content_type = self._render_view(req, db, id) + template, data, content_type = self._render_view(req, id) if content_type: # i.e. alternate format - return template, data, content_type + return template, data, content_type if id != -1 or action == 'new': add_ctxtnav(req, _('Available Reports'), href=req.href.report()) @@ -135,7 +140,7 @@ # Internal methods - def _do_create(self, req, db): + def _do_create(self, req): req.perm.require('REPORT_CREATE') if 'cancel' in req.args: @@ -144,27 +149,30 @@ title = req.args.get('title', '') query = req.args.get('query', '') description = req.args.get('description', '') - cursor = db.cursor() - cursor.execute("INSERT INTO report (title,query,description) " - "VALUES (%s,%s,%s)", (title, query, description)) - id = db.get_last_id(cursor, 'report') - db.commit() + report_id = [ None ] + @self.env.with_transaction() + def do_create(db): + cursor = db.cursor() + cursor.execute("INSERT INTO report (title,query,description) " + "VALUES (%s,%s,%s)", (title, query, description)) + report_id[0] = db.get_last_id(cursor, 'report') add_notice(req, _('The report has been created.')) - req.redirect(req.href.report(id)) + req.redirect(req.href.report(report_id[0])) - def _do_delete(self, req, db, id): + def _do_delete(self, req, id): req.perm.require('REPORT_DELETE') if 'cancel' in req.args: req.redirect(req.href.report(id)) - cursor = db.cursor() - cursor.execute("DELETE FROM report WHERE id=%s", (id,)) - db.commit() + @self.env.with_transaction() + def do_delete(db): + cursor = db.cursor() + cursor.execute("DELETE FROM report WHERE id=%s", (id,)) add_notice(req, _('The report {%(id)d} has been deleted.', id=id)) req.redirect(req.href.report()) - def _do_save(self, req, db, id): + def _do_save(self, req, id): """Save report changes to the database""" req.perm.require('REPORT_MODIFY') @@ -172,16 +180,19 @@ title = req.args.get('title', '') query = req.args.get('query', '') description = req.args.get('description', '') - cursor = db.cursor() - cursor.execute("UPDATE report SET title=%s,query=%s,description=%s " - "WHERE id=%s", (title, query, description, id)) - db.commit() + @self.env.with_transaction() + def do_save(db): + cursor = db.cursor() + cursor.execute("UPDATE report " + "SET title=%s,query=%s,description=%s " + "WHERE id=%s", (title, query, description, id)) add_notice(req, _('Your changes have been saved.')) req.redirect(req.href.report(id)) - def _render_confirm_delete(self, req, db, id): + def _render_confirm_delete(self, req, id): req.perm.require('REPORT_DELETE') + db = self.env.get_db_cnx() cursor = db.cursor() cursor.execute("SELECT title FROM report WHERE id=%s", (id,)) for title, in cursor: @@ -190,19 +201,20 @@ 'action': 'delete', 'report': {'id': id, 'title': title}} else: - raise TracError(_('Report %(num)s does not exist.', num=id), + raise TracError(_('Report {%(num)s} does not exist.', num=id), _('Invalid Report Number')) - def _render_editor(self, req, db, id, copy): + def _render_editor(self, req, id, copy): if id != -1: req.perm.require('REPORT_MODIFY') + db = self.env.get_db_cnx() cursor = db.cursor() cursor.execute("SELECT title,description,query FROM report " "WHERE id=%s", (id,)) for title, description, query in cursor: break else: - raise TracError(_('Report %(num)s does not exist.', num=id), + raise TracError(_('Report {%(num)s} does not exist.', num=id), _('Invalid Report Number')) else: req.perm.require('REPORT_CREATE') @@ -228,31 +240,67 @@ 'sql': query, 'description': description} return data - def _render_view(self, req, db, id): + def _render_list(self, req): + """Render the list of available reports.""" + sort = req.args.get('sort', 'report') + asc = bool(int(req.args.get('asc', 1))) + format = req.args.get('format') + + db = self.env.get_db_cnx() + cursor = db.cursor() + cursor.execute("SELECT id, title FROM report ORDER BY %s%s" + % (sort == 'title' and 'title' or 'id', + not asc and ' DESC' or '')) + rows = list(cursor) + + if format == 'rss': + data = {'rows': rows} + return 'report_list.rss', data, 'application/rss+xml' + elif format == 'csv': + self._send_csv(req, ['report', 'title'], rows, mimetype='text/csv', + filename='reports.csv') + elif format == 'tab': + self._send_csv(req, ['report', 'title'], rows, '\t', + mimetype='text/tab-separated-values', + filename='reports.tsv') + + def report_href(**kwargs): + return req.href.report(sort=req.args.get('sort'), + asc=asc and '1' or '0', **kwargs) + + add_link(req, 'alternate', + report_href(format='rss'), + _('RSS Feed'), 'application/rss+xml', 'rss') + add_link(req, 'alternate', report_href(format='csv'), + _('Comma-delimited Text'), 'text/plain') + add_link(req, 'alternate', report_href(format='tab'), + _('Tab-delimited Text'), 'text/plain') + + reports = [(id, title, 'REPORT_MODIFY' in req.perm('report', id), + 'REPORT_DELETE' in req.perm('report', id)) + for id, title in rows] + data = {'reports': reports, 'sort': sort, 'asc': asc} + + return 'report_list.html', data, None + + def _render_view(self, req, id): """Retrieve the report results and pre-process them for rendering.""" + db = self.env.get_db_cnx() + cursor = db.cursor() + cursor.execute("SELECT title,query,description from report " + "WHERE id=%s", (id,)) + for title, sql, description in cursor: + break + else: + raise ResourceNotFound( + _('Report {%(num)s} does not exist.', num=id), + _('Invalid Report Number')) + try: args = self.get_var_args(req) - except ValueError,e: + except ValueError, e: raise TracError(_('Report failed: %(error)s', error=e)) - if id == -1: - # If no particular report was requested, display - # a list of available reports instead - title = _('Available Reports') - sql = ("SELECT id AS report, title, 'report' as _realm " - "FROM report ORDER BY report") - description = _('This is a list of available reports.') - else: - cursor = db.cursor() - cursor.execute("SELECT title,query,description from report " - "WHERE id=%s", (id,)) - for title, sql, description in cursor: - break - else: - raise ResourceNotFound( - _('Report %(num)s does not exist.', num=id), - _('Invalid Report Number')) - # If this is a saved custom query. redirect to the query module # # A saved query is either an URL query (?... or query:?...), @@ -287,27 +335,50 @@ if format == 'sql': self._send_sql(req, id, title, description, sql) - if id > 0: - title = '{%i} %s' % (id, title) + title = '{%i} %s' % (id, title) report_resource = Resource('report', id) req.perm.require('REPORT_VIEW', report_resource) context = Context.from_request(req, report_resource) + + page = int(req.args.get('page', '1')) + default_max = {'rss': self.items_per_page_rss, + 'csv': 0, 'tab': 0}.get(format, self.items_per_page) + max = req.args.get('max') + limit = as_int(max, default_max, min=0) # explict max takes precedence + offset = (page - 1) * limit + + sort_col = req.args.get('sort', '') + asc = req.args.get('asc', 1) + asc = bool(int(asc)) # string '0' or '1' to int/boolean + + def report_href(**kwargs): + """Generate links to this report preserving user variables, + and sorting and paging variables. + """ + params = args.copy() + if sort_col: + params['sort'] = sort_col + params['page'] = page + if max: + params['max'] = max + params.update(kwargs) + params['asc'] = params.get('asc', asc) and '1' or '0' + return req.href.report(id, params) + data = {'action': 'view', 'report': {'id': id, 'resource': report_resource}, 'context': context, 'title': title, 'description': description, - 'args': args, 'message': None, 'paginator':None} - - page = int(req.args.get('page', '1')) - limit = {'rss': self.items_per_page_rss, - 'csv': 0, 'tab': 0}.get(format, self.items_per_page) - offset = (page - 1) * limit - user = req.args.get('USER', None) + 'max': limit, 'args': args, 'show_args_form': False, + 'message': None, 'paginator': None, + 'report_href': report_href + } try: - cols, results, num_items = self.execute_paginated_report( - req, db, id, sql, args, limit, offset) + cols, results, num_items, missing_args = \ + self.execute_paginated_report(req, db, id, sql, args, limit, + offset) results = [list(row) for row in results] numrows = len(results) @@ -316,27 +387,23 @@ data['message'] = _('Report execution failed: %(error)s', error=to_unicode(e)) return 'report_view.html', data, None + paginator = None - if id != -1 and limit > 0: - asc = req.args.get('asc', None) - sort_col = req.args.get('sort', None) + if limit > 0: paginator = Paginator(results, page - 1, limit, num_items) data['paginator'] = paginator if paginator.has_next_page: - next_href = req.href.report(id, asc=asc, sort=sort_col, - page=page + 1, **args) - add_link(req, 'next', next_href, _('Next Page')) + add_link(req, 'next', report_href(page=page + 1), + _('Next Page')) if paginator.has_previous_page: - prev_href = req.href.report(id, asc=asc, sort=sort_col, - page=page - 1, **args) - add_link(req, 'prev', prev_href, _('Previous Page')) + add_link(req, 'prev', report_href(page=page - 1), + _('Previous Page')) pagedata = [] shown_pages = paginator.get_shown_pages(21) for p in shown_pages: - pagedata.append([req.href.report(id, asc=asc, sort=sort_col, - page=p, **args), - None, str(p), _('Page %(num)d', num=p)]) + pagedata.append([report_href(page=p), None, str(p), + _('Page %(num)d', num=p)]) fields = ['href', 'class', 'string', 'title'] paginator.shown_pages = [dict(zip(fields, p)) for p in pagedata] paginator.current_page = {'href': None, 'class': 'current', @@ -344,18 +411,21 @@ 'title': None} numrows = paginator.num_items - sort_col = req.args.get('sort', '') - asc = req.args.get('asc', 1) - asc = bool(int(asc)) # string '0' or '1' to int/boolean - # Place retrieved columns in groups, according to naming conventions # * _col_ means fullrow, i.e. a group with one header # * col_ means finish the current group and start a new one + + field_labels = TicketSystem(self.env).get_ticket_field_labels() + header_groups = [[]] for idx, col in enumerate(cols): + if col in field_labels: + title = field_labels[col] + else: + title = col.strip('_').capitalize() header = { 'col': col, - 'title': col.strip('_').capitalize(), + 'title': title, 'hidden': False, 'asc': False } @@ -432,7 +502,8 @@ # Other row properties row['__idx__'] = row_idx if col in ('__style__', '__color__', - '__fgcolor__', '__bgcolor__'): + '__fgcolor__', '__bgcolor__', + '__grouplink__'): row[col] = value if col in ('report', 'ticket', 'id', '_id'): row['id'] = value @@ -475,9 +546,6 @@ 'sorting_enabled': len(row_groups)==1, 'email_map': email_map}) - if id and id != -1: - self.add_alternate_links(req, args) - if format == 'rss': data['context'] = Context.from_request(req, report_resource, absurls=True) @@ -492,46 +560,44 @@ mimetype='text/tab-separated-values', filename=filename) else: - if id != -1: - # reuse the session vars of the query module so that - # the query navigation links on the ticket can be used to - # navigate report results as well - try: - req.session['query_tickets'] = \ - ' '.join([str(int(row['id'])) - for rg in row_groups for row in rg[1]]) - req.session['query_href'] = \ - req.href.report(id, asc=req.args.get('asc', None), - sort=req.args.get('sort', None), - page=page, **args) - # Kludge: we have to clear the other query session - # variables, but only if the above succeeded - for var in ('query_constraints', 'query_time'): - if var in req.session: - del req.session[var] - except (ValueError, KeyError): - pass + p = max is not None and page or None + add_link(req, 'alternate', + report_href(format='rss', page=None), + _('RSS Feed'), 'application/rss+xml', 'rss') + add_link(req, 'alternate', report_href(format='csv', page=p), + _('Comma-delimited Text'), 'text/plain') + add_link(req, 'alternate', report_href(format='tab', page=p), + _('Tab-delimited Text'), 'text/plain') + if 'REPORT_SQL_VIEW' in req.perm: + add_link(req, 'alternate', + req.href.report(id=id, format='sql'), + _('SQL Query'), 'text/plain') + + # reuse the session vars of the query module so that + # the query navigation links on the ticket can be used to + # navigate report results as well + try: + req.session['query_tickets'] = \ + ' '.join([str(int(row['id'])) + for rg in row_groups for row in rg[1]]) + req.session['query_href'] = \ + req.session['query_href'] = report_href() + # Kludge: we have to clear the other query session + # variables, but only if the above succeeded + for var in ('query_constraints', 'query_time'): + if var in req.session: + del req.session[var] + except (ValueError, KeyError): + pass + if set(data['args']) - set(['USER']): + data['show_args_form'] = True + add_script(req, 'common/js/folding.js') + if missing_args: + add_warning(req, _( + 'The following arguments are missing: %(args)s', + args=", ".join(missing_args))) return 'report_view.html', data, None - def add_alternate_links(self, req, args): - params = args.copy() - if 'sort' in req.args: - params['sort'] = req.args['sort'] - if 'asc' in req.args: - params['asc'] = req.args['asc'] - href = '' - if params: - href = '&' + unicode_urlencode(params) - add_link(req, 'alternate', '?format=rss' + href, _('RSS Feed'), - 'application/rss+xml', 'rss') - add_link(req, 'alternate', '?format=csv' + href, - _('Comma-delimited Text'), 'text/plain') - add_link(req, 'alternate', '?format=tab' + href, - _('Tab-delimited Text'), 'text/plain') - if 'REPORT_SQL_VIEW' in req.perm: - add_link(req, 'alternate', '?format=sql', _('SQL Query'), - 'text/plain') - def execute_report(self, req, db, id, sql, args): """Execute given sql report (0.10 backward compatibility method) @@ -541,9 +607,9 @@ def execute_paginated_report(self, req, db, id, sql, args, limit=0, offset=0): - sql, args = self.sql_sub_vars(sql, args, db) + sql, args, missing_args = self.sql_sub_vars(sql, args, db) if not sql: - raise TracError(_('Report %(num)s has no SQL query.', num=id)) + raise TracError(_('Report {%(num)s} has no SQL query.', num=id)) self.log.debug('Executing report with SQL "%s"' % sql) self.log.debug('Request args: %r' % req.args) cursor = db.cursor() @@ -584,7 +650,7 @@ order = ', '.join(order_cols) order_by = " ".join([' ORDER BY', order, asc_str]) sql = " ".join(['SELECT * FROM (', sql, ') AS tab', order_by]) - sql =" ".join([sql, 'LIMIT', str(limit), 'OFFSET', str(offset)]) + sql = " ".join([sql, 'LIMIT', str(limit), 'OFFSET', str(offset)]) self.log.debug("Query SQL: " + sql) cursor.execute(sql, args) # FIXME: fetchall should probably not be used. @@ -593,9 +659,10 @@ db.rollback() - return cols, info, num_items + return cols, info, num_items, missing_args def get_var_args(self, req): + # FIXME unicode: req.args keys are likely not unicode but str (UTF-8?) report_args = {} for arg in req.args.keys(): if not arg.isupper(): @@ -611,16 +678,19 @@ def sql_sub_vars(self, sql, args, db=None): if db is None: db = self.env.get_db_cnx() + names = set() values = [] + missing_args = [] def add_value(aname): + names.add(aname) try: arg = args[aname] except KeyError: - raise TracError(_("Dynamic variable '%(name)s' not defined.", - name='$%s' % aname)) + arg = args[str(aname)] = '' + missing_args.append(aname) values.append(arg) - var_re = re.compile("[$]([A-Z]+)") + var_re = re.compile("[$]([A-Z_][A-Z0-9_]*)") # simple parameter substitution outside literal def repl(match): @@ -648,15 +718,19 @@ sql_io.write(repl_literal(expr)) else: sql_io.write(var_re.sub(repl, expr)) - return sql_io.getvalue(), values + + # Remove arguments that don't appear in the SQL query + for name in set(args) - names: + del args[name] + return sql_io.getvalue(), values, missing_args def _send_csv(self, req, cols, rows, sep=',', mimetype='text/plain', filename=None): def iso_time(t): - return format_time(t, 'iso8601') + return format_time(from_utimestamp(t), 'iso8601') def iso_datetime(dt): - return format_datetime(dt, 'iso8601') + return format_datetime(from_utimestamp(dt), 'iso8601') col_conversions = { 'time': iso_time, diff -Nru trac-0.11.7/trac/ticket/roadmap.py trac-0.12.1~ppa2/trac/ticket/roadmap.py --- trac-0.11.7/trac/ticket/roadmap.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/roadmap.py 2010-04-20 22:17:52.000000000 +0100 @@ -18,7 +18,6 @@ from StringIO import StringIO from datetime import datetime import re -from time import localtime, strftime, time from genshi.builder import tag @@ -30,18 +29,17 @@ from trac.perm import IPermissionRequestor from trac.resource import * from trac.search import ISearchSource, search_to_sql, shorten_result -from trac.util.compat import set, sorted -from trac.util.datefmt import parse_date, utc, to_timestamp, to_datetime, \ +from trac.util.datefmt import parse_date, utc, to_utimestamp, \ get_date_format_hint, get_datetime_format_hint, \ - format_date, format_datetime -from trac.util.text import shorten_line, CRLF, to_unicode -from trac.util.translation import _ + format_date, format_datetime, from_utimestamp +from trac.util.text import CRLF +from trac.util.translation import _, tag_ from trac.ticket import Milestone, Ticket, TicketSystem, group_milestones -from trac.ticket.query import Query, QueryModule +from trac.ticket.query import QueryModule from trac.timeline.api import ITimelineEventProvider from trac.web import IRequestHandler, RequestDone -from trac.web.chrome import add_link, add_notice, add_stylesheet, \ - add_warning, INavigationContributor +from trac.web.chrome import add_link, add_notice, add_script, add_stylesheet, \ + add_warning, Chrome, INavigationContributor from trac.wiki.api import IWikiSyntaxProvider from trac.wiki.formatter import format_to @@ -61,7 +59,7 @@ `title` is the display name of this group of stats (e.g. 'ticket status'). - `unit` is the display name of the units for these stats (e.g. 'hour'). + `unit` is the units for these stats in plural form, e.g. _('hours') """ self.title = title self.unit = unit @@ -204,7 +202,7 @@ for s, cnt in cursor: status_cnt[s] = cnt - stat = TicketGroupStats('ticket status', 'ticket') + stat = TicketGroupStats(_('ticket status'), _('tickets')) remaining_statuses = set(all_statuses) groups = self._get_ticket_groups() catch_all_group = None @@ -328,14 +326,20 @@ return req.path_info == '/roadmap' def process_request(self, req): - milestone_realm = Resource('milestone') req.perm.require('MILESTONE_VIEW') - showall = req.args.get('show') == 'all' + show = req.args.getlist('show') + if 'all' in show: + show = ['completed'] db = self.env.get_db_cnx() - milestones = [m for m in Milestone.select(self.env, showall, db) + milestones = Milestone.select(self.env, 'completed' in show, db) + if 'noduedate' in show: + milestones = [m for m in milestones + if m.due is not None or m.completed] + milestones = [m for m in milestones if 'MILESTONE_VIEW' in req.perm(m.resource)] + stats = [] queries = [] @@ -356,8 +360,7 @@ username = None if req.authname and req.authname != 'anonymous': username = req.authname - icshref = req.href.roadmap(show=req.args.get('show'), user=username, - format='ics') + icshref = req.href.roadmap(show=show, user=username, format='ics') add_link(req, 'alternate', icshref, _('iCalendar'), 'text/calendar', 'ics') @@ -365,8 +368,9 @@ 'milestones': milestones, 'milestone_stats': stats, 'queries': queries, - 'showall': showall, + 'show': show, } + add_stylesheet(req, 'common/css/roadmap.css') return 'roadmap.html', data, None # Internal methods @@ -392,7 +396,8 @@ elif status == 'assigned' or status == 'reopened': return 'IN-PROCESS' elif status == 'closed': - if ticket['resolution'] == 'fixed': return 'COMPLETED' + if ticket['resolution'] == 'fixed': + return 'COMPLETED' else: return 'CANCELLED' else: return '' @@ -405,7 +410,8 @@ + ':' + escape_value(value) firstline = 1 while text: - if not firstline: text = ' ' + text + if not firstline: + text = ' ' + text else: firstline = 0 buf.write(text[:75] + CRLF) text = text[75:] @@ -427,7 +433,7 @@ % __version__) write_prop('METHOD', 'PUBLISH') write_prop('X-WR-CALNAME', - self.config.get('project', 'name') + ' - ' + _('Roadmap')) + self.env.project_name + ' - ' + _('Roadmap')) for milestone in milestones: uid = '<%s/milestone/%s@%s>' % (req.base_path, milestone.name, host) @@ -436,9 +442,8 @@ write_prop('UID', uid) write_utctime('DTSTAMP', milestone.due) write_date('DTSTART', milestone.due) - write_prop('SUMMARY', _('Milestone %(name)s') % { - 'name': milestone.name - }) + write_prop('SUMMARY', _('Milestone %(name)s', + name=milestone.name)) write_prop('URL', req.base_url + '/milestone/' + milestone.name) if milestone.description: @@ -456,9 +461,9 @@ if milestone.due: write_prop('RELATED-TO', uid) write_date('DUE', milestone.due) - write_prop('SUMMARY', _('Ticket #%(num)s: %(summary)s') % { - 'num': ticket.id, 'summary': ticket['summary'] - }) + write_prop('SUMMARY', _('Ticket #%(num)s: %(summary)s', + num=ticket.id, + summary=ticket['summary'])) write_prop('URL', req.abs_href.ticket(ticket.id)) write_prop('DESCRIPTION', ticket['description']) priority = get_priority(ticket) @@ -473,7 +478,7 @@ (ticket.id,)) row = cursor.fetchone() if row: - write_utctime('COMPLETED', to_datetime(row[0], utc)) + write_utctime('COMPLETED', from_utimestamp(row[0])) write_prop('END', 'VTODO') write_prop('END', 'VCALENDAR') @@ -484,7 +489,6 @@ raise RequestDone - class MilestoneModule(Component): implements(INavigationContributor, IPermissionRequestor, IRequestHandler, @@ -518,7 +522,7 @@ def get_timeline_filters(self, req): if 'MILESTONE_VIEW' in req.perm: - yield ('milestone', _('Milestones')) + yield ('milestone', _('Milestones reached')) def get_timeline_events(self, req, start, stop, filters): if 'milestone' in filters: @@ -528,11 +532,11 @@ # TODO: creation and (later) modifications should also be reported cursor.execute("SELECT completed,name,description FROM milestone " "WHERE completed>=%s AND completed<=%s", - (to_timestamp(start), to_timestamp(stop))) + (to_utimestamp(start), to_utimestamp(stop))) for completed, name, description in cursor: milestone = milestone_realm(id=name) if 'MILESTONE_VIEW' in req.perm(milestone): - yield('milestone', datetime.fromtimestamp(completed, utc), + yield('milestone', from_utimestamp(completed), '', (milestone, description)) # FIXME: author? # Attachments @@ -545,7 +549,8 @@ if field == 'url': return context.href.milestone(milestone.id) elif field == 'title': - return tag('Milestone ', tag.em(milestone.id), ' completed') + return tag_('Milestone %(name)s completed', + name=tag.em(milestone.id)) elif field == 'description': return format_to(self.env, None, context(resource=milestone), description) @@ -566,8 +571,15 @@ add_link(req, 'up', req.href.roadmap(), _('Roadmap')) db = self.env.get_db_cnx() # TODO: db can be removed - milestone = Milestone(self.env, milestone_id, db) action = req.args.get('action', 'view') + try: + milestone = Milestone(self.env, milestone_id, db) + except ResourceNotFound: + if 'MILESTONE_CREATE' not in req.perm('milestone', milestone_id): + raise + milestone = Milestone(self.env, None, db) + milestone.name = milestone_id + action = 'edit' # rather than 'new' so that it works for POST/save if req.method == 'POST': if req.args.has_key('cancel'): @@ -578,7 +590,7 @@ elif action == 'edit': return self._do_save(req, db, milestone) elif action == 'delete': - self._do_delete(req, db, milestone) + self._do_delete(req, milestone) elif action in ('new', 'edit'): return self._render_editor(req, db, milestone) elif action == 'delete': @@ -591,14 +603,13 @@ # Internal methods - def _do_delete(self, req, db, milestone): + def _do_delete(self, req, milestone): req.perm(milestone.resource).require('MILESTONE_DELETE') retarget_to = None if req.args.has_key('retarget'): retarget_to = req.args.get('target') or None milestone.delete(retarget_to, req.authname) - db.commit() add_notice(req, _('The milestone "%(name)s" has been deleted.', name=milestone.name)) req.redirect(req.href.roadmap()) @@ -628,20 +639,22 @@ warnings.append(msg) # -- check the name - if new_name: - if new_name != old_name: - # check that the milestone doesn't already exists - # FIXME: the whole .exists business needs to be clarified - # (#4130) and should behave like a WikiPage does in - # this respect. - try: - other_milestone = Milestone(self.env, new_name, db) - warn(_('Milestone "%(name)s" already exists, please ' - 'choose another name', name=new_name)) - except ResourceNotFound: - milestone.name = new_name - else: - warn(_('You must provide a name for the milestone.')) + # If the name has changed, check that the milestone doesn't already + # exist + # FIXME: the whole .exists business needs to be clarified + # (#4130) and should behave like a WikiPage does in + # this respect. + try: + new_milestone = Milestone(self.env, new_name, db) + if new_milestone.name == old_name: + pass # Creation or no name change + elif new_milestone.name: + warn(_('Milestone "%(name)s" already exists, please ' + 'choose another name.', name=new_milestone.name)) + else: + warn(_('You must provide a name for the milestone.')) + except ResourceNotFound: + milestone.name = new_name # -- check completed date if 'completed' in req.args: @@ -660,15 +673,16 @@ milestone.update() # eventually retarget opened tickets associated with the milestone if 'retarget' in req.args and completed: - cursor = db.cursor() - cursor.execute("UPDATE ticket SET milestone=%s WHERE " - "milestone=%s and status != 'closed'", - (retarget_to, old_name)) + @self.env.with_transaction() + def retarget(db): + cursor = db.cursor() + cursor.execute("UPDATE ticket SET milestone=%s WHERE " + "milestone=%s and status != 'closed'", + (retarget_to, old_name)) self.env.log.info('Tickets associated with milestone %s ' 'retargeted to %s' % (old_name, retarget_to)) else: milestone.insert() - db.commit() add_notice(req, _('Your changes have been saved.')) req.redirect(req.href.milestone(milestone.name)) @@ -704,6 +718,7 @@ else: req.perm(milestone.resource).require('MILESTONE_CREATE') + Chrome(self.env).add_wiki_toolbars(req) return 'milestone_edit.html', data, None def _render_view(self, req, db, milestone): @@ -782,6 +797,8 @@ percent = float(gstat.count) / float(max_count) * 100 gs_dict['percent_of_max_total'] = percent + add_stylesheet(req, 'common/css/roadmap.css') + add_script(req, 'common/js/folding.js') return 'milestone_view.html', data, None # IWikiSyntaxProvider methods @@ -851,10 +868,10 @@ for name, due, completed, description in cursor: milestone = milestone_realm(id=name) if 'MILESTONE_VIEW' in req.perm(milestone): + dt = (completed and from_utimestamp(completed) or + due and from_utimestamp(due) or datetime.now(utc)) yield (get_resource_url(self.env, milestone, req.href), - get_resource_name(self.env, milestone), - datetime.fromtimestamp( - completed or due or time(), utc), + get_resource_name(self.env, milestone), dt, '', shorten_result(description, terms)) # Attachments diff -Nru trac-0.11.7/trac/ticket/templates/milestone_delete.html trac-0.12.1~ppa2/trac/ticket/templates/milestone_delete.html --- trac-0.11.7/trac/ticket/templates/milestone_delete.html 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/templates/milestone_delete.html 2010-01-13 21:58:49.000000000 +0000 @@ -3,6 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> @@ -31,17 +32,17 @@ + value="${milestone.name}" py:content="milestone.name">

- - + +

Note: See +

Note: See TracRoadmap for help on using the roadmap.

diff -Nru trac-0.11.7/trac/ticket/templates/milestone_edit.html trac-0.12.1~ppa2/trac/ticket/templates/milestone_edit.html --- trac-0.11.7/trac/ticket/templates/milestone_edit.html 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/templates/milestone_edit.html 2010-03-07 09:14:01.000000000 +0000 @@ -3,6 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> @@ -12,7 +13,6 @@ - - @@ -23,34 +24,37 @@

- Completed ${dateinfo(milestone.completed)} ago - (${format_datetime(milestone.completed)}) + + Completed ${dateinfo(milestone.completed)} ago (${format_datetime(milestone.completed)}) +

- ${dateinfo(milestone.due)} late - (${format_date(milestone.due)}) + + ${dateinfo(milestone.due)} late (${format_date(milestone.due)}) +

- Due in ${dateinfo(milestone.due)} - (${format_date(milestone.due)}) + + Due in ${dateinfo(milestone.due)} (${format_date(milestone.due)}) +

No date set

- ${progress_bar(stats, interval_hrefs, stats_href=stats_href)} +

- ${stats.title.capitalize()} by + ${stats.title.capitalize()} by - + @@ -66,11 +70,14 @@ ${group.name} - ${progress_bar(group.stats, (group.interval_hrefs, None) - [grouped_by in ['owner', 'reporter'] - and group.name != format_author(group.name)], - '%d / %d' % (group.stats.done_count, group.stats.count), - legend=False, style="width: %d%%" % (group.percent_of_max_total * 0.8))} + @@ -81,7 +88,8 @@ ${wiki_to_html(context, milestone.description)}

- ${list_of_attachments(attachments, compact=True)} +

- +

- ${attach_file_form(attachments)} +

Note: See +

Note: See TracRoadmap for help on using the roadmap.

diff -Nru trac-0.11.7/trac/ticket/templates/query.html trac-0.12.1~ppa2/trac/ticket/templates/query.html --- trac-0.11.7/trac/ticket/templates/query.html 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/templates/query.html 2010-05-01 17:01:31.000000000 +0100 @@ -3,6 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> @@ -24,111 +25,134 @@ - - (${v or 'No'} match${v != 1 and 'es' or ''}) - -

$title ${num_matches(query.num_items)}

$title (${ngettext('%(num)s match', '%(num)s matches', query.num_items)})

${wiki_to_html(context(report_resource), description)}

+ py:with="field_names = sorted(fields.iterkeys(), key=lambda name: fields[name].label.lower())">

- Filters - - - - - - - - + + + + +

+ + + + - - + - + - - - - - - + - - - - + + + + + + +

+ + + +	$field.label	-	${fields[field_name].label}	+	or	or	- + selected="${option == constraint_value and 'selected' or None}" + value="$option" py:content="option"> - - ${option or 'none'} + ${option or 'none'} - - yes - yes + - no + no - - + + + + + + + between + + and + + -
- Add filter - - -
+ And + + + + +		+ Or + + + + +

@@ -142,7 +166,7 @@ - ${labels.get(column, column or 'none')} + ${fields.get(column, {'label': column or 'none'}).label}

@@ -164,12 +188,12 @@

- + Show under each result: - ${labels.get(column, column or 'none')} + ${fields.get(column, {'label': column or 'none'}).label}

@@ -182,7 +206,7 @@ - +

@@ -211,36 +235,38 @@ -

Note: See TracQuery for help on using queries.

diff -Nru trac-0.11.7/trac/ticket/templates/query_results.html trac-0.12.1~ppa2/trac/ticket/templates/query_results.html --- trac-0.11.7/trac/ticket/templates/query_results.html 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/templates/query_results.html 2010-05-01 17:01:31.000000000 +0100 @@ -15,13 +15,8 @@ -->

- - - - (${v or 'No'} match${v != 1 and 'es' or ''}) - -

Results (${paginator.displayed_items()})

@@ -30,15 +25,17 @@

${fields[query.group].label}: ${query.group in ['owner', 'reporter'] and authorinfo(groupname) or groupname} - ${num_matches(len(results))} + (${ngettext('%(num)s match', '%(num)s matches', len(results))})

@@ -59,7 +56,8 @@ 'removed' in result and ' removed' or ''}"> - + @@ -88,7 +86,7 @@ - + diff -Nru trac-0.11.7/trac/ticket/templates/query.rss trac-0.12.1~ppa2/trac/ticket/templates/query.rss --- trac-0.11.7/trac/ticket/templates/query.rss 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/templates/query.rss 2010-02-24 01:25:29.000000000 +0000 @@ -2,7 +2,6 @@ - $project.name: Ticket Query $query_href @@ -21,7 +20,7 @@ $href #$result.id: ${result.summary} ${http_date(result.time)} - ${author_or_creator(result.reporter)} + ${unicode(wiki_to_html(context('ticket', result.id), result.description))} Results $href#changelog diff -Nru trac-0.11.7/trac/ticket/templates/report_delete.html trac-0.12.1~ppa2/trac/ticket/templates/report_delete.html --- trac-0.11.7/trac/ticket/templates/report_delete.html 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/templates/report_delete.html 2009-04-13 20:14:45.000000000 +0100 @@ -3,6 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> @@ -17,12 +18,12 @@

- - + +

Note: See TracReports for help on using and creating reports.

diff -Nru trac-0.11.7/trac/ticket/templates/report_edit.html trac-0.12.1~ppa2/trac/ticket/templates/report_edit.html --- trac-0.11.7/trac/ticket/templates/report_edit.html 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/templates/report_edit.html 2010-04-03 16:54:56.000000000 +0100 @@ -3,6 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> @@ -12,7 +13,7 @@

${action == 'new' and 'New Report' or report.title}

${action == 'new' and _('New Report') or report.title}

@@ -21,30 +22,31 @@

- + Description: (you may use WikiFormatting here)
-

Error: $error

- Query for Report: (can be either SQL or, if starting with query:, a TracQuery expression)
-

- - + +

- -

Note: See TracReports for help on using and creating reports.

diff -Nru trac-0.11.7/trac/ticket/templates/report_list.html trac-0.12.1~ppa2/trac/ticket/templates/report_list.html --- trac-0.11.7/trac/ticket/templates/report_list.html 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/trac/ticket/templates/report_list.html 2010-04-19 21:58:09.000000000 +0100 @@ -0,0 +1,58 @@ + + + + + Available Reports + + + +

Available Reports

+ +

- ${header.label} + + ${header.label}
#$result.id	#$result.id	$value ${dateinfo(value)} @@ -77,7 +75,7 @@
- Reported by ${authorinfo(result.reporter)}, + Reported by ${authorinfo(result.reporter)}, ${dateinfo(result.time)} ago.
$r	${fields.get(r, {'label': r or 'none'}).label}	${wiki_to_html(ticket_context, result[r])}

+ + + + + + + + + + + + + + + + + +

Report	Title	Actions
{$id}	$title	Edit	Delete
No reports available.

+ +

+ Note: + See TracReports for help on using and creating reports. +

+ + diff -Nru trac-0.11.7/trac/ticket/templates/report_list.rss trac-0.12.1~ppa2/trac/ticket/templates/report_list.rss --- trac-0.11.7/trac/ticket/templates/report_list.rss 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/trac/ticket/templates/report_list.rss 2010-04-16 09:54:28.000000000 +0100 @@ -0,0 +1,24 @@ + + + + $project.name: Available Reports + ${abs_href.report()} + List of available reports + en-us + + $project.name + $chrome.logo.src_abs + ${abs_href.report()} + + Trac v${trac.version} + + + {$report}: $title + ${abs_href.report(report)} + ${abs_href.report(report)} + Report + + + diff -Nru trac-0.11.7/trac/ticket/templates/report.rss trac-0.12.1~ppa2/trac/ticket/templates/report.rss --- trac-0.11.7/trac/ticket/templates/report.rss 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/templates/report.rss 2010-02-24 01:25:29.000000000 +0000 @@ -2,7 +2,6 @@ - $project.name: $title ${abs_href.report(report.id)} @@ -22,11 +21,11 @@ - ${author_or_creator(cell.author, email_map)} + - ${http_date(fromtimestamp(int(cell.value)))} + ${http_date(from_utimestamp(long(cell.value)))} #$row.id: $cell.value diff -Nru trac-0.11.7/trac/ticket/templates/report_view.html trac-0.12.1~ppa2/trac/ticket/templates/report_view.html --- trac-0.11.7/trac/ticket/templates/report_view.html 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/templates/report_view.html 2010-05-01 17:01:31.000000000 +0100 @@ -3,60 +3,97 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> $title +

$title - ($numrows matches) + (${ngettext('%(num)s match', '%(num)s matches', numrows)})

- ${wiki_to_html(context, description)} -

+ + Max items per page + + +

+ Arguments + + + + + + + + + + +


${name}	+ +

+ +

+ ${wiki_to_html(context, description)} +

+ + + +

- -

- Results (${paginator.displayed_items()}) -

- - +

+ Results (${paginator.displayed_items()}) +

+ -

$value_for_group - (${cnt or 'No'} match${cnt != 1 and 'es' or ''})

- +

+ $value_for_group + + (${cnt and ngettext('%(num)s match', '%(num)s matches', cnt) or _('No matches found.')}) + +

@@ -79,7 +116,6 @@ - - - - - - - - - @@ -157,22 +187,12 @@

+ href="${report_href(sort=header.col, asc=not header.asc)}"> $header.title	{$cell.value} @@ -87,43 +123,37 @@	- $cell.value - -	- #$cell.value + #$cell.value	- $cell.value + $cell.value	${cell.value != '' and format_time(int(cell.value)) or '--'} +	${cell.value != '' and format_time(from_utimestamp(long(cell.value))) or '--'}	${cell.value != '' and format_date(int(cell.value)) or '--'} +	${cell.value != '' and format_date(from_utimestamp(long(cell.value))) or '--'}	${cell.value != '' and format_datetime(int(cell.value)) or '--'} +	${cell.value != '' and format_datetime(from_utimestamp(long(cell.value))) or '--'}

- - - -

- -

$message

No matches found.

Note: See TracReports for help on using and creating reports.

diff -Nru trac-0.11.7/trac/ticket/templates/roadmap.html trac-0.12.1~ppa2/trac/ticket/templates/roadmap.html --- trac-0.11.7/trac/ticket/templates/roadmap.html 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/templates/roadmap.html 2010-04-03 16:54:56.000000000 +0100 @@ -3,13 +3,11 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - Roadmap - @@ -18,12 +16,17 @@ @@ -36,22 +39,27 @@

- Completed ${dateinfo(milestone.completed)} ago - (${format_date(milestone.completed)}) + + Completed ${dateinfo(milestone.completed)} ago (${format_date(milestone.completed)}) +

- ${dateinfo(milestone.due)} late - (${format_date(milestone.due)}) + + ${dateinfo(milestone.due)} late (${format_date(milestone.due)}) +

- Due in ${dateinfo(milestone.due)} - (${format_date(milestone.due)}) + + Due in ${dateinfo(milestone.due)} (${format_date(milestone.due)}) +

No date set

- ${progress_bar(mstats.stats, mstats.interval_hrefs, stats_href=mstats.stats_href)} +

@@ -64,11 +72,11 @@

Note: See +

Note: See TracRoadmap for help on using the roadmap.

diff -Nru trac-0.11.7/trac/ticket/templates/ticket_box.html trac-0.12.1~ppa2/trac/ticket/templates/ticket_box.html --- trac-0.11.7/trac/ticket/templates/ticket_box.html 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/trac/ticket/templates/ticket_box.html 2010-05-01 17:01:31.000000000 +0100 @@ -0,0 +1,81 @@ + +

Opened ${dateinfo(ticket.time)} ago

Last modified ${dateinfo(ticket.changetime)} ago

(ticket not yet created)

+ +

$ticket.summary

+ + + + + + + + + + + + + + +

Reported by:	+ ${defined('reporter_link') and reporter_link or authorinfo(ticket.reporter)} +	Owned by:	+ ${ticket.owner and (defined('owner_link') and owner_link or authorinfo(ticket.owner)) or ''} +
+ ${field.label or field.name}: +	+ + + ${field.rendered} + ${ticket[field.name]} + + +

+ Description + + (last modified by ${authorinfo(description_change.author)}) + (diff) + +

+ + + +

+ ${wiki_to_html(context, ticket.description, escape_newlines=preserve_newlines)} +

+
+

diff -Nru trac-0.11.7/trac/ticket/templates/ticket_change.html trac-0.12.1~ppa2/trac/ticket/templates/ticket_change.html --- trac-0.11.7/trac/ticket/templates/ticket_change.html 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/trac/ticket/templates/ticket_change.html 2010-04-25 00:48:26.000000000 +0100 @@ -0,0 +1,64 @@ + + +

+ ${field.label} + + + ${field.new} + + added + + ${field.rendered} + + changed from ${field.old} to ${field.new} + + + set to ${field.new} + + + ${field.old} deleted + + +

+ + + +

+ ${wiki_to_html(context, change.comment_history[int(cversion)].comment, + escape_newlines=preserve_newlines)} + ${wiki_to_html(context, change.comment, escape_newlines=preserve_newlines)} +

+ + diff -Nru trac-0.11.7/trac/ticket/templates/ticket.html trac-0.12.1~ppa2/trac/ticket/templates/ticket.html --- trac-0.11.7/trac/ticket/templates/ticket.html 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/templates/ticket.html 2010-05-01 17:01:31.000000000 +0100 @@ -2,28 +2,41 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + xmlns:i18n="http://genshi.edgewall.org/i18n" + py:with="preview_mode = 'preview' in req.args"> - - - <py:choose> - <py:when test="ticket.exists"> - #${ticket.id} (${ticket.summary}) - </py:when> - <py:otherwise> - New Ticket - </py:otherwise> - </py:choose> + <title py:choose=""> + <py:when test="ticket.exists">#${ticket.id} (${ticket.summary})</py:when> + <py:otherwise>New Ticket</py:otherwise> - - $prefix$cnum + $prefix$cnum - -

- ${field_name} - - - ${field.new} - - added - - ${field.rendered} - - changed from ${field.old} to ${field.new} - - - set to ${field.new} - - - ${field.old} deleted - - -

- ${wiki_to_html(context, change.comment, escape_newlines=preserve_newlines)} +

+ Modify ↓

- - -

- - - - Ticket #${ticket.id} - - - - Create New Ticket (${ticket.type}) - - - - +

+ + Ticket #${ticket.id} (${ticket.status} ${ticket.type}: ${ticket.resolution}) - — at Initial Version + — at Initial Version - — at Version $version + — at Version $version - + + + Create New Ticket (${ticket.type}) +

- -

- - Preview (skip) - - -

- - in reply to: ${commentref('↓ ', change_preview.replyto)} - - Changed by ${authorinfo(change_preview.author)} -

- ${display_change(change_preview)} -

- - - -

Opened ${dateinfo(ticket.time_created)} ago

Last modified ${dateinfo(ticket.time_changed)} ago

(ticket not yet created)

- -

$ticket.summary

- - - - - - - - - - - - - - -

Reported by:	${authorinfo(ticket.reporter)}	Owned by:	${ticket.owner and authorinfo(ticket.owner) or ''} -
- ${field.label or field.name}: -	- - - ${field.rendered} - ${ticket[field.name]} - - -

- Description - - (last modified by ${authorinfo(description_change.author)}) - (diff) - -

- - - -

- ${wiki_to_html(context, ticket.description, escape_newlines=preserve_newlines)} -

-
-

- + - ${list_of_attachments(attachments)} + - -

Change History

- +
+
+ + ${commentref('comment:', change.cnum)} in reply to: ${commentref('↑ ', change.replyto)} ; - follow-up${len(change_replies) > 1 and 's' or ''}: + + + follow-up: + follow-ups: + ${commentref('↓ ', reply)} - - Changed ${dateinfo(change.date)} ago by ${authorinfo(change.author)} + Changed ${dateinfo(change.date)} ago by ${authorinfo(change.author)}
-
- - + + +
+ + +
+ +
+
+ + +
+
+ + +
+ + Version ${comment_version}, edited ${dateinfo(change.comment_history[comment_version].date)} ago + by ${authorinfo(change.comment_history[comment_version].author)} + + + Last edited ${dateinfo(change.comment_history[comment_version].date)} ago + by ${authorinfo(change.comment_history[comment_version].author)} + + + (previous) + + + (next) + + + (diff) +
- ${display_change(change)}
- +
- +

- Add/Change #${ticket.id} ($ticket.summary)

+ + +

+ View ↑ +

+ Add a comment +

+ +

+ You may use + WikiFormatting + here. + + +

+ The ticket validation has failed. +

+ + +

+ +

Modify Ticket

+ +

+ + Change Properties + Properties + + + + + + + + + + + + + + + + + + + + + + + + +

Summary:	+ +
Reporter:	+ +
Description:	+ + You may use + WikiFormatting here. + + +${ticket.description} + +
+ ${ + field.edit_label or field.label or field.name}: +	+ + + +${value} + + + + + + + ${option} + + + + + ${field.cc_entry} + + + + + + + + + + + +

+ + + + +

+ Action +

+ + $label + $controls + $hint +

+ + + + + + + +

+ +

- ${ticket.exists and 'Author' or 'Reporter'} +

+ Author + Reporter

@@ -261,158 +371,35 @@

- E-mail address and user name can be saved in the Preferences. + E-mail address and user name can be saved in the Preferences.

- Comment (you may use - WikiFormatting - here): -
-

-${comment}

- - Change Properties - Properties - - - - - - - - - - - - - - - - - - - - - - - - -

Summary:	- -
Reporter:	- -
Description:	- -${ticket.description} -
- ${field.edit_label or field.label or field.name}: -	- - - -${value} - - - - - - - ${option} - - - - - ${field.cc_entry} - - - - - - - - - - - -

- -

- - - - -

- Action -

- - $label - $controls - $hint -

- - - - - - - +

I have files to attach to this ticket

+ +

+ Attachments ↑ +

- - + +

Note: See TracTickets for help on using tickets. diff -Nru trac-0.11.7/trac/ticket/templates/ticket_notify_email.txt trac-0.12.1~ppa2/trac/ticket/templates/ticket_notify_email.txt --- trac-0.11.7/trac/ticket/templates/ticket_notify_email.txt 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/templates/ticket_notify_email.txt 2010-05-01 17:01:31.000000000 +0100 @@ -1,32 +1,32 @@ $ticket_body_hdr $ticket_props -#choose ticket.new - #when True +{% choose ticket.new %}\ +{% when True %}\ $ticket.description - #end - #otherwise - #if changes_body -Changes (by $change.author): +{% end %}\ +{% otherwise %}\ +{% if changes_body %}\ +${_('Changes (by %(author)s):', author=change.author)} $changes_body - #end - #if changes_descr - #if not changes_body and not change.comment and change.author -Description changed by $change.author: - #end +{% end %}\ +{% if changes_descr %}\ +{% if not changes_body and not change.comment and change.author %}\ +${_('Description changed by %(author)s:', author=change.author)} +{% end %}\ $changes_descr -- - #end - #if change.comment +{% end %}\ +{% if change.comment %}\ -Comment${not changes_body and '(by %s)' % change.author or ''}: +${changes_body and _('Comment:') or _('Comment (by %(author)s):', author=change.author)} $change.comment - #end - #end -#end +{% end %}\ +{% end %}\ +{% end %}\ -- -Ticket URL: <$ticket.link> +${_('Ticket URL: <%(link)s>', link=ticket.link)} $project.name <${project.url or abs_href()}> $project.descr diff -Nru trac-0.11.7/trac/ticket/templates/ticket.rss trac-0.12.1~ppa2/trac/ticket/templates/ticket.rss --- trac-0.11.7/trac/ticket/templates/ticket.rss 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/templates/ticket.rss 2010-02-24 01:25:29.000000000 +0000 @@ -2,7 +2,6 @@ - ${project.name}: Ticket #${ticket.id}: ${ticket.summary} ${abs_href.ticket(ticket.id)} @@ -16,7 +15,7 @@ Trac $trac.version - ${author_or_creator(change.author)} + ${http_date(change.date)} $change.title ${abs_href.ticket(ticket.id)}#comment:$change.cnum diff -Nru trac-0.11.7/trac/ticket/tests/api.py trac-0.12.1~ppa2/trac/ticket/tests/api.py --- trac-0.11.7/trac/ticket/tests/api.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/tests/api.py 2009-08-30 22:34:27.000000000 +0100 @@ -1,4 +1,4 @@ -import trac.perm as perm +from trac.perm import PermissionCache, PermissionSystem from trac.ticket.api import TicketSystem from trac.ticket.model import Ticket from trac.test import EnvironmentStub, Mock @@ -10,14 +10,15 @@ def setUp(self): self.env = EnvironmentStub() - self.perm = perm.PermissionSystem(self.env) + self.perm = PermissionSystem(self.env) self.ticket_system = TicketSystem(self.env) self.req = Mock() def tearDown(self): self.env.reset_db() - def _ts_get_available_actions(self, ts, ticket_dict): + def _get_actions(self, ticket_dict): + ts = TicketSystem(self.env) ticket = Ticket(self.env) ticket.populate(ticket_dict) id = ticket.insert() @@ -78,81 +79,47 @@ self.assertEqual('test1', fields[1]['name']) def test_available_actions_full_perms(self): - ts = TicketSystem(self.env) self.perm.grant_permission('anonymous', 'TICKET_CREATE') self.perm.grant_permission('anonymous', 'TICKET_MODIFY') - self.req.perm = perm.PermissionCache(self.env) + self.req.perm = PermissionCache(self.env) self.assertEqual(['leave', 'resolve', 'reassign', 'accept'], - self._ts_get_available_actions(ts, {'status': 'new'})) + self._get_actions({'status': 'new'})) self.assertEqual(['leave', 'resolve', 'reassign', 'accept'], - self._ts_get_available_actions(ts, - {'status': 'assigned'})) + self._get_actions({'status': 'assigned'})) self.assertEqual(['leave', 'resolve', 'reassign', 'accept'], - self._ts_get_available_actions(ts, - {'status': 'accepted'})) + self._get_actions({'status': 'accepted'})) self.assertEqual(['leave', 'resolve', 'reassign', 'accept'], - self._ts_get_available_actions(ts, - {'status': 'reopened'})) - self.assertEqual(['leave', 'reopen'], - self._ts_get_available_actions(ts, - {'status': 'closed'})) + self._get_actions({'status': 'reopened'})) + self.assertEqual(['leave', 'reopen'], + self._get_actions({'status': 'closed'})) def test_available_actions_no_perms(self): - ts = TicketSystem(self.env) - self.req.perm = perm.PermissionCache(self.env) - self.assertEqual(['leave'], - self._ts_get_available_actions(ts, {'status': 'new'})) - self.assertEqual(['leave'], - self._ts_get_available_actions(ts, - {'status': 'assigned'})) - self.assertEqual(['leave'], - self._ts_get_available_actions(ts, - {'status': 'accepted'})) - self.assertEqual(['leave'], - self._ts_get_available_actions(ts, - {'status': 'reopened'})) - self.assertEqual(['leave'], - self._ts_get_available_actions(ts, - {'status': 'closed'})) + self.req.perm = PermissionCache(self.env) + self.assertEqual(['leave'], self._get_actions({'status': 'new'})) + self.assertEqual(['leave'], self._get_actions({'status': 'assigned'})) + self.assertEqual(['leave'], self._get_actions({'status': 'accepted'})) + self.assertEqual(['leave'], self._get_actions({'status': 'reopened'})) + self.assertEqual(['leave'], self._get_actions({'status': 'closed'})) def test_available_actions_create_only(self): - ts = TicketSystem(self.env) self.perm.grant_permission('anonymous', 'TICKET_CREATE') - self.req.perm = perm.PermissionCache(self.env) - self.assertEqual(['leave'], - self._ts_get_available_actions(ts, {'status': 'new'})) - self.assertEqual(['leave'], - self._ts_get_available_actions(ts, - {'status': 'assigned'})) - self.assertEqual(['leave'], - self._ts_get_available_actions(ts, - {'status': 'accepted'})) - self.assertEqual(['leave'], - self._ts_get_available_actions(ts, - {'status': 'reopened'})) + self.req.perm = PermissionCache(self.env) + self.assertEqual(['leave'], self._get_actions({'status': 'new'})) + self.assertEqual(['leave'], self._get_actions({'status': 'assigned'})) + self.assertEqual(['leave'], self._get_actions({'status': 'accepted'})) + self.assertEqual(['leave'], self._get_actions({'status': 'reopened'})) self.assertEqual(['leave', 'reopen'], - self._ts_get_available_actions(ts, - {'status': 'closed'})) + self._get_actions({'status': 'closed'})) def test_available_actions_chgprop_only(self): # CHGPROP is not enough for changing a ticket's state (#3289) - ts = TicketSystem(self.env) self.perm.grant_permission('anonymous', 'TICKET_CHGPROP') - self.req.perm = perm.PermissionCache(self.env) - self.assertEqual(['leave'], - self._ts_get_available_actions(ts, {'status': 'new'})) - self.assertEqual(['leave'], - self._ts_get_available_actions(ts, - {'status': 'assigned'})) - self.assertEqual(['leave'], - self._ts_get_available_actions(ts, - {'status': 'accepted'})) - self.assertEqual(['leave'], - self._ts_get_available_actions(ts, - {'status': 'reopened'})) - self.assertEqual(['leave'], - self._ts_get_available_actions(ts, - {'status': 'closed'})) + self.req.perm = PermissionCache(self.env) + self.assertEqual(['leave'], self._get_actions({'status': 'new'})) + self.assertEqual(['leave'], self._get_actions({'status': 'assigned'})) + self.assertEqual(['leave'], self._get_actions({'status': 'accepted'})) + self.assertEqual(['leave'], self._get_actions({'status': 'reopened'})) + self.assertEqual(['leave'], self._get_actions({'status': 'closed'})) def suite(): diff -Nru trac-0.11.7/trac/ticket/tests/conversion.py trac-0.12.1~ppa2/trac/ticket/tests/conversion.py --- trac-0.11.7/trac/ticket/tests/conversion.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/tests/conversion.py 2010-02-24 01:25:29.000000000 +0000 @@ -3,7 +3,6 @@ from trac import __version__ as TRAC_VERSION from trac.test import EnvironmentStub, Mock -from trac.util import sorted from trac.ticket.model import Ticket from trac.ticket.web_ui import TicketModule from trac.mimeview.api import Mimeview @@ -23,7 +22,7 @@ href=Href('/trac.cgi'), chrome={'logo': {}}, abs_href=Href('http://example.org/trac.cgi'), environ={}, perm=[], authname='-', args={}, tz=None, - session=None, form_token=None) + locale='', session=None, form_token=None) def tearDown(self): self.env.reset_db() @@ -77,8 +76,6 @@ self.req, 'trac.ticket.Ticket', ticket, 'rss') self.assertEqual((""" - - My Project: Ticket #1: Foo http://example.org/trac.cgi/ticket/1 diff -Nru trac-0.11.7/trac/ticket/tests/functional.py trac-0.12.1~ppa2/trac/ticket/tests/functional.py --- trac-0.11.7/trac/ticket/tests/functional.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/tests/functional.py 2010-04-21 08:22:42.000000000 +0100 @@ -116,7 +116,7 @@ class TestTicketSearch(FunctionalTwillTestCaseSetup): def runTest(self): """Test ticket search""" - summary = random_sentence(5) + summary = random_sentence(4) ticketid = self._tester.create_ticket(summary) self._tester.go_to_front() tc.follow('Search') @@ -164,14 +164,13 @@ class TestTicketHistoryDiff(FunctionalTwillTestCaseSetup): def runTest(self): - """Test ticket history""" + """Test ticket history (diff)""" name = 'TestTicketHistoryDiff' ticketid = self._tester.create_ticket(name) self._tester.go_to_ticket(ticketid) - tc.formvalue tc.formvalue('propertyform', 'description', random_sentence(6)) tc.submit('submit') - tc.find('description<[^>]*>\\s*modified \\(<[^>]*>diff', 's') + tc.find('Description<[^>]*>\\s*modified \\(<[^>]*>diff', 's') tc.follow('diff') tc.find('Changes\\s*between\\s*<[^>]*>Initial Version<[^>]*>\\s*and' \ '\\s*<[^>]*>Version 1<[^>]*>\\s*of\\s*<[^>]*>Ticket #' , 's') @@ -187,11 +186,11 @@ self._tester.go_to_query() # We don't have the luxury of javascript, so this is a multi-step # process - tc.formvalue('query', 'add_filter', 'summary') - tc.submit('add') - tc.formvalue('query', 'owner', 'nothing') - tc.submit('rm_filter_owner_0') - tc.formvalue('query', 'summary', 'TestTicketQueryLinks') + tc.formvalue('query', 'add_filter_0', 'summary') + tc.submit('add_0') + tc.formvalue('query', '0_owner', 'nothing') + tc.submit('rm_filter_0_owner_0') + tc.formvalue('query', '0_summary', 'TestTicketQueryLinks') tc.submit('update') query_url = b.get_url() for i in range(count): @@ -212,6 +211,29 @@ tc.find('class="missing">Next Ticket →') +class TestTicketQueryOrClause(FunctionalTwillTestCaseSetup): + def runTest(self): + """Test ticket query with an or clauses""" + count = 3 + ticket_ids = [self._tester.create_ticket( + summary='TestTicketQueryOrClause%s' % i, + info={'keywords': str(i)}) + for i in range(count)] + self._tester.go_to_query() + tc.formvalue('query', '0_owner', '') + tc.submit('rm_filter_0_owner_0') + tc.formvalue('query', 'add_filter_0', 'summary') + tc.submit('add_0') + tc.formvalue('query', '0_summary', 'TestTicketQueryOrClause1') + tc.formvalue('query', 'add_clause_1', 'keywords') + tc.submit('add_1') + tc.formvalue('query', '1_keywords', '2') + tc.submit('update') + tc.notfind('TestTicketQueryOrClause0') + for i in [1, 2]: + tc.find('TestTicketQueryOrClause%s' % i) + + class TestTimelineTicketDetails(FunctionalTwillTestCaseSetup): def runTest(self): """Test ticket details on timeline""" @@ -283,7 +305,8 @@ tc.find('type="radio" name="default" value="%s" checked="checked"' % \ name) tc.go(self._tester.url + '/newticket') - tc.find('' % name) + tc.find('' + % (name, name)) class TestAdminComponentDetail(FunctionalTwillTestCaseSetup): @@ -489,7 +512,8 @@ name) # verify it is the default on the newticket page. tc.go(self._tester.url + '/newticket') - tc.find('' % name) + tc.find('' + % (name, name)) class TestAdminPriority(FunctionalTwillTestCaseSetup): @@ -661,7 +685,7 @@ name = "DuplicateResolution" self._tester.create_resolution(name) self._tester.create_resolution(name) - tc.find('Resolution %s already exists' % name) + tc.find('Resolution value "%s" already exists' % name) class TestAdminSeverity(FunctionalTwillTestCaseSetup): @@ -676,7 +700,7 @@ name = "DuplicateSeverity" self._tester.create_severity(name) self._tester.create_severity(name) - tc.find('Severity %s already exists' % name) + tc.find('Severity value "%s" already exists' % name) class TestAdminType(FunctionalTwillTestCaseSetup): @@ -691,7 +715,7 @@ name = "DuplicateType" self._tester.create_type(name) self._tester.create_type(name) - tc.find('Type %s already exists' % name) + tc.find('Type value "%s" already exists' % name) class TestAdminVersion(FunctionalTwillTestCaseSetup): @@ -824,7 +848,8 @@ name) # verify it is the default on the newticket page. tc.go(self._tester.url + '/newticket') - tc.find('' % name) + tc.find('' + % (name, name)) class TestNewReport(FunctionalTwillTestCaseSetup): @@ -945,7 +970,7 @@ def runTest(self): """Test for regression of http://trac.edgewall.org/ticket/5022 """ - summary='RegressionTestTicket5022' + summary = 'RegressionTestTicket5022' ticket_id = self._tester.create_ticket(summary=summary) tc.go(self._tester.url + '/newticket?id=%s' % ticket_id) tc.notfind(summary) @@ -1108,11 +1133,11 @@ tc.go(self._tester.url + "/roadmap") tc.follow(milestone) - tc.follow("Closed tickets:") + tc.follow("closed:") tc.find("Resolution:[ \t\n]+fixed") tc.back() - tc.follow("Active tickets:") + tc.follow("active:") tc.find("Status:[ \t\n]+new") tc.find("Status:[ \t\n]+assigned") tc.find("Status:[ \t\n]+accepted") @@ -1172,7 +1197,7 @@ tc.submit('submit') self._tester.go_to_ticket(ticket_id) - tc.find('Error: Invalid Ticket Number') + tc.find('Error: Invalid ticket number') tc.find('Ticket %s does not exist.' % ticket_id) # Remove the DeleteTicket plugin @@ -1254,7 +1279,7 @@ try: self._tester.create_component(name='RegressionTestTicket6912a', user='') - except twill.utils.mechanize.ClientForm.ItemNotFoundError, e: + except twill.utils.ClientForm.ItemNotFoundError, e: raise twill.errors.TwillAssertionError(e) @@ -1266,7 +1291,7 @@ tc.follow('RegressionTestTicket6912b') try: tc.formvalue('modcomp', 'owner', '') - except twill.utils.mechanize.ClientForm.ItemNotFoundError, e: + except twill.utils.ClientForm.ItemNotFoundError, e: raise twill.errors.TwillAssertionError(e) tc.formvalue('modcomp', 'save', 'Save') tc.submit() @@ -1289,7 +1314,7 @@ tc.formvalue('milestone_table', 'sel', name) tc.submit('remove') tc.go(ticket_url) - tc.find('milestone[ \n\t]*%s deleted' % name) + tc.find('Milestone[ \n\t]*%s deleted' % name) tc.find('Changed ago by admin') tc.notfind('anonymous') @@ -1314,6 +1339,19 @@ tc.find('Milestone: %s' % (name + '__')) +class RegressionTestTicket9084(FunctionalTwillTestCaseSetup): + def runTest(self): + """Test for regression of http://trac.edgewall.org/ticket/9084""" + ticketid = self._tester.create_ticket() + self._tester.add_comment(ticketid) + self._tester.go_to_ticket(ticketid) + tc.formvalue('reply-to-comment-1', 'replyto', '1') + tc.submit('Reply') + tc.formvalue('propertyform', 'comment', random_sentence(3)) + tc.submit('Submit changes') + tc.notfind('AssertionError') + + def functionalSuite(suite=None): if not suite: import trac.tests.functional.testcases @@ -1330,6 +1368,7 @@ suite.addTest(TestTicketHistory()) suite.addTest(TestTicketHistoryDiff()) suite.addTest(TestTicketQueryLinks()) + suite.addTest(TestTicketQueryOrClause()) suite.addTest(TestTimelineTicketDetails()) suite.addTest(TestAdminComponent()) suite.addTest(TestAdminComponentDuplicates()) @@ -1399,6 +1438,7 @@ suite.addTest(RegressionTestTicket6912b()) suite.addTest(RegressionTestTicket8247()) suite.addTest(RegressionTestTicket8861()) + suite.addTest(RegressionTestTicket9084()) return suite diff -Nru trac-0.11.7/trac/ticket/tests/model.py trac-0.12.1~ppa2/trac/ticket/tests/model.py --- trac-0.11.7/trac/ticket/tests/model.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/tests/model.py 2010-04-15 09:22:56.000000000 +0100 @@ -2,13 +2,14 @@ from trac.core import TracError, implements from trac.resource import ResourceNotFound from trac.ticket.model import Ticket, Component, Milestone, Priority, Type, Version -from trac.ticket.api import ITicketChangeListener +from trac.ticket.api import IMilestoneChangeListener, ITicketChangeListener from trac.test import EnvironmentStub -from trac.util.datefmt import utc, to_timestamp +from trac.util.datefmt import from_utimestamp, to_utimestamp, utc -from datetime import datetime +from datetime import datetime, timedelta import unittest + class TestTicketChangeListener(core.Component): implements(ITicketChangeListener) @@ -43,7 +44,7 @@ def _insert_ticket(self, summary, **kw): """Helper for inserting a ticket into the database""" ticket = Ticket(self.env) - for k,v in kw.items(): + for k, v in kw.items(): ticket[k] = v return ticket.insert() @@ -74,6 +75,7 @@ def test_create_ticket_2(self): ticket = self._create_a_ticket() ticket.insert() + self.assertEqual(1, ticket.id) # Retrieving ticket ticket2 = Ticket(self.env, 1) self.assertEqual(1, ticket2.id) @@ -116,6 +118,35 @@ self.assertEqual(len(log), 0) self.assertRaises(TracError, Ticket, self.env, 1) + def test_ticket_id_is_always_int(self): + ticket_id = self._insert_ticket('Foo') + self.assertEqual(ticket_id, int(ticket_id)) + ticket = Ticket(self.env, str(ticket_id)) + self.assertEqual(ticket_id, ticket.id) + self.assertEqual(ticket.resource.id, ticket_id) + + def test_can_save_ticket_without_explicit_comment(self): + ticket = Ticket(self.env) + ticket.insert() + + ticket['summary'] = 'another summary' + ticket.save_changes('foo') + + changes = ticket.get_changelog() + comment_change = [c for c in changes if c[2] == 'comment'][0] + self.assertEqual('1', comment_change[3]) + self.assertEqual('', comment_change[4]) + + def test_can_save_ticket_without_explicit_username(self): + ticket = Ticket(self.env) + ticket.insert() + + ticket['summary'] = 'another summary' + ticket.save_changes() + + for change in ticket.get_changelog(): + self.assertEqual(None, change[1]) + def test_ticket_default_values(self): """ Verify that a ticket uses default values specified in the configuration @@ -240,7 +271,7 @@ self.assertEqual('joe', ticket['owner']) def test_populate_ticket(self): - data = {'summary': 'Hello world', 'reporter': 'john', 'foo': 'bar', + data = {'summary': 'Hello world', 'reporter': 'john', 'foo': 'bar', 'checkbox_cbon': '', 'cbon': 'on', 'checkbox_cboff': ''} ticket = Ticket(self.env) @@ -268,17 +299,49 @@ ticket['milestone'] = 'foo' now = datetime(2001, 1, 1, 1, 1, 1, 0, utc) ticket.save_changes('jane', 'Testing', now) - for t, author, field, old, new, permanent in ticket.get_changelog(): - self.assertEqual((now, 'jane', True), (t, author, permanent)) - if field == 'component': - self.assertEqual(('foo', 'bar'), (old, new)) - elif field == 'milestone': - self.assertEqual(('bar', 'foo'), (old, new)) - elif field == 'comment': - self.assertEqual(('', 'Testing'), (old, new)) - else: - self.fail('Unexpected change (%s)' - % ((t, author, field, old, new),)) + changelog = sorted(ticket.get_changelog()) + self.assertEqual([(now, 'jane', 'comment', '1', 'Testing', True), + (now, 'jane', 'component', 'foo', 'bar', True), + (now, 'jane', 'milestone', 'bar', 'foo', True)], + changelog) + + def test_changelog_with_attachment(self): + """Verify ordering of attachments and comments in the changelog.""" + tkt_id = self._insert_ticket('Test', reporter='joe', component='foo') + ticket = Ticket(self.env, tkt_id) + t1 = datetime(2001, 1, 1, 1, 1, 1, 0, utc) + ticket.save_changes('jane', 'Testing', t1) + t2 = datetime(2001, 1, 1, 1, 1, 2, 0, utc) + db = self.env.get_db_cnx() + cursor = db.cursor() + cursor.execute("INSERT INTO attachment (type,id,filename,size,time," + " description,author,ipnr) " + "VALUES ('ticket',%s,'file.txt',1234,%s," + " 'My file','mark','')", + (str(tkt_id), to_utimestamp(t2))) + db.commit() + t3 = datetime(2001, 1, 1, 1, 1, 3, 0, utc) + ticket.save_changes('jim', 'Other', t3) + log = ticket.get_changelog() + self.assertEqual(4, len(log)) + self.assertEqual((t1, 'jane', 'comment', '1', 'Testing', True), log[0]) + self.assertEqual([(t2, 'mark', 'attachment', '', 'file.txt', False), + (t2, 'mark', 'comment', '', 'My file', False)], + sorted(log[1:3])) + self.assertEqual((t3, 'jim', 'comment', '2', 'Other', True), log[3]) + + def test_subsecond_change(self): + """Perform two ticket changes within a second.""" + tkt_id = self._insert_ticket('Test', reporter='joe', component='foo') + ticket = Ticket(self.env, tkt_id) + t1 = datetime(2001, 1, 1, 1, 1, 1, 123456, utc) + ticket.save_changes('jane', 'Testing', t1) + t2 = datetime(2001, 1, 1, 1, 1, 1, 123789, utc) + ticket.save_changes('jim', 'Other', t2) + log = ticket.get_changelog() + self.assertEqual(2, len(log)) + self.assertEqual((t1, 'jane', 'comment', '1', 'Testing', True), log[0]) + self.assertEqual((t2, 'jim', 'comment', '2', 'Other', True), log[1]) def test_changelog_with_reverted_change(self): tkt_id = self._insert_ticket('Test', reporter='joe', component='foo') @@ -287,13 +350,8 @@ ticket['component'] = 'foo' now = datetime(2001, 1, 1, 1, 1, 1, 0, utc) ticket.save_changes('jane', 'Testing', now) - for t, author, field, old, new, permanent in ticket.get_changelog(): - self.assertEqual((now, 'jane', True), (t, author, permanent)) - if field == 'comment': - self.assertEqual(('', 'Testing'), (old, new)) - else: - self.fail('Unexpected change (%s)' - % ((t, author, field, old, new),)) + self.assertEqual([(now, 'jane', 'comment', '1', 'Testing', True)], + list(ticket.get_changelog())) def test_change_listener_created(self): listener = TestTicketChangeListener(self.env) @@ -330,6 +388,272 @@ self.assertEqual(ticket, listener.ticket) +class TicketCommentTestCase(unittest.TestCase): + + def _insert_ticket(self, summary, when, **kwargs): + ticket = Ticket(self.env) + for k, v in kwargs.iteritems(): + ticket[k] = v + self.id = ticket.insert(when) + + def _modify_ticket(self, author, comment, when, cnum, **kwargs): + ticket = Ticket(self.env, self.id) + for k, v in kwargs.iteritems(): + ticket[k] = v + ticket.save_changes(author, comment, when, cnum=cnum) + + def _find_change(self, ticket, cnum): + (ts, author, comment) = ticket._find_change(cnum, self.db) + return from_utimestamp(ts) + + def assertChange(self, ticket, cnum, date, author, **fields): + change = ticket.get_change(cnum) + self.assertEqual(dict(date=date, author=author, fields=fields), change) + + +class TicketCommentEditTestCase(TicketCommentTestCase): + + def setUp(self): + self.env = EnvironmentStub(default_data=True) + self.db = self.env.get_db_cnx() + self.created = datetime(2001, 1, 1, 1, 0, 0, 0, utc) + self._insert_ticket('Test ticket', self.created, + owner='john', keywords='a, b, c') + self.t1 = self.created + timedelta(seconds=1) + self._modify_ticket('jack', 'Comment 1', self.t1, '1') + self.t2 = self.created + timedelta(seconds=2) + self._modify_ticket('john', 'Comment 2', self.t2, '1.2', + owner='jack') + self.t3 = self.created + timedelta(seconds=3) + self._modify_ticket('jim', 'Comment 3', self.t3, '3', + keywords='a, b') + + def tearDown(self): + self.env.reset_db() + + def test_modify_comment(self): + """Check modification of a "standalone" comment""" + ticket = Ticket(self.env, self.id) + self.assertChange(ticket, 1, self.t1, 'jack', + comment=dict(author='jack', old='1', new='Comment 1')) + self.assertChange(ticket, 2, self.t2, 'john', + owner=dict(author='john', old='john', new='jack'), + comment=dict(author='john', old='1.2', new='Comment 2')) + self.assertChange(ticket, 3, self.t3, 'jim', + keywords=dict(author='jim', old='a, b, c', new='a, b'), + comment=dict(author='jim', old='3', new='Comment 3')) + + t = self.created + timedelta(seconds=10) + ticket.modify_comment(self._find_change(ticket, 1), + 'joe', 'New comment 1', t) + self.assertChange(ticket, 1, self.t1, 'jack', + comment=dict(author='jack', old='1', new='New comment 1'), + _comment0=dict(author='joe', old='Comment 1', + new=str(to_utimestamp(t)))) + + def test_threading(self): + """Check modification of a "threaded" comment""" + ticket = Ticket(self.env, self.id) + t = self.created + timedelta(seconds=20) + ticket.modify_comment(self._find_change(ticket, 2), + 'joe', 'New comment 2', t) + self.assertChange(ticket, 2, self.t2, 'john', + owner=dict(author='john', old='john', new='jack'), + comment=dict(author='john', old='1.2', new='New comment 2'), + _comment0=dict(author='joe', old='Comment 2', + new=str(to_utimestamp(t)))) + + def test_modify_missing_cnum(self): + """Editing a comment with no cnum in oldvalue""" + cursor = self.db.cursor() + cursor.execute("UPDATE ticket_change SET oldvalue='' " + "WHERE oldvalue='3'") + self.db.commit() + + ticket = Ticket(self.env, self.id) + t = self.created + timedelta(seconds=30) + ticket.modify_comment(self._find_change(ticket, 3), + 'joe', 'New comment 3', t) + self.assertChange(ticket, 3, self.t3, 'jim', + keywords=dict(author='jim', old='a, b, c', new='a, b'), + comment=dict(author='jim', old='', new='New comment 3'), + _comment0=dict(author='joe', old='Comment 3', + new=str(to_utimestamp(t)))) + + def test_modify_missing_comment(self): + """Editing a comment where the comment field is missing""" + cursor = self.db.cursor() + cursor.execute("DELETE FROM ticket_change " + "WHERE field='comment' AND oldvalue='1.2'") + self.db.commit() + + ticket = Ticket(self.env, self.id) + t = self.created + timedelta(seconds=40) + ticket.modify_comment(self._find_change(ticket, 2), + 'joe', 'New comment 2', t) + self.assertChange(ticket, 2, self.t2, 'john', + owner=dict(author='john', old='john', new='jack'), + comment=dict(author='john', old='', new='New comment 2'), + _comment0=dict(author='joe', old='', + new=str(to_utimestamp(t)))) + + def test_modify_missing_cnums_and_comment(self): + """Editing a comments when all cnums are missing and one comment + field is missing + """ + cursor = self.db.cursor() + cursor.execute("UPDATE ticket_change SET oldvalue='' " + "WHERE oldvalue='1'") + cursor.execute("DELETE FROM ticket_change " + "WHERE field='comment' AND oldvalue='1.2'") + cursor.execute("UPDATE ticket_change SET oldvalue='' " + "WHERE oldvalue='3'") + self.db.commit() + + # Modify after missing comment + ticket = Ticket(self.env, self.id) + t = self.created + timedelta(seconds=50) + ticket.modify_comment(self._find_change(ticket, 3), + 'joe', 'New comment 3', t) + self.assertChange(ticket, 3, self.t3, 'jim', + keywords=dict(author='jim', old='a, b, c', new='a, b'), + comment=dict(author='jim', old='', new='New comment 3'), + _comment0=dict(author='joe', old='Comment 3', + new=str(to_utimestamp(t)))) + + # Modify missing comment + t = self.created + timedelta(seconds=60) + ticket.modify_comment(self._find_change(ticket, 2), + 'joe', 'New comment 2', t) + self.assertChange(ticket, 2, self.t2, 'john', + owner=dict(author='john', old='john', new='jack'), + comment=dict(author='john', old='', new='New comment 2'), + _comment0=dict(author='joe', old='', + new=str(to_utimestamp(t)))) + + def test_missing_comment_edit(self): + """Modify a comment where one edit is missing""" + ticket = Ticket(self.env, self.id) + t1 = self.created + timedelta(seconds=70) + ticket.modify_comment(self._find_change(ticket, 1), + 'joe', 'New comment 1', t1) + t2 = self.created + timedelta(seconds=80) + ticket.modify_comment(self._find_change(ticket, 1), + 'joe', 'Other comment 1', t2) + + self.assertChange(ticket, 1, self.t1, 'jack', + comment=dict(author='jack', old='1', new='Other comment 1'), + _comment0=dict(author='joe', old='Comment 1', + new=str(to_utimestamp(t1))), + _comment1=dict(author='joe', old='New comment 1', + new=str(to_utimestamp(t2)))) + + cursor = self.db.cursor() + cursor.execute("DELETE FROM ticket_change " + "WHERE field='_comment0'") + self.db.commit() + + t3 = self.created + timedelta(seconds=90) + ticket.modify_comment(self._find_change(ticket, 1), + 'joe', 'Newest comment 1', t3) + + self.assertChange(ticket, 1, self.t1, 'jack', + comment=dict(author='jack', old='1', new='Newest comment 1'), + _comment1=dict(author='joe', old='New comment 1', + new=str(to_utimestamp(t2))), + _comment2=dict(author='joe', old='Other comment 1', + new=str(to_utimestamp(t3)))) + + def test_comment_history(self): + """Check the generation of the comment history""" + ticket = Ticket(self.env, self.id) + t = [self.t1] + for i in range(1, 32): + t.append(self.created + timedelta(minutes=i)) + ticket.modify_comment(self._find_change(ticket, 1), + 'joe (%d)' % i, + 'Comment 1 (%d)' % i, t[-1]) + history = ticket.get_comment_history(1) + self.assertEqual((0, t[0], 'jack', 'Comment 1'), history[0]) + for i in range(1, len(history)): + self.assertEqual((i, t[i], 'joe (%d)' % i, + 'Comment 1 (%d)' % i), history[i]) + + +class TicketCommentDeleteTestCase(TicketCommentTestCase): + + def setUp(self): + self.env = EnvironmentStub(default_data=True) + self.env.config.set('ticket-custom', 'foo', 'text') + self.db = self.env.get_db_cnx() + self.created = datetime(2001, 1, 1, 1, 0, 0, 0, utc) + self._insert_ticket('Test ticket', self.created, + owner='john', keywords='a, b, c', foo='initial') + self.t1 = self.created + timedelta(seconds=1) + self._modify_ticket('jack', 'Comment 1', self.t1, '1', + foo='change 1') + self.t2 = self.created + timedelta(seconds=2) + self._modify_ticket('john', 'Comment 2', self.t2, '1.2', + owner='jack', foo='change2') + self.t3 = self.created + timedelta(seconds=3) + self._modify_ticket('jim', 'Comment 3', self.t3, '3', + keywords='a, b', foo='change3') + self.t4 = self.created + timedelta(seconds=4) + self._modify_ticket('joe', 'Comment 4', self.t4, '4', + keywords='a', foo='change4') + + def tearDown(self): + self.env.reset_db() + + def test_delete_last_comment(self): + ticket = Ticket(self.env, self.id) + self.assertEqual('a', ticket['keywords']) + self.assertEqual('change4', ticket['foo']) + ticket.delete_change(4) + self.assertEqual('a, b', ticket['keywords']) + self.assertEqual('change3', ticket['foo']) + self.assertEqual(None, ticket.get_change(4)) + self.assertNotEqual(None, ticket.get_change(3)) + self.assertEqual(self.t3, ticket.time_changed) + + def test_delete_mid_comment(self): + ticket = Ticket(self.env, self.id) + self.assertChange(ticket, 4, self.t4, 'joe', + comment=dict(author='joe', old='4', new='Comment 4'), + keywords=dict(author='joe', old='a, b', new='a'), + foo=dict(author='joe', old='change3', new='change4')) + ticket.delete_change(3) + self.assertEqual(None, ticket.get_change(3)) + self.assertEqual('a', ticket['keywords']) + self.assertChange(ticket, 4, self.t4, 'joe', + comment=dict(author='joe', old='4', new='Comment 4'), + keywords=dict(author='joe', old='a, b, c', new='a'), + foo=dict(author='joe', old='change2', new='change4')) + self.assertEqual(self.t4, ticket.time_changed) + + def test_delete_mid_comment_inconsistent(self): + # Make oldvalue on keywords for change 4 inconsistent. This should + # result in no change in oldvalue when deleting change 3. The + # oldvalue of foo should change normally. + cursor = self.db.cursor() + cursor.execute("UPDATE ticket_change SET oldvalue='1, 2' " + "WHERE field='keywords' AND oldvalue='a, b'") + self.db.commit() + + ticket = Ticket(self.env, self.id) + self.assertChange(ticket, 4, self.t4, 'joe', + comment=dict(author='joe', old='4', new='Comment 4'), + keywords=dict(author='joe', old='1, 2', new='a'), + foo=dict(author='joe', old='change3', new='change4')) + ticket.delete_change(3) + self.assertEqual(None, ticket.get_change(3)) + self.assertEqual('a', ticket['keywords']) + self.assertChange(ticket, 4, self.t4, 'joe', + comment=dict(author='joe', old='4', new='Comment 4'), + keywords=dict(author='joe', old='1, 2', new='a'), + foo=dict(author='joe', old='change2', new='change4')) + + class EnumTestCase(unittest.TestCase): def setUp(self): @@ -381,6 +705,23 @@ Type(self.env, 'foo') +class TestMilestoneChangeListener(core.Component): + implements(IMilestoneChangeListener) + + def milestone_created(self, milestone): + self.action = 'created' + self.milestone = milestone + + def milestone_changed(self, milestone, old_values): + self.action = 'changed' + self.milestone = milestone + self.old_values = old_values + + def milestone_deleted(self, milestone): + self.action = 'deleted' + self.milestone = milestone + + class MilestoneTestCase(unittest.TestCase): def setUp(self): @@ -390,6 +731,12 @@ def tearDown(self): self.env.reset_db() + def _create_milestone(self, **values): + milestone = Milestone(self.env) + for k, v in values.iteritems(): + setattr(milestone, k, v) + return milestone + def test_new_milestone(self): milestone = Milestone(self.env) self.assertEqual(False, milestone.exists) @@ -441,7 +788,7 @@ def test_create_milestone_without_name(self): milestone = Milestone(self.env) - self.assertRaises(AssertionError, milestone.insert) + self.assertRaises(TracError, milestone.insert) def test_delete_milestone(self): cursor = self.db.cursor() @@ -450,6 +797,7 @@ milestone = Milestone(self.env, 'Test') milestone.delete() + self.assertEqual(False, milestone.exists) cursor = self.db.cursor() cursor.execute("SELECT * FROM milestone WHERE name='Test'") @@ -469,6 +817,7 @@ milestone = Milestone(self.env, 'Test') milestone.delete(retarget_to='Other') + self.assertEqual(False, milestone.exists) self.assertEqual('Other', Ticket(self.env, tkt1.id)['milestone']) self.assertEqual('Other', Ticket(self.env, tkt2.id)['milestone']) @@ -479,8 +828,8 @@ cursor.close() milestone = Milestone(self.env, 'Test') - t1 = datetime(2001,01,01, tzinfo=utc) - t2 = datetime(2002,02,02, tzinfo=utc) + t1 = datetime(2001, 01, 01, tzinfo=utc) + t2 = datetime(2002, 02, 02, tzinfo=utc) milestone.due = t1 milestone.completed = t2 milestone.description = 'Foo bar' @@ -488,7 +837,8 @@ cursor = self.db.cursor() cursor.execute("SELECT * FROM milestone WHERE name='Test'") - self.assertEqual(('Test', to_timestamp(t1), to_timestamp(t2), 'Foo bar'), + self.assertEqual(('Test', to_utimestamp(t1), to_utimestamp(t2), + 'Foo bar'), cursor.fetchone()) def test_update_milestone_without_name(self): @@ -498,7 +848,7 @@ milestone = Milestone(self.env, 'Test') milestone.name = None - self.assertRaises(AssertionError, milestone.update) + self.assertRaises(TracError, milestone.update) def test_update_milestone_update_tickets(self): cursor = self.db.cursor() @@ -531,6 +881,43 @@ self.assertEqual('2.0', milestones[1].name) assert milestones[1].exists + def test_change_listener_created(self): + listener = TestMilestoneChangeListener(self.env) + milestone = self._create_milestone(name='Milestone 1') + milestone.insert() + self.assertEqual('created', listener.action) + self.assertEqual(milestone, listener.milestone) + + def test_change_listener_changed(self): + listener = TestMilestoneChangeListener(self.env) + milestone = self._create_milestone( + name='Milestone 1', + due=datetime(2001, 01, 01, tzinfo=utc), + description='The milestone description') + milestone.insert() + + milestone.name = 'Milestone 2' + milestone.completed = datetime(2001, 02, 03, tzinfo=utc) + milestone.description = 'The changed description' + milestone.update() + + self.assertEqual('changed', listener.action) + self.assertEqual(milestone, listener.milestone) + self.assertEqual({'name': 'Milestone 1', 'completed': None, + 'description': 'The milestone description'}, + listener.old_values) + + def test_change_listener_deleted(self): + listener = TestMilestoneChangeListener(self.env) + milestone = self._create_milestone(name='Milestone 1') + milestone.insert() + self.assertEqual(True, milestone.exists) + milestone.delete() + self.assertEqual('Milestone 1', milestone.name) + self.assertEqual(False, milestone.exists) + self.assertEqual('deleted', listener.action) + self.assertEqual(milestone, listener.milestone) + class ComponentTestCase(unittest.TestCase): @@ -613,6 +1000,8 @@ def suite(): suite = unittest.TestSuite() suite.addTest(unittest.makeSuite(TicketTestCase, 'test')) + suite.addTest(unittest.makeSuite(TicketCommentEditTestCase, 'test')) + suite.addTest(unittest.makeSuite(TicketCommentDeleteTestCase, 'test')) suite.addTest(unittest.makeSuite(EnumTestCase, 'test')) suite.addTest(unittest.makeSuite(MilestoneTestCase, 'test')) suite.addTest(unittest.makeSuite(ComponentTestCase, 'test')) diff -Nru trac-0.11.7/trac/ticket/tests/notification.py trac-0.12.1~ppa2/trac/ticket/tests/notification.py --- trac-0.11.7/trac/ticket/tests/notification.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/tests/notification.py 2010-03-12 10:48:45.000000000 +0000 @@ -16,7 +16,6 @@ # (lsmithson@open-networks.co.uk) extensible Python SMTP Server # -from trac.core import TracError from trac.util.datefmt import utc from trac.ticket.model import Ticket from trac.ticket.notification import TicketNotifyEmail @@ -29,7 +28,6 @@ import os import quopri import re -import time import unittest SMTP_TEST_PORT = 7000 + os.getpid() % 1000 @@ -42,7 +40,7 @@ def setUp(self): self.env = EnvironmentStub(default_data=True) - self.env.config.set('project','name', 'TracTest') + self.env.config.set('project', 'name', 'TracTest') self.env.config.set('notification', 'smtp_enabled', 'true') self.env.config.set('notification', 'always_notify_owner', 'true') self.env.config.set('notification', 'always_notify_reporter', 'true') @@ -62,7 +60,7 @@ def test_recipients(self): """To/Cc recipients""" ticket = Ticket(self.env) - ticket['reporter'] = '"Joe User" ' + ticket['reporter'] = '"Joe User" < joe.user@example.org >' ticket['owner'] = 'joe.user@example.net' ticket['cc'] = 'joe.user@example.com, joe.bar@example.org, ' \ 'joe.bar@example.net' @@ -149,10 +147,11 @@ r"((?P\w{2,3})|(?P[+\-]\d{4}))$" date_re = re.compile(date_str) # python time module does not detect incorrect time values - days = ['Mon','Tue','Wed','Thu','Fri','Sat','Sun'] - months = ['Jan','Feb','Mar','Apr','May','Jun', \ - 'Jul','Aug','Sep','Oct','Nov','Dec'] - tz = ['UT','GMT','EST','EDT','CST','CDT','MST','MDT''PST','PDT'] + days = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] + months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', \ + 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] + tz = ['UT', 'GMT', 'EST', 'EDT', 'CST', 'CDT', 'MST', 'MDT', + 'PST', 'PDT'] ticket = Ticket(self.env) ticket['reporter'] = '"Joe User" ' ticket['summary'] = 'This is a summary' @@ -166,9 +165,9 @@ self.failIf(not mo) if mo.group('day'): self.failIf(mo.group('day') not in days) - self.failIf(int(mo.group('dm')) not in range(1,32)) + self.failIf(int(mo.group('dm')) not in range(1, 32)) self.failIf(mo.group('month') not in months) - self.failIf(int(mo.group('hour')) not in range(0,24)) + self.failIf(int(mo.group('hour')) not in range(0, 24)) if mo.group('tz'): self.failIf(mo.group('tz') not in tz) @@ -375,7 +374,7 @@ def test_multiline_header(self): """Encoded headers split into multiple lines""" - self.env.config.set('notification','mime_encoding', 'qp') + self.env.config.set('notification', 'mime_encoding', 'qp') ticket = Ticket(self.env) ticket['reporter'] = 'joe.user@example.org' # Forces non-ascii characters @@ -392,7 +391,7 @@ def test_mimebody_b64(self): """MIME Base64/utf-8 encoding""" - self.env.config.set('notification','mime_encoding', 'base64') + self.env.config.set('notification', 'mime_encoding', 'base64') ticket = Ticket(self.env) ticket['reporter'] = 'joe.user@example.org' ticket['summary'] = u'This is a long enough summary to cause Trac ' \ @@ -403,7 +402,7 @@ def test_mimebody_qp(self): """MIME QP/utf-8 encoding""" - self.env.config.set('notification','mime_encoding', 'qp') + self.env.config.set('notification', 'mime_encoding', 'qp') ticket = Ticket(self.env) ticket['reporter'] = 'joe.user@example.org' ticket['summary'] = u'This is a long enough summary to cause Trac ' \ @@ -414,7 +413,7 @@ def test_mimebody_none_7bit(self): """MIME None encoding resulting in 7bit""" - self.env.config.set('notification','mime_encoding', 'none') + self.env.config.set('notification', 'mime_encoding', 'none') ticket = Ticket(self.env) ticket['reporter'] = 'joe.user' ticket['summary'] = u'This is a summary' @@ -424,7 +423,7 @@ def test_mimebody_none_8bit(self): """MIME None encoding resulting in 8bit""" - self.env.config.set('notification','mime_encoding', 'none') + self.env.config.set('notification', 'mime_encoding', 'none') ticket = Ticket(self.env) ticket['reporter'] = 'joe.user' ticket['summary'] = u'This is a summary for Jöe Usèr' @@ -450,7 +449,7 @@ """No-self-notification option""" def _test_updater(disable): if disable: - self.env.config.set('notification','always_notify_updater', + self.env.config.set('notification', 'always_notify_updater', 'false') ticket = Ticket(self.env) ticket['reporter'] = 'joe.user@example.org' @@ -611,12 +610,12 @@ self.failIf(footer > 3) # check ticket link if line[:11] == 'Ticket URL:': - self.assertEqual(line[12:].strip(), - "<%s>" % ticket['link'].strip()) + ticket_link = self.env.abs_href.ticket(ticket.id) + self.assertEqual(line[12:].strip(), "<%s>" % ticket_link) # note project title / URL are not validated yet # ticket properties which are not expected in the banner - xlist = ['summary', 'description', 'link', 'comment', 'new'] + xlist = ['summary', 'description', 'comment', 'time', 'changetime'] # check banner content (field exists, msg value matches ticket value) for p in [prop for prop in ticket.values.keys() if prop not in xlist]: self.failIf(not props.has_key(p)) @@ -626,6 +625,31 @@ else: self.failIf(props[p] != ticket[p]) + def test_notification_does_not_alter_ticket_instance(self): + ticket = Ticket(self.env) + ticket['summary'] = 'My Summary' + ticket['description'] = 'Some description' + ticket.insert() + tn = TicketNotifyEmail(self.env) + tn.notify(ticket, newticket=True) + self.assertNotEqual(None, notifysuite.smtpd.get_message()) + self.assertEqual('My Summary', ticket['summary']) + self.assertEqual('Some description', ticket['description']) + valid_fieldnames = set([f['name'] for f in ticket.fields]) + current_fieldnames = set(ticket.values.keys()) + self.assertEqual(set(), current_fieldnames - valid_fieldnames) + + def test_notification_get_message_id_unicode(self): + ticket = Ticket(self.env) + ticket['summary'] = 'My Summary' + ticket['description'] = 'Some description' + ticket.insert() + self.env.config.set('project', 'url', u"пиво Müller ") + tn = TicketNotifyEmail(self.env) + tn.ticket = ticket + tn.get_message_id('foo') + + class NotificationTestSuite(unittest.TestSuite): """Thin test suite wrapper to start and stop the SMTP test server""" diff -Nru trac-0.11.7/trac/ticket/tests/query.py trac-0.12.1~ppa2/trac/ticket/tests/query.py --- trac-0.11.7/trac/ticket/tests/query.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/tests/query.py 2010-02-20 02:58:38.000000000 +0000 @@ -1,10 +1,9 @@ -from trac.log import logger_factory from trac.mimeview import Context from trac.test import Mock, EnvironmentStub, MockPerm -from trac.ticket.query import Query, QueryModule +from trac.ticket.query import Query, QueryModule, TicketQueryMacro +from trac.util.datefmt import utc from trac.web.href import Href from trac.wiki.formatter import LinkFormatter -from trac.db.sqlite_backend import sqlite_version import unittest import difflib @@ -33,7 +32,8 @@ def setUp(self): self.env = EnvironmentStub(default_data=True) - self.req = Mock(href=self.env.href, authname='anonymous') + self.db = self.env.get_db_cnx() + self.req = Mock(href=self.env.href, authname='anonymous', tz=utc) def tearDown(self): self.env.reset_db() @@ -71,6 +71,17 @@ self.assertEqual([], args) tickets = query.execute(self.req) + def test_all_ordered_by_id_from_unicode(self): + query = Query.from_string(self.env, u'order=id') + sql, args = query.get_sql() + self.assertEqualSQL(sql, +"""SELECT t.id AS id,t.summary AS summary,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.milestone AS milestone,t.time AS time,t.changetime AS changetime,priority.value AS priority_value +FROM ticket AS t + LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) +ORDER BY COALESCE(t.id,0)=0,t.id""") + self.assertEqual([], args) + tickets = query.execute(self.req) + def test_all_ordered_by_priority(self): query = Query(self.env) # priority is default order sql, args = query.get_sql() @@ -126,7 +137,7 @@ """SELECT t.id AS id,t.summary AS summary,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.component AS component,t.time AS time,t.changetime AS changetime,t.milestone AS milestone,priority.value AS priority_value FROM ticket AS t LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) -WHERE COALESCE(t.milestone,'')=%s +WHERE ((COALESCE(t.milestone,'')=%s)) ORDER BY COALESCE(t.id,0)=0,t.id""") self.assertEqual(['milestone1'], args) tickets = query.execute(self.req) @@ -174,7 +185,7 @@ """SELECT t.id AS id,t.summary AS summary,t.milestone AS milestone,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.time AS time,t.changetime AS changetime,priority.value AS priority_value FROM ticket AS t LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) -WHERE COALESCE(t.milestone,'')!=%s +WHERE ((COALESCE(t.milestone,'')!=%s)) ORDER BY COALESCE(t.id,0)=0,t.id""") self.assertEqual(['milestone1'], args) tickets = query.execute(self.req) @@ -187,7 +198,7 @@ """SELECT t.id AS id,t.summary AS summary,t.status AS status,t.owner AS owner,t.type AS type,t.priority AS priority,t.milestone AS milestone,t.time AS time,t.changetime AS changetime,priority.value AS priority_value FROM ticket AS t LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) -WHERE COALESCE(t.status,'') IN (%s,%s,%s) +WHERE (COALESCE(t.status,'') IN (%s,%s,%s)) ORDER BY COALESCE(t.id,0)=0,t.id""") self.assertEqual(['new', 'assigned', 'reopened'], args) tickets = query.execute(self.req) @@ -199,8 +210,8 @@ """SELECT t.id AS id,t.summary AS summary,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.milestone AS milestone,t.time AS time,t.changetime AS changetime,priority.value AS priority_value FROM ticket AS t LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) -WHERE COALESCE(t.owner,'') %(like)s -ORDER BY COALESCE(t.id,0)=0,t.id""" % {'like': self.env.get_db_cnx().like()}) +WHERE ((COALESCE(t.owner,'') %(like)s)) +ORDER BY COALESCE(t.id,0)=0,t.id""" % {'like': self.env.get_db_cnx().like()}) self.assertEqual(['%someone%'], args) tickets = query.execute(self.req) @@ -211,8 +222,8 @@ """SELECT t.id AS id,t.summary AS summary,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.milestone AS milestone,t.time AS time,t.changetime AS changetime,priority.value AS priority_value FROM ticket AS t LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) -WHERE COALESCE(t.owner,'') NOT %(like)s -ORDER BY COALESCE(t.id,0)=0,t.id""" % {'like': self.env.get_db_cnx().like()}) +WHERE ((COALESCE(t.owner,'') NOT %(like)s)) +ORDER BY COALESCE(t.id,0)=0,t.id""" % {'like': self.env.get_db_cnx().like()}) self.assertEqual(['%someone%'], args) tickets = query.execute(self.req) @@ -223,8 +234,8 @@ """SELECT t.id AS id,t.summary AS summary,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.milestone AS milestone,t.time AS time,t.changetime AS changetime,priority.value AS priority_value FROM ticket AS t LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) -WHERE COALESCE(t.owner,'') %(like)s -ORDER BY COALESCE(t.id,0)=0,t.id""" % {'like': self.env.get_db_cnx().like()}) +WHERE ((COALESCE(t.owner,'') %(like)s)) +ORDER BY COALESCE(t.id,0)=0,t.id""" % {'like': self.env.get_db_cnx().like()}) self.assertEqual(['someone%'], args) tickets = query.execute(self.req) @@ -235,8 +246,8 @@ """SELECT t.id AS id,t.summary AS summary,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.milestone AS milestone,t.time AS time,t.changetime AS changetime,priority.value AS priority_value FROM ticket AS t LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) -WHERE COALESCE(t.owner,'') %(like)s -ORDER BY COALESCE(t.id,0)=0,t.id""" % {'like': self.env.get_db_cnx().like()}) +WHERE ((COALESCE(t.owner,'') %(like)s)) +ORDER BY COALESCE(t.id,0)=0,t.id""" % {'like': self.env.get_db_cnx().like()}) self.assertEqual(['%someone'], args) tickets = query.execute(self.req) @@ -244,13 +255,14 @@ self.env.config.set('ticket-custom', 'foo', 'text') query = Query.from_string(self.env, 'foo=something', order='id') sql, args = query.get_sql() + foo = self.db.quote('foo') self.assertEqualSQL(sql, -"""SELECT t.id AS id,t.summary AS summary,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.milestone AS milestone,t.time AS time,t.changetime AS changetime,priority.value AS priority_value,foo.value AS foo +"""SELECT t.id AS id,t.summary AS summary,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.milestone AS milestone,t.time AS time,t.changetime AS changetime,priority.value AS priority_value,%s.value AS %s FROM ticket AS t - LEFT OUTER JOIN ticket_custom AS foo ON (id=foo.ticket AND foo.name='foo') + LEFT OUTER JOIN ticket_custom AS %s ON (id=%s.ticket AND %s.name='foo') LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) -WHERE COALESCE(foo.value,'')=%s -ORDER BY COALESCE(t.id,0)=0,t.id""") +WHERE ((COALESCE(%s.value,'')=%%s)) +ORDER BY COALESCE(t.id,0)=0,t.id""" % ((foo,) * 6)) self.assertEqual(['something'], args) tickets = query.execute(self.req) @@ -258,12 +270,14 @@ self.env.config.set('ticket-custom', 'foo', 'text') query = Query(self.env, group='foo', order='id') sql, args = query.get_sql() + foo = self.db.quote('foo') self.assertEqualSQL(sql, -"""SELECT t.id AS id,t.summary AS summary,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.milestone AS milestone,t.time AS time,t.changetime AS changetime,priority.value AS priority_value,foo.value AS foo +"""SELECT t.id AS id,t.summary AS summary,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.milestone AS milestone,t.time AS time,t.changetime AS changetime,priority.value AS priority_value,%s.value AS %s FROM ticket AS t - LEFT OUTER JOIN ticket_custom AS foo ON (id=foo.ticket AND foo.name='foo') + LEFT OUTER JOIN ticket_custom AS %s ON (id=%s.ticket AND %s.name='foo') LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) -ORDER BY COALESCE(foo.value,'')='',foo.value,COALESCE(t.id,0)=0,t.id""") +ORDER BY COALESCE(%s.value,'')='',%s.value,COALESCE(t.id,0)=0,t.id""" % + ((foo,) * 7)) self.assertEqual([], args) tickets = query.execute(self.req) @@ -275,7 +289,7 @@ """SELECT t.id AS id,t.summary AS summary,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.milestone AS milestone,t.time AS time,t.changetime AS changetime,priority.value AS priority_value FROM ticket AS t LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) -WHERE COALESCE(t.owner,'') IN (%s,%s) +WHERE (COALESCE(t.owner,'') IN (%s,%s)) ORDER BY COALESCE(t.id,0)=0,t.id""") self.assertEqual(['someone', 'someone_else'], args) tickets = query.execute(self.req) @@ -288,7 +302,7 @@ """SELECT t.id AS id,t.summary AS summary,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.milestone AS milestone,t.time AS time,t.changetime AS changetime,priority.value AS priority_value FROM ticket AS t LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) -WHERE COALESCE(t.owner,'') NOT IN (%s,%s) +WHERE (COALESCE(t.owner,'') NOT IN (%s,%s)) ORDER BY COALESCE(t.id,0)=0,t.id""") self.assertEqual(['someone', 'someone_else'], args) tickets = query.execute(self.req) @@ -302,7 +316,7 @@ """SELECT t.id AS id,t.summary AS summary,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.milestone AS milestone,t.time AS time,t.changetime AS changetime,priority.value AS priority_value FROM ticket AS t LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) -WHERE (COALESCE(t.owner,'') %(like)s OR COALESCE(t.owner,'') %(like)s) +WHERE ((COALESCE(t.owner,'') %(like)s OR COALESCE(t.owner,'') %(like)s)) ORDER BY COALESCE(t.id,0)=0,t.id""" % {'like': self.env.get_db_cnx().like()}) tickets = query.execute(self.req) @@ -339,6 +353,122 @@ self.assertEqual([], args) tickets = query.execute(self.req) + def test_constrained_by_time_range(self): + query = Query.from_string(self.env, 'created=2008-08-01;2008-09-01', order='id') + sql, args = query.get_sql(self.req) + self.assertEqualSQL(sql, +"""SELECT t.id AS id,t.summary AS summary,t.time AS time,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.changetime AS changetime,priority.value AS priority_value +FROM ticket AS t + LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) +WHERE (((%(cast_time)s>=%%s AND %(cast_time)s<%%s))) +ORDER BY COALESCE(t.id,0)=0,t.id""" % { + 'cast_time': self.env.get_db_cnx().cast('t.time', 'int64')}) + self.assertEqual([1217548800000000L, 1220227200000000L], args) + tickets = query.execute(self.req) + + def test_constrained_by_time_range_exclusion(self): + query = Query.from_string(self.env, 'created!=2008-08-01;2008-09-01', order='id') + sql, args = query.get_sql(self.req) + self.assertEqualSQL(sql, +"""SELECT t.id AS id,t.summary AS summary,t.time AS time,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.changetime AS changetime,priority.value AS priority_value +FROM ticket AS t + LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) +WHERE ((NOT (%(cast_time)s>=%%s AND %(cast_time)s<%%s))) +ORDER BY COALESCE(t.id,0)=0,t.id""" % { + 'cast_time': self.env.get_db_cnx().cast('t.time', 'int64')}) + self.assertEqual([1217548800000000L, 1220227200000000L], args) + tickets = query.execute(self.req) + + def test_constrained_by_time_range_open_right(self): + query = Query.from_string(self.env, 'created=2008-08-01;', order='id') + sql, args = query.get_sql(self.req) + self.assertEqualSQL(sql, +"""SELECT t.id AS id,t.summary AS summary,t.time AS time,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.changetime AS changetime,priority.value AS priority_value +FROM ticket AS t + LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) +WHERE ((%(cast_time)s>=%%s)) +ORDER BY COALESCE(t.id,0)=0,t.id""" % { + 'cast_time': self.env.get_db_cnx().cast('t.time', 'int64')}) + self.assertEqual([1217548800000000L], args) + tickets = query.execute(self.req) + + def test_constrained_by_time_range_open_left(self): + query = Query.from_string(self.env, 'created=;2008-09-01', order='id') + sql, args = query.get_sql(self.req) + self.assertEqualSQL(sql, +"""SELECT t.id AS id,t.summary AS summary,t.time AS time,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.changetime AS changetime,priority.value AS priority_value +FROM ticket AS t + LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) +WHERE ((%(cast_time)s<%%s)) +ORDER BY COALESCE(t.id,0)=0,t.id""" % { + 'cast_time': self.env.get_db_cnx().cast('t.time', 'int64')}) + self.assertEqual([1220227200000000L], args) + tickets = query.execute(self.req) + + def test_constrained_by_time_range_modified(self): + query = Query.from_string(self.env, 'modified=2008-08-01;2008-09-01', order='id') + sql, args = query.get_sql(self.req) + self.assertEqualSQL(sql, +"""SELECT t.id AS id,t.summary AS summary,t.changetime AS changetime,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.time AS time,priority.value AS priority_value +FROM ticket AS t + LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) +WHERE (((%(cast_changetime)s>=%%s AND %(cast_changetime)s<%%s))) +ORDER BY COALESCE(t.id,0)=0,t.id""" % { + 'cast_changetime': self.env.get_db_cnx().cast('t.changetime', 'int64')}) + self.assertEqual([1217548800000000L, 1220227200000000L], args) + tickets = query.execute(self.req) + + def test_constrained_by_keywords(self): + query = Query.from_string(self.env, 'keywords~=foo -bar baz', + order='id') + sql, args = query.get_sql() + self.assertEqualSQL(sql, +"""SELECT t.id AS id,t.summary AS summary,t.keywords AS keywords,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.time AS time,t.changetime AS changetime,priority.value AS priority_value +FROM ticket AS t + LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) +WHERE (((COALESCE(t.keywords,'') %(like)s AND COALESCE(t.keywords,'') NOT %(like)s AND COALESCE(t.keywords,'') %(like)s))) +ORDER BY COALESCE(t.id,0)=0,t.id""" % {'like': self.env.get_db_cnx().like()}) + self.assertEqual(['%foo%', '%bar%', '%baz%'], args) + tickets = query.execute(self.req) + + def test_constrained_by_milestone_or_version(self): + query = Query.from_string(self.env, 'milestone=milestone1&or&version=version1', order='id') + sql, args = query.get_sql() + self.assertEqualSQL(sql, +"""SELECT t.id AS id,t.summary AS summary,t.owner AS owner,t.type AS type,t.status AS status,t.priority AS priority,t.component AS component,t.time AS time,t.changetime AS changetime,t.version AS version,t.milestone AS milestone,priority.value AS priority_value +FROM ticket AS t + LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) +WHERE ((COALESCE(t.milestone,'')=%s)) OR ((COALESCE(t.version,'')=%s)) +ORDER BY COALESCE(t.id,0)=0,t.id""") + self.assertEqual(['milestone1', 'version1'], args) + tickets = query.execute(self.req) + + def test_equal_in_value(self): + query = Query.from_string(self.env, r'status=this=that&version=version1', + order='id') + sql, args = query.get_sql() + self.assertEqualSQL(sql, +"""SELECT t.id AS id,t.summary AS summary,t.owner AS owner,t.type AS type,t.priority AS priority,t.milestone AS milestone,t.component AS component,t.status AS status,t.time AS time,t.changetime AS changetime,t.version AS version,priority.value AS priority_value +FROM ticket AS t + LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) +WHERE ((COALESCE(t.status,'')=%s) AND (COALESCE(t.version,'')=%s)) +ORDER BY COALESCE(t.id,0)=0,t.id""") + self.assertEqual(['this=that', 'version1'], args) + tickets = query.execute(self.req) + + def test_special_character_escape(self): + query = Query.from_string(self.env, r'status=here\&now|maybe\|later|back\slash', + order='id') + sql, args = query.get_sql() + self.assertEqualSQL(sql, +"""SELECT t.id AS id,t.summary AS summary,t.status AS status,t.owner AS owner,t.type AS type,t.priority AS priority,t.milestone AS milestone,t.time AS time,t.changetime AS changetime,priority.value AS priority_value +FROM ticket AS t + LEFT OUTER JOIN enum AS priority ON (priority.type='priority' AND priority.name=priority) +WHERE (COALESCE(t.status,'') IN (%s,%s,%s)) +ORDER BY COALESCE(t.id,0)=0,t.id""") + self.assertEqual(['here&now', 'maybe|later', 'back\\slash'], args) + tickets = query.execute(self.req) + def test_repeated_constraint_field(self): like_query = Query.from_string(self.env, 'owner!=someone|someone_else', order='id') @@ -353,7 +483,8 @@ def test_csv_escape(self): query = Mock(get_columns=lambda: ['col1'], execute=lambda r,c: [{'id': 1, - 'col1': 'value, needs escaped'}]) + 'col1': 'value, needs escaped'}], + time_fields=['time', 'changetime']) content, mimetype = QueryModule(self.env).export_csv( Mock(href=self.env.href, perm=MockPerm()), query) @@ -382,11 +513,49 @@ 'field and constraints separated by a "="]') +class TicketQueryMacroTestCase(unittest.TestCase): + + def assertQueryIs(self, content, query, kwargs, format): + qs, kw, f = TicketQueryMacro.parse_args(content) + self.assertEqual(query, qs) + self.assertEqual(kwargs, kw) + self.assertEqual(format, f) + + def test_owner_and_milestone(self): + self.assertQueryIs('owner=joe, milestone=milestone1', + 'owner=joe&milestone=milestone1', + dict(col='status|summary', max='0', order='id'), + 'list') + + def test_owner_or_milestone(self): + self.assertQueryIs('owner=joe, or, milestone=milestone1', + 'owner=joe&or&milestone=milestone1', + dict(col='status|summary', max='0', order='id'), + 'list') + + def test_format_arguments(self): + self.assertQueryIs('owner=joe, milestone=milestone1, col=component|severity, max=15, order=component, format=compact', + 'owner=joe&milestone=milestone1', + dict(col='status|summary|component|severity', max='15', order='component'), + 'compact') + self.assertQueryIs('owner=joe, milestone=milestone1, col=id|summary|component, max=30, order=component, format=table', + 'owner=joe&milestone=milestone1', + dict(col='id|summary|component', max='30', order='component'), + 'table') + + def test_special_char_escaping(self): + self.assertQueryIs(r'owner=joe|jack, milestone=this\&that\|here\,now', + r'owner=joe|jack&milestone=this\&that\|here,now', + dict(col='status|summary', max='0', order='id'), + 'list') + + def suite(): suite = unittest.TestSuite() suite.addTest(unittest.makeSuite(QueryTestCase, 'test')) suite.addTest(unittest.makeSuite(QueryLinksTestCase, 'test')) + suite.addTest(unittest.makeSuite(TicketQueryMacroTestCase, 'text')) return suite if __name__ == '__main__': - unittest.main() + unittest.main(defaultTest='suite') diff -Nru trac-0.11.7/trac/ticket/tests/report.py trac-0.12.1~ppa2/trac/ticket/tests/report.py --- trac-0.11.7/trac/ticket/tests/report.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/tests/report.py 2010-02-18 09:50:33.000000000 +0000 @@ -1,6 +1,6 @@ from trac.db.mysql_backend import MySQLConnection from trac.ticket.report import ReportModule -from trac.test import EnvironmentStub, Mock +from trac.test import EnvironmentStub from trac.web.api import Request, RequestDone import unittest @@ -27,22 +27,42 @@ return environ def test_sub_var_no_quotes(self): - sql, args = self.report_module.sql_sub_vars("$VAR", {'VAR': 'value'}) + sql, values, missing_args = self.report_module.sql_sub_vars( + "$VAR", {'VAR': 'value'}) self.assertEqual("%s", sql) - self.assertEqual(['value'], args) + self.assertEqual(['value'], values) + self.assertEqual([], missing_args) + def test_sub_var_digits_underscore(self): + sql, values, missing_args = self.report_module.sql_sub_vars( + "$_VAR, $VAR2, $2VAR", {'_VAR': 'value1', 'VAR2': 'value2'}) + self.assertEqual("%s, %s, $2VAR", sql) + self.assertEqual(['value1', 'value2'], values) + self.assertEqual([], missing_args) + def test_sub_var_quotes(self): - sql, args = self.report_module.sql_sub_vars("'$VAR'", {'VAR': 'value'}) + sql, values, missing_args = self.report_module.sql_sub_vars( + "'$VAR'", {'VAR': 'value'}) self.assertEqual(self.env.get_db_cnx().concat("''", '%s', "''"), sql) - self.assertEqual(['value'], args) + self.assertEqual(['value'], values) + self.assertEqual([], missing_args) # Probably not needed anymore def test_sub_var_mysql(self): env = EnvironmentStub() env.db = MockMySQLConnection() # ditto - sql, args = ReportModule(env).sql_sub_vars("'$VAR'", {'VAR': 'value'}) + sql, values, missing_args = ReportModule(env).sql_sub_vars( + "'$VAR'", {'VAR': 'value'}) self.assertEqual("concat('', %s, '')", sql) - self.assertEqual(['value'], args) + self.assertEqual(['value'], values) + self.assertEqual([], missing_args) + + def test_sub_var_missing_args(self): + sql, values, missing_args = self.report_module.sql_sub_vars( + "$VAR, $PARAM, $MISSING", {'VAR': 'value'}) + self.assertEqual("%s, %s, %s", sql) + self.assertEqual(['value', '', ''], values) + self.assertEqual(['PARAM', 'MISSING'], missing_args) def test_csv_escape(self): buf = StringIO() diff -Nru trac-0.11.7/trac/ticket/tests/roadmap.py trac-0.12.1~ppa2/trac/ticket/tests/roadmap.py --- trac-0.11.7/trac/ticket/tests/roadmap.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/tests/roadmap.py 2010-04-20 22:17:52.000000000 +0100 @@ -1,4 +1,3 @@ -from trac.config import Configuration from trac.test import EnvironmentStub from trac.ticket.roadmap import * from trac.core import ComponentManager @@ -8,11 +7,11 @@ class TicketGroupStatsTestCase(unittest.TestCase): def setUp(self): - self.stats = TicketGroupStats('title', 'unit') + self.stats = TicketGroupStats('title', 'units') def test_init(self): self.assertEquals('title', self.stats.title, 'title incorrect') - self.assertEquals('unit', self.stats.unit, 'unit incorrect') + self.assertEquals('units', self.stats.unit, 'unit incorrect') self.assertEquals(0, self.stats.count, 'count not zero') self.assertEquals(0, len(self.stats.intervals), 'intervals not empty') @@ -34,7 +33,7 @@ self.stats.add_interval('intTitle', 3, {'k1': 'v1'}, 'css', 0) self.stats.add_interval('intTitle', 5, {'k1': 'v1'}, 'css', 0) self.stats.refresh_calcs() - int = self.stats.intervals[1] + interval = self.stats.intervals[1] self.assertEquals(0, self.stats.done_count, 'count added for no prog') self.assertEquals(0, self.stats.done_percent, 'percent incremented') @@ -98,7 +97,7 @@ def test_stats(self): self.assertEquals(self.stats.title, 'ticket status', 'title incorrect') - self.assertEquals(self.stats.unit, 'ticket', 'unit incorrect') + self.assertEquals(self.stats.unit, 'tickets', 'unit incorrect') self.assertEquals(2, len(self.stats.intervals), 'more than 2 intervals') def test_closed_interval(self): diff -Nru trac-0.11.7/trac/ticket/tests/wikisyntax.py trac-0.12.1~ppa2/trac/ticket/tests/wikisyntax.py --- trac-0.11.7/trac/ticket/tests/wikisyntax.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/tests/wikisyntax.py 2009-10-29 18:37:45.000000000 +0000 @@ -4,11 +4,9 @@ from trac.ticket.model import Ticket from trac.ticket.roadmap import Milestone -from trac.ticket.query import QueryModule -from trac.ticket.report import ReportModule from trac.wiki.tests import formatter -TICKET_TEST_CASES=u""" +TICKET_TEST_CASES = u""" ============================== ticket: link resolver ticket:1 ticket:12 @@ -91,7 +89,7 @@ -REPORT_TEST_CASES=u""" +REPORT_TEST_CASES = u""" ============================== report link shorthand form {1}, {2} {12}, {abc} @@ -139,7 +137,7 @@ # TBD -MILESTONE_TEST_CASES=""" +MILESTONE_TEST_CASES = """ ============================== milestone: link resolver milestone:foo [milestone:boo Milestone Boo] @@ -180,7 +178,7 @@ -QUERY_TEST_CASES=""" +QUERY_TEST_CASES = u""" ============================== query: link resolver query:?order=priority @@ -209,7 +207,7 @@ query:milestone!=

-query:milestone=1.0|2.0&owner=me +query:milestone=1.0|2.0&owner=me

query:group=owner @@ -218,9 +216,91 @@ query:verbose=1

------------------------------ +============================== TicketQuery macro: no results, list form +Reopened tickets: [[TicketQuery(status=reopened)]] +------------------------------ +

+Reopened tickets: No results +

+------------------------------ +============================== TicketQuery macro: no results, count 0 +Reopened tickets: [[TicketQuery(status=reopened, format=count)]] +------------------------------ +

+Reopened tickets: 0 +

+------------------------------ +============================== TicketQuery macro: no results, compact form +Reopened tickets: [[TicketQuery(status=reopened, format=compact)]] +------------------------------ +

+Reopened tickets: No results +

+------------------------------ +============================== TicketQuery macro: one result, list form +New tickets: [[TicketQuery(status=new)]] +------------------------------ +

+New tickets:

#1: This is the summary

+------------------------------ +============================== TicketQuery macro: one result, count 1 +New tickets: [[TicketQuery(status=new, format=count)]] +------------------------------ +

+New tickets: 1 +

+------------------------------ +============================== TicketQuery macro: one result, compact form +New tickets: [[TicketQuery(status=new, format=compact)]] +------------------------------ +

+New tickets: #1 +

+------------------------------ """ -COMMENT_TEST_CASES=""" +QUERY2_TEST_CASES = u""" +============================== TicketQuery macro: two results, list form +New tickets: [[TicketQuery(status=new, order=reporter)]] +------------------------------ +

+New tickets:

#2: This is another summary
#1: This is the summary

+------------------------------ +============================== TicketQuery macro: two results, count 2 +New tickets: [[TicketQuery(status=new, order=reporter, format=count)]] +------------------------------ +

+New tickets: 2 +

+------------------------------ +============================== TicketQuery macro: two results, compact form +New tickets: [[TicketQuery(status=new, order=reporter, format=compact)]] +------------------------------ +

+New tickets: #2, #1 +

+------------------------------ +""" + +def query2_setup(tc): + ticket = Ticket(tc.env) + ticket.values.update({'reporter': 'santa', + 'summary': 'This is the summary', + 'status': 'new'}) + ticket.insert() + ticket = Ticket(tc.env) + ticket.values.update({'reporter': 'claus', + 'summary': 'This is another summary', + 'status': 'new'}) + ticket.insert() + +def query2_teardown(tc): + tc.env.reset_db() + + +COMMENT_TEST_CASES = """ ============================== comment: link resolver (deprecated) comment:ticket:123:2 (deprecated) [comment:ticket:123:2 see above] (deprecated) @@ -261,7 +341,10 @@ suite.addTest(formatter.suite(REPORT_TEST_CASES, report_setup, __file__)) suite.addTest(formatter.suite(MILESTONE_TEST_CASES, milestone_setup, __file__, milestone_teardown)) - suite.addTest(formatter.suite(QUERY_TEST_CASES, file=__file__)) + suite.addTest(formatter.suite(QUERY_TEST_CASES, ticket_setup, __file__, + ticket_teardown)) + suite.addTest(formatter.suite(QUERY2_TEST_CASES, query2_setup, __file__, + query2_teardown)) suite.addTest(formatter.suite(COMMENT_TEST_CASES, file=__file__)) return suite diff -Nru trac-0.11.7/trac/ticket/web_ui.py trac-0.12.1~ppa2/trac/ticket/web_ui.py --- trac-0.11.7/trac/ticket/web_ui.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/ticket/web_ui.py 2010-04-25 00:48:26.000000000 +0100 @@ -16,11 +16,9 @@ import csv from datetime import datetime -import os import pkg_resources import re from StringIO import StringIO -import time from genshi.core import Markup from genshi.builder import tag @@ -29,28 +27,29 @@ from trac.config import BoolOption, Option, IntOption, _TRUE_VALUES from trac.core import * from trac.mimeview.api import Mimeview, IContentConverter, Context -from trac.resource import Resource, get_resource_url, \ +from trac.resource import Resource, ResourceNotFound, get_resource_url, \ render_resource_link, get_resource_shortname from trac.search import ISearchSource, search_to_sql, shorten_result -from trac.ticket.api import TicketSystem, ITicketManipulator, \ - ITicketActionController +from trac.ticket.api import TicketSystem, ITicketManipulator from trac.ticket.model import Milestone, Ticket, group_milestones from trac.ticket.notification import TicketNotifyEmail from trac.timeline.api import ITimelineEventProvider from trac.util import get_reporter_id -from trac.util.compat import any, set -from trac.util.datefmt import to_timestamp, utc -from trac.util.text import CRLF, shorten_line, obfuscate_email_address, \ - exception_to_unicode +from trac.util.compat import any +from trac.util.datefmt import format_datetime, from_utimestamp, \ + to_utimestamp, utc +from trac.util.text import exception_to_unicode, obfuscate_email_address, \ + shorten_line, to_unicode from trac.util.presentation import separated -from trac.util.translation import _ +from trac.util.translation import _, tag_, tagn_, N_, gettext from trac.versioncontrol.diff import get_diff_options, diff_blocks -from trac.web import IRequestHandler -from trac.web.chrome import add_link, add_script, add_stylesheet, \ +from trac.web import arg_list_to_args, parse_arg_list, IRequestHandler +from trac.web.chrome import add_link, add_notice, add_script, add_stylesheet, \ add_warning, add_ctxtnav, prevnext_nav, Chrome, \ INavigationContributor, ITemplateProvider from trac.wiki.formatter import format_to, format_to_html, format_to_oneliner + class InvalidTicket(TracError): """Exception raised when a ticket fails validation.""" title = "Invalid Ticket" @@ -63,43 +62,6 @@ ticket_manipulators = ExtensionPoint(ITicketManipulator) - default_version = Option('ticket', 'default_version', '', - """Default version for newly created tickets.""") - - default_type = Option('ticket', 'default_type', 'defect', - """Default type for newly created tickets (''since 0.9'').""") - - default_priority = Option('ticket', 'default_priority', 'major', - """Default priority for newly created tickets.""") - - default_milestone = Option('ticket', 'default_milestone', '', - """Default milestone for newly created tickets.""") - - default_component = Option('ticket', 'default_component', '', - """Default component for newly created tickets.""") - - default_severity = Option('ticket', 'default_severity', '', - """Default severity for newly created tickets.""") - - default_summary = Option('ticket', 'default_summary', '', - """Default summary (title) for newly created tickets.""") - - default_description = Option('ticket', 'default_description', '', - """Default description for newly created tickets.""") - - default_keywords = Option('ticket', 'default_keywords', '', - """Default keywords for newly created tickets.""") - - default_owner = Option('ticket', 'default_owner', '', - """Default owner for newly created tickets.""") - - default_cc = Option('ticket', 'default_cc', '', - """Default cc: list for newly created tickets.""") - - default_resolution = Option('ticket', 'default_resolution', 'fixed', - """Default resolution for resolving (closing) tickets - (''since 0.11'').""") - timeline_details = BoolOption('timeline', 'ticket_show_details', 'false', """Enable the display of all ticket changes in the timeline, not only open / close operations (''since 0.9'').""") @@ -126,6 +88,31 @@ but keeps the old behavior for upgraded environments (i.e. 'no'). (''since 0.11'').""") + ticketlink_query = Option('query', 'ticketlink_query', + default='?status=!closed', + doc="""The base query to be used when linkifying values of ticket + fields. The query is a URL query + string starting with `?` as used in `query:` + [TracQuery#UsingTracLinks Trac links]. + (''since 0.12'')""") + + def __init__(self): + self._warn_for_default_attr = set() + + def __getattr__(self, name): + """Delegate access to ticket default Options which were move to + TicketSystem. + + .. todo:: remove in 0.13 + """ + if name.startswith('default_'): + if name not in self._warn_for_default_attr: + self.log.warning('%s option should be accessed via ' + 'TicketSystem component', name) + self._warn_for_default_attr.add(name) + return getattr(TicketSystem(self.env), name) + raise AttributeError("TicketModule has no attribute '%s'" % name) + def _must_preserve_newlines(self): preserve_newlines = self.preserve_newlines if preserve_newlines == 'default': @@ -194,7 +181,7 @@ def get_search_filters(self, req): if 'TICKET_VIEW' in req.perm: - yield ('ticket', 'Tickets') + yield ('ticket', _('Tickets')) def get_search_results(self, req, terms, filters): if not 'ticket' in filters: @@ -207,17 +194,18 @@ sql2, args2 = search_to_sql(db, ['newvalue'], terms) sql3, args3 = search_to_sql(db, ['value'], terms) cursor = db.cursor() - cursor.execute("SELECT summary,description,reporter, " - " type,id,time,status,resolution " - "FROM ticket " - "WHERE id IN (" - " SELECT id FROM ticket WHERE %s " - " UNION " - " SELECT ticket FROM ticket_change " - " WHERE field='comment' AND %s " - " UNION " - " SELECT ticket FROM ticket_custom WHERE %s)" % - (sql, sql2, sql3), args + args2 + args3) + cursor.execute(""" + SELECT summary,description,reporter,type,id,time,status,resolution + FROM ticket + WHERE id IN ( + SELECT id FROM ticket WHERE %s + UNION + SELECT ticket FROM ticket_change + WHERE field='comment' AND %s + UNION + SELECT ticket FROM ticket_custom WHERE %s + ) + """ % (sql, sql2, sql3), args + args2 + args3) ticketsystem = TicketSystem(self.env) for summary, desc, author, type, tid, ts, status, resolution in cursor: t = ticket_realm(id=tid) @@ -228,7 +216,7 @@ ': ', ticketsystem.format_summary(summary, status, resolution, type)), - datetime.fromtimestamp(ts, utc), author, + from_utimestamp(ts), author, shorten_result(desc, terms)) # Attachments @@ -245,16 +233,18 @@ yield ('ticket_details', _('Ticket updates'), False) def get_timeline_events(self, req, start, stop, filters): - ts_start = to_timestamp(start) - ts_stop = to_timestamp(stop) + ts_start = to_utimestamp(start) + ts_stop = to_utimestamp(stop) - status_map = {'new': ('newticket', 'created'), - 'reopened': ('reopenedticket', 'reopened'), - 'closed': ('closedticket', 'closed'), - 'edit': ('editedticket', 'updated')} + status_map = {'new': ('newticket', N_('created')), + 'reopened': ('reopenedticket', N_('reopened')), + 'closed': ('closedticket', N_('closed')), + 'edit': ('editedticket', N_('updated'))} ticket_realm = Resource('ticket') + field_labels = TicketSystem(self.env).get_ticket_field_labels() + def produce_event((id, ts, author, type, summary, description), status, fields, comment, cid): ticket = ticket_realm(id=id) @@ -265,9 +255,11 @@ if status == 'edit': if 'ticket_details' in filters: if len(fields) > 0: - keys = fields.keys() - info = tag([[tag.i(f), ', '] for f in keys[:-1]], - tag.i(keys[-1]), ' changed', tag.br()) + labels = [tag.i(field_labels.get(k, k.capitalize())) + for k in fields.keys()] + info = tagn_('%(labels)s changed', + '%(labels)s changed', len(labels), + labels=separated(labels, ', ')) + tag.br() else: return None elif 'ticket' in filters: @@ -278,7 +270,7 @@ else: return None kind, verb = status_map[status] - return (kind, datetime.fromtimestamp(ts, utc), author, + return (kind, from_utimestamp(ts), author, (ticket, verb, info, summary, status, resolution, type, description, comment, cid)) @@ -287,42 +279,43 @@ if 'ticket' in filters or 'ticket_details' in filters: cursor = db.cursor() - cursor.execute("SELECT t.id,tc.time,tc.author,t.type,t.summary, " - " tc.field,tc.oldvalue,tc.newvalue " - " FROM ticket_change tc " - " INNER JOIN ticket t ON t.id = tc.ticket " - " AND tc.time>=%s AND tc.time<=%s " - "ORDER BY tc.time" - % (ts_start, ts_stop)) - previous_update = None + cursor.execute(""" + SELECT t.id,tc.time,tc.author,t.type,t.summary, + tc.field,tc.oldvalue,tc.newvalue + FROM ticket_change tc + INNER JOIN ticket t ON t.id = tc.ticket + AND tc.time>=%s AND tc.time<=%s + ORDER BY tc.time + """ % (ts_start, ts_stop)) + data = None for id,t,author,type,summary,field,oldvalue,newvalue in cursor: - if not previous_update or (id,t,author) != previous_update[:3]: - if previous_update: - ev = produce_event(previous_update, status, fields, - comment, cid) + if not data or (id, t) != data[:2]: + if data: + ev = produce_event(data, status, fields, comment, cid) if ev: yield ev status, fields, comment, cid = 'edit', {}, '', None - previous_update = (id, t, author, type, summary, None) + data = (id, t, author, type, summary, None) if field == 'comment': comment = newvalue cid = oldvalue and oldvalue.split('.')[-1] + # Always use the author from the comment field + data = data[:2] + (author,) + data[3:] elif field == 'status' and newvalue in ('reopened', 'closed'): status = newvalue - else: + elif field[0] != '_': # properties like _comment{n} are hidden fields[field] = newvalue - if previous_update: - ev = produce_event(previous_update, status, fields, - comment, cid) + if data: + ev = produce_event(data, status, fields, comment, cid) if ev: yield ev # New tickets if 'ticket' in filters: - cursor.execute("SELECT id,time,reporter,type,summary," - "description" - " FROM ticket WHERE time>=%s AND time<=%s", - (ts_start, ts_stop)) + cursor.execute(""" + SELECT id,time,reporter,type,summary,description + FROM ticket WHERE time>=%s AND time<=%s + """, (ts_start, ts_stop)) for row in cursor: ev = produce_event(row, 'new', {}, None, None) if ev: @@ -345,8 +338,9 @@ elif field == 'title': title = TicketSystem(self.env).format_summary(summary, status, resolution, type) - return tag('Ticket ', tag.em('#', ticket.id, title=title), - ' (', shorten_line(summary), ') ', verb) + return tag_('Ticket %(ticketref)s (%(summary)s) %(verb)s', + ticketref=tag.em('#', ticket.id, title=title), + summary=shorten_line(summary), verb=gettext(verb)) elif field == 'description': descr = message = '' if status == 'new': @@ -368,7 +362,7 @@ def _get_action_controllers(self, req, ticket, action): """Generator yielding the controllers handling the given `action`""" for controller in TicketSystem(self.env).action_controllers: - actions = [a for w,a in + actions = [a for w, a in controller.get_ticket_actions(req, ticket)] if action in actions: yield controller @@ -439,6 +433,8 @@ data['fields'] = fields add_stylesheet(req, 'common/css/ticket.css') + add_script(req, 'common/js/folding.js') + Chrome(self.env).add_wiki_toolbars(req) return 'ticket.html', data, None def _process_ticket_request(self, req): @@ -456,8 +452,6 @@ 'view')) data = self._prepare_data(req, ticket) - data['comment'] = None - if action in ('history', 'diff'): field = req.args.get('field') @@ -470,13 +464,39 @@ return self._render_history(req, ticket, data, text_fields) elif action == 'diff': return self._render_diff(req, ticket, data, text_fields) + elif action == 'comment-history': + cnum = int(req.args['cnum']) + return self._render_comment_history(req, ticket, data, cnum) + elif action == 'comment-diff': + cnum = int(req.args['cnum']) + return self._render_comment_diff(req, ticket, data, cnum) + elif 'preview_comment' in req.args: + field_changes = {} + data.update({'action': None, + 'reassign_owner': req.authname, + 'resolve_resolution': None, + 'timestamp': str(ticket['changetime'])}) elif req.method == 'POST': # 'Preview' or 'Submit' + if 'cancel_comment' in req.args: + req.redirect(req.href.ticket(ticket.id)) + elif 'edit_comment' in req.args: + comment = req.args.get('edited_comment', '') + cnum = int(req.args['cnum_edit']) + change = ticket.get_change(cnum) + if not (req.authname and req.authname != 'anonymous' + and change and change['author'] == req.authname): + req.perm(ticket.resource).require('TICKET_EDIT_COMMENT') + ticket.modify_comment(change['date'], req.authname, comment) + req.redirect(req.href.ticket(ticket.id) + '#comment:%d' % cnum) + + valid = True + # Do any action on the ticket? - actions = TicketSystem(self.env).get_available_actions( - req, ticket) + actions = TicketSystem(self.env).get_available_actions(req, ticket) if action not in actions: - raise TracError(_('Invalid action "%(name)s"', name=action)) - # (this should never happen in normal situations) + valid = False + add_warning(req, _('The action "%(name)s" is not available.', + name=action)) # We have a bit of a problem. There are two sources of changes to # the ticket: the user, and the workflow. We need to show all the @@ -492,13 +512,16 @@ field_changes, problems = self.get_ticket_changes(req, ticket, action) if problems: + valid = False for problem in problems: add_warning(req, problem) add_warning(req, - tag(tag.p('Please review your configuration, ' - 'probably starting with'), - tag.pre('[trac]\nworkflow = ...\n'), - tag.p('in your ', tag.tt('trac.ini'), '.'))) + tag_('Please review your configuration, ' + 'probably starting with %(section)s ' + 'in your %(tracini)s.', + section = tag.pre('[ticket]', tag.br(), + 'workflow = ...'), + tracini = tag.tt('trac.ini'))) # Apply changes made by the workflow self._apply_ticket_changes(ticket, field_changes) @@ -506,7 +529,7 @@ # information any and all problems. But it's only valid if it # validates and there were no problems with the workflow side of # things. - valid = self._validate_ticket(req, ticket) and not problems + valid = self._validate_ticket(req, ticket, not valid) and valid if 'preview' not in req.args: if valid: # redirected if successful @@ -521,16 +544,21 @@ 'reassign_owner': (req.args.get('reassign_choice') or req.authname), 'resolve_resolution': req.args.get('resolve_choice'), - 'comment': req.args.get('comment'), 'valid': valid }) else: # simply 'View'ing the ticket - field_changes = None + field_changes = {} data.update({'action': None, 'reassign_owner': req.authname, 'resolve_resolution': None, # Store a timestamp for detecting "mid air collisions" - 'timestamp': str(ticket.time_changed)}) + 'timestamp': str(ticket['changetime'])}) + + data.update({'comment': req.args.get('comment'), + 'cnum_edit': req.args.get('cnum_edit'), + 'edited_comment': req.args.get('edited_comment'), + 'cnum_hist': req.args.get('cnum_hist'), + 'cversion': req.args.get('cversion')}) self._insert_ticket_data(req, ticket, data, get_reporter_id(req, 'author'), field_changes) @@ -586,6 +614,9 @@ break add_stylesheet(req, 'common/css/ticket.css') + add_script(req, 'common/js/folding.js') + Chrome(self.env).add_wiki_toolbars(req) + Chrome(self.env).add_auto_preview(req) # Add registered converters for conversion in mime.get_supported_conversions('trac.ticket.Ticket'): @@ -595,7 +626,8 @@ add_link(req, 'alternate', conversion_href, conversion[1], conversion[4], format) - prevnext_nav(req, _('Ticket'), _('Back to Query')) + prevnext_nav(req, _('Previous Ticket'), _('Next Ticket'), + _('Back to Query')) return 'ticket.html', data, None @@ -674,14 +706,15 @@ history = [c for c in history if any([f in text_fields for f in c['fields']])] history.append({'version': 0, 'comment': "''Initial version''", - 'date': ticket.time_created, + 'date': ticket['time'], 'author': ticket['reporter'] # not 100% accurate... }) data.update({'title': _('Ticket History'), 'resource': ticket.resource, 'history': history}) - add_ctxtnav(req, 'Back to Ticket #%s'%ticket.id, req.href.ticket(ticket.id)) + add_ctxtnav(req, _('Back to Ticket #%(num)s', num=ticket.id), + req.href.ticket(ticket.id)) return 'history_view.html', data, None def _render_diff(self, req, ticket, data, text_fields): @@ -754,13 +787,16 @@ new_ticket = dict(old_ticket) replay_changes(new_ticket, old_ticket, old_version+1, new_version) + field_labels = TicketSystem(self.env).get_ticket_field_labels() + changes = [] def version_info(t, field=None): path = 'Ticket #%s' % ticket.id # TODO: field info should probably be part of the Resource as well if field: - path = tag(path, Markup(' – '), field) + path = tag(path, Markup(' – '), + field_labels.get(field, field.capitalize())) if t.version: rev = _('Version %(num)s', num=t.version) shortrev = 'v%d' % t.version @@ -775,13 +811,14 @@ if k not in text_fields: old, new = old_ticket[k], new_ticket[k] if old != new: - prop = {'name': k, - 'old': {'name': k, 'value': old}, - 'new': {'name': k, 'value': new}} + label = field_labels.get(k, k.capitalize()) + prop = {'name': label, + 'old': {'name': label, 'value': old}, + 'new': {'name': label, 'value': new}} rendered = self._render_property_diff(req, ticket, k, old, new, tnew) if rendered: - prop['diff'] = tag.li('Property ', tag.strong(k), + prop['diff'] = tag.li('Property ', tag.strong(label), ' ', rendered) props.append(prop) changes.append({'props': props, 'diffs': [], @@ -820,14 +857,15 @@ _('Version %(num)s', num=prev_version)) add_link(req, 'up', get_resource_url(self.env, ticket.resource, req.href, action='history'), - 'Ticket History') + _('Ticket History')) if next_version: add_link(req, 'next', get_resource_url(self.env, ticket.resource, req.href, action='diff', version=next_version), _('Version %(num)s', num=next_version)) - prevnext_nav(req, _('Change'), _('Ticket History')) + prevnext_nav(req, _('Previous Change'), _('Next Change'), + _('Ticket History')) add_stylesheet(req, 'common/css/diff.css') add_script(req, 'common/js/diff.js') @@ -843,20 +881,157 @@ return 'diff_view.html', data, None + def _make_comment_url(self, req, ticket, cnum, version=None): + return req.href.ticket(ticket.id, + cnum_hist=version is not None and cnum or None, + cversion=version) + '#comment:%d' % cnum + + def _get_comment_history(self, req, ticket, cnum): + history = [] + for version, date, author, comment in ticket.get_comment_history(cnum): + history.append({ + 'version': version, 'date': date, 'author': author, + 'comment': version == 0 and "''Initial version''" or '', + 'value': comment, + 'url': self._make_comment_url(req, ticket, cnum, version) + }) + return history + + def _render_comment_history(self, req, ticket, data, cnum): + """Extract the history for a ticket comment.""" + req.perm(ticket.resource).require('TICKET_VIEW') + history = self._get_comment_history(req, ticket, cnum) + history.reverse() + url = self._make_comment_url(req, ticket, cnum) + data.update({ + 'title': _('Ticket Comment History'), + 'resource': ticket.resource, + 'name': _('Ticket #%(num)s, comment %(cnum)d', + num=ticket.id, cnum=cnum), + 'url': url, + 'diff_action': 'comment-diff', 'diff_args': [('cnum', cnum)], + 'history': history, + }) + add_ctxtnav(req, _('Back to Ticket #%(num)s', num=ticket.id), url) + return 'history_view.html', data, None + + def _render_comment_diff(self, req, ticket, data, cnum): + """Show differences between two versions of a ticket comment.""" + req.perm(ticket).require('TICKET_VIEW') + new_version = int(req.args.get('version', 1)) + old_version = int(req.args.get('old_version', new_version)) + if old_version > new_version: + old_version, new_version = new_version, old_version + elif old_version == new_version: + old_version = new_version - 1 + + history = {} + for change in self._get_comment_history(req, ticket, cnum): + history[change['version']] = change + + def version_info(version): + path = _('Ticket #%(num)s, comment %(cnum)d', + num=ticket.id, cnum=cnum) + if version: + rev = _('Version %(num)s', num=version) + shortrev = 'v%d' % version + else: + rev, shortrev = _('Initial Version'), _('initial') + return {'path': path, 'rev': rev, 'shortrev': shortrev} + + diff_style, diff_options, diff_data = get_diff_options(req) + diff_context = 3 + for option in diff_options: + if option.startswith('-U'): + diff_context = int(option[2:]) + break + if diff_context < 0: + diff_context = None + + def get_text(version): + try: + text = history[version]['value'] + return text and text.splitlines() or [] + except KeyError: + raise ResourceNotFound(_('No version %(version)d for comment ' + '%(cnum)d on ticket #%(ticket)s', + version=version, cnum=cnum, + ticket=ticket.id)) + + old_text = get_text(old_version) + new_text = get_text(new_version) + diffs = diff_blocks(old_text, new_text, context=diff_context, + ignore_blank_lines='-B' in diff_options, + ignore_case='-i' in diff_options, + ignore_space_changes='-b' in diff_options) + + changes = [{'diffs': diffs, 'props': [], + 'new': version_info(new_version), + 'old': version_info(old_version)}] + + # -- prev/up/next links + prev_version = old_version + next_version = None + if new_version < len(history) - 1: + next_version = new_version + 1 + + if prev_version: + url = req.href.ticket(ticket.id, cnum=cnum, action='comment-diff', + version=prev_version) + add_link(req, 'prev', url, _('Version %(num)s', num=prev_version)) + add_link(req, 'up', req.href.ticket(ticket.id, cnum=cnum, + action='comment-history'), + _('Ticket Comment History')) + if next_version: + url = req.href.ticket(ticket.id, cnum=cnum, action='comment-diff', + version=next_version) + add_link(req, 'next', url, _('Version %(num)s', num=next_version)) + + prevnext_nav(req, _('Previous Change'), _('Next Change'), + _('Ticket Comment History')) + add_stylesheet(req, 'common/css/diff.css') + add_script(req, 'common/js/diff.js') + + data.update({ + 'title': _('Ticket Comment Diff'), + 'resource': ticket.resource, + 'name': _('Ticket #%(num)s, comment %(cnum)d', + num=ticket.id, cnum=cnum), + 'url': self._make_comment_url(req, ticket, cnum), + 'old_url': self._make_comment_url(req, ticket, cnum, old_version), + 'new_url': self._make_comment_url(req, ticket, cnum, new_version), + 'diff_url': req.href.ticket(ticket.id, cnum=cnum, + action='comment-diff', + version=new_version), + 'diff_action': 'comment-diff', 'diff_args': [('cnum', cnum)], + 'old_version': old_version, 'new_version': new_version, + 'changes': changes, 'diff': diff_data, + 'num_changes': new_version - old_version, + 'change': history[new_version], + 'ticket': ticket, 'cnum': cnum, + 'longcol': '', 'shortcol': '' + }) + + return 'diff_view.html', data, None + def export_csv(self, req, ticket, sep=',', mimetype='text/plain'): # FIXME: consider dumping history of changes here as well # as one row of output doesn't seem to be terribly useful... + fields = [f for f in ticket.fields + if f['name'] not in ('time', 'changetime')] content = StringIO() writer = csv.writer(content, delimiter=sep, quoting=csv.QUOTE_MINIMAL) - writer.writerow(['id'] + [unicode(f['name']) for f in ticket.fields]) + writer.writerow(['id'] + [unicode(f['name']) for f in fields]) context = Context.from_request(req, ticket.resource) cols = [unicode(ticket.id)] - for f in ticket.fields: + for f in fields: name = f['name'] value = ticket.values.get(name, '') if name in ('cc', 'reporter'): value = Chrome(self.env).format_emails(context, value, ' ') + elif name in ticket.time_fields: + value = format_datetime(value, tzinfo=req.tz) cols.append(value.encode('utf-8')) writer.writerow(cols) return (content.getvalue(), '%s;charset=utf-8' % mimetype) @@ -893,7 +1068,7 @@ # Ticket validation and changes - def _validate_ticket(self, req, ticket): + def _validate_ticket(self, req, ticket, force_collision_check=False): valid = True resource = ticket.resource @@ -928,8 +1103,8 @@ valid = False # Mid air collision? - if ticket.exists and (ticket._old or comment): - if req.args.get('ts') != str(ticket.time_changed): + if ticket.exists and (ticket._old or comment or force_collision_check): + if req.args.get('ts') != str(ticket['changetime']): add_warning(req, _("Sorry, can not save your changes. " "This ticket has been modified by someone else " "since you started")) @@ -1006,12 +1181,20 @@ except Exception, e: self.log.error("Failure sending notification on creation of " "ticket #%s: %s", ticket.id, exception_to_unicode(e)) + add_warning(req, _('The ticket has been created, but an error ' + 'occurred while sending notifications: ' + '%(message)s', message=to_unicode(e))) # Redirect the user to the newly created ticket or add attachment if 'attachment' in req.args: req.redirect(req.href.attachment('ticket', ticket.id, action='new')) if 'TICKET_VIEW' not in req.perm('ticket', ticket.id): + ticket_href = req.href.ticket(ticket.id) + add_notice(req, tag_("Your ticket %(ticketref)s has been created, " + "but you don't have permission to view it.", + ticketref=tag.a('#', ticket.id, + href=ticket_href))) req.redirect(req.href.newticket()) req.redirect(req.href.ticket(ticket.id)) @@ -1028,16 +1211,27 @@ # -- Save changes + fragment = '' now = datetime.now(utc) if ticket.save_changes(get_reporter_id(req, 'author'), req.args.get('comment'), when=now, cnum=internal_cnum): + fragment = cnum and '#comment:' + cnum or '' try: tn = TicketNotifyEmail(self.env) tn.notify(ticket, newticket=False, modtime=now) except Exception, e: self.log.error("Failure sending notification on change to " "ticket #%s: %s", ticket.id, exception_to_unicode(e)) + # TRANSLATOR: The 'change' has been saved... (link) + change = _('change') + if fragment: + change = tag.a(change, href=fragment) + add_warning(req, tag_('The %(change)s has been saved, but an ' + 'error occurred while sending ' + 'notifications: %(message)s', + change=change, message=to_unicode(e))) + fragment = '' # After saving the changes, apply the side-effects. for controller in controllers: @@ -1045,7 +1239,6 @@ controller.__class__.__name__) controller.apply_action_side_effects(req, ticket, action) - fragment = cnum and '#comment:'+cnum or '' req.redirect(req.href.ticket(ticket.id) + fragment) def get_ticket_changes(self, req, ticket, selected_action): @@ -1054,13 +1247,15 @@ The field changes are represented as: `{field: {'old': oldvalue, 'new': newvalue, 'by': what}, ...}` """ - # Start with user changes + field_labels = TicketSystem(self.env).get_ticket_field_labels() field_changes = {} + def store_change(field, old, new, author): + field_changes[field] = {'old': old, 'new': new, 'by': author, + 'label': field_labels.get(field, field)} + # Start with user changes for field, value in ticket._old.iteritems(): - field_changes[field] = {'old': value, - 'new': ticket[field], - 'by':'user'} - + store_change(field, value, ticket[field], 'user') + # Apply controller changes corresponding to the selected action problems = [] for controller in self._get_action_controllers(req, ticket, @@ -1079,7 +1274,7 @@ problems.append('%s changed "%s" to "%s", ' 'but %s changed it to "%s".' % (cname, key, new, last_by, last_new)) - field_changes[key] = {'old': old, 'new': new, 'by': cname} + store_change(key, old, new, cname) # Detect non-changes for key, item in field_changes.items(): @@ -1093,6 +1288,31 @@ for key in field_changes: ticket[key] = field_changes[key]['new'] + def _query_link(self, req, name, value, text=None): + """Return a link to /query with the appropriate name and value""" + default_query = self.ticketlink_query.startswith('?') and \ + self.ticketlink_query[1:] or self.ticketlink_query + args = arg_list_to_args(parse_arg_list(default_query)) + args[name] = value + return tag.a(text or value, href=req.href.query(args)) + + def _query_link_words(self, req, name, value): + """Splits a list of words and makes a query link to each separately""" + if not isinstance(value, basestring): # None or other non-splitable + return value + default_query = self.ticketlink_query.startswith('?') and \ + self.ticketlink_query[1:] or self.ticketlink_query + args = arg_list_to_args(parse_arg_list(default_query)) + items = [] + for (i, word) in enumerate(re.split(r'(\s*(?:\s|[,;])\s*)', value)): + if i % 2: + items.append(word) + elif word: + word_args = args.copy() + word_args[name] = '~' + word + items.append(tag.a(word, href=req.href.query(word_args))) + return tag(items) + def _prepare_fields(self, req, ticket): context = Context.from_request(req, ticket.resource) fields = [] @@ -1101,16 +1321,20 @@ name = field['name'] type_ = field['type'] + # enable a link to custom query for all choice fields + if type_ not in ['text', 'textarea']: + field['rendered'] = self._query_link(req, name, ticket[name]) + # per field settings if name in ('summary', 'reporter', 'description', 'status', - 'resolution'): + 'resolution', 'time', 'changetime'): field['skip'] = True elif name == 'owner': TicketSystem(self.env).eventually_restrict_owner(field, ticket) type_ = field['type'] field['skip'] = True if not ticket.exists: - field['label'] = 'Assign to' + field['label'] = _('Owner') if 'TICKET_MODIFY' in req.perm(ticket.resource): field['skip'] = False owner_field = field @@ -1128,9 +1352,13 @@ milestone = Resource('milestone', ticket[name]) field['rendered'] = render_resource_link(self.env, context, milestone, 'compact') + elif name == 'keywords': + field['rendered'] = self._query_link_words( + req, name, ticket[name]) elif name == 'cc': emails = Chrome(self.env).format_emails(context, ticket[name]) - field['rendered'] = emails + field['rendered'] = emails == ticket[name] and \ + self._query_link_words(req, name, emails) or emails if ticket.exists and \ 'TICKET_EDIT_CC' not in req.perm(ticket.resource): cc = ticket._old.get('cc', ticket['cc']) @@ -1159,7 +1387,8 @@ elif type_ == 'checkbox': value = ticket.values.get(name) if value in ('1', '0'): - field['rendered'] = value == '1' and _('yes') or _('no') + field['rendered'] = self._query_link(req, name, value, + value == '1' and _('yes') or _('no')) elif type_ == 'text': if field.get('format') == 'wiki': field['rendered'] = format_to_oneliner(self.env, context, @@ -1274,27 +1503,31 @@ selected_action = action_controls[0][0] # Insert change preview - change_preview = None + change_preview = { + 'date': datetime.now(utc), + 'author': author_id, + 'fields': field_changes, + 'preview': True, + 'comment': req.args.get('comment', data.get('comment')), + } + replyto = req.args.get('replyto') + if replyto: + change_preview['replyto'] = replyto if req.method == 'POST': self._apply_ticket_changes(ticket, field_changes) self._render_property_changes(req, ticket, field_changes) - change_preview = { - 'date': datetime.now(utc), - 'author': author_id, - 'fields': field_changes, - 'preview': True, - } - comment = req.args.get('comment') - if comment: - change_preview['comment'] = comment - replyto = req.args.get('replyto') - if replyto: - change_preview['replyto'] = replyto if ticket.resource.version is not None: ### FIXME ticket.values.update(values) context = Context.from_request(req, ticket.resource) + + # Display the owner and reporter links when not obfuscated + chrome = Chrome(self.env) + for user in 'reporter', 'owner': + if chrome.format_author(req, ticket[user]) == ticket[user]: + data['%s_link' % user] = self._query_link(req, user, + ticket[user]) data.update({ 'context': context, 'fields': fields, 'changes': changes, @@ -1302,7 +1535,7 @@ 'attachments': AttachmentModule(self.env).attachment_data(context), 'action_controls': action_controls, 'action': selected_action, - 'change_preview': change_preview + 'change_preview': change_preview, }) def rendered_changelog_entries(self, req, ticket, when=None): @@ -1341,14 +1574,16 @@ type_ = f['type'] break if type_ == 'checkbox': - rendered = new == '1' and "set" or "unset" + rendered = new == '1' and _('set') or _('unset') elif type_ == 'textarea': if not resource_new: rendered = _('modified') else: href = get_resource_url(self.env, resource_new, req.href, action='diff') - rendered = tag('modified (', tag.a('diff', href=href), ')') + # TRANSLATOR: modified ('diff') (link) + diff = tag.a(_('diff'), href=href) + rendered = tag_('modified (%(diff)s)', diff=diff) # per name special rendering of diffs old_list, new_list = None, None @@ -1361,15 +1596,17 @@ 'EMAIL_VIEW' in req.perm(resource_new or ticket.resource)): render_elt = obfuscate_email_address elif field == 'keywords': - old_list, new_list = (old or '').split(), new.split() + old_list, new_list = old.split(), new.split() sep = ' ' if (old_list, new_list) != (None, None): added = [tag.em(render_elt(x)) for x in new_list if x not in old_list] remvd = [tag.em(render_elt(x)) for x in old_list if x not in new_list] - added = added and tag(separated(added, sep), " added") - remvd = remvd and tag(separated(remvd, sep), " removed") + added = added and tagn_('%(items)s added', '%(items)s added', + len(added), items=separated(added, sep)) + remvd = remvd and tagn_('%(items)s removed', '%(items)s removed', + len(remvd), items=separated(remvd, sep)) if added or remvd: rendered = tag(added, added and remvd and '; ', remvd) if field in ('reporter', 'owner'): @@ -1378,43 +1615,62 @@ old = obfuscate_email_address(old) new = obfuscate_email_address(new) if old and not new: - rendered = tag(tag.em(old), " deleted") + rendered = tag_('%(value)s deleted', value=tag.em(old)) elif new and not old: - rendered = tag("set to ", tag.em(new)) + rendered = tag_('set to %(value)s', value=tag.em(new)) elif old and new: - rendered = tag("changed from ", tag.em(old), - " to ", tag.em(new)) + rendered = tag_('changed from %(old)s to %(new)s', + old=tag.em(old), new=tag.em(new)) return rendered def grouped_changelog_entries(self, ticket, db, when=None): """Iterate on changelog entries, consolidating related changes in a `dict` object. """ + field_labels = TicketSystem(self.env).get_ticket_field_labels() changelog = ticket.get_changelog(when=when, db=db) autonum = 0 # used for "root" numbers last_uid = current = None for date, author, field, old, new, permanent in changelog: - uid = date, author, permanent + uid = permanent and (date,) or (date, author) if uid != last_uid: if current: + last_comment = comment_history[max(comment_history)] + last_comment['comment'] = current['comment'] yield current last_uid = uid - current = {'date': date, 'author': author, 'fields': {}, - 'permanent': permanent, 'comment': ''} + comment_history = {0: {'date': date}} + current = {'date': date, 'fields': {}, + 'permanent': permanent, 'comment': '', + 'comment_history': comment_history} if permanent and not when: autonum += 1 current['cnum'] = autonum # some common processing for fields + if not field.startswith('_'): + current.setdefault('author', author) + comment_history[0].setdefault('author', author) if field == 'comment': current['comment'] = new + # Always take the author from the comment field if available + current['author'] = comment_history[0]['author'] = author if old: if '.' in old: # retrieve parent.child relationship parent_num, this_num = old.split('.', 1) current['replyto'] = parent_num else: this_num = old - current['cnum'] = int(this_num) - elif old or new: - current['fields'][field] = {'old': old, 'new': new} + current['cnum'] = autonum = int(this_num) + elif field.startswith('_comment'): # Comment edits + rev = int(field[8:]) + comment_history.setdefault(rev, {}).update({'comment': old}) + comment_history.setdefault(rev + 1, {}).update( + {'author': author, 'date': from_utimestamp(long(new))}) + elif (old or new) and old != new: + current['fields'][field] = { + 'old': old, 'new': new, + 'label': field_labels.get(field, field)} if current: + last_comment = comment_history[max(comment_history)] + last_comment['comment'] = current['comment'] yield current diff -Nru trac-0.11.7/trac/timeline/api.py trac-0.12.1~ppa2/trac/timeline/api.py --- trac-0.11.7/trac/timeline/api.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/timeline/api.py 2009-10-29 18:37:45.000000000 +0000 @@ -17,12 +17,7 @@ # Author: Jonas Borgström # Christopher Lenz -from urlparse import urljoin - from trac.core import * -from trac.resource import get_resource_url -from trac.util.datefmt import to_timestamp -from trac.web.href import Href class ITimelineEventProvider(Interface): diff -Nru trac-0.11.7/trac/timeline/templates/timeline.html trac-0.12.1~ppa2/trac/timeline/templates/timeline.html --- trac-0.11.7/trac/timeline/templates/timeline.html 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/timeline/templates/timeline.html 2010-04-20 22:27:20.000000000 +0100 @@ -3,9 +3,9 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:i18n="http://genshi.edgewall.org/i18n"> - Timeline @@ -16,9 +16,10 @@

Timeline

View changes from
- and days back. + and days back
+ done by

@@ -27,19 +28,24 @@

- +

${day}: ${day == today and 'Today' or day == yesterday and 'Yesterday' or None}

${day}: ${day == today and _("Today") or day == yesterday and _("Yesterday") or None}

- - ${format_time(event.date, str('%H:%M'))} ${event.render('title', context)} - by ${format_author(event.author)} + + + ${format_time(event.date, str('%H:%M'))} ${event.render('title', context)} + by ${format_author(event.author)} + + + ${format_time(event.date, str('%H:%M'))} ${event.render('title', context)} +: @@ -49,7 +55,7 @@

Note: See TracTimeline for information about the timeline view.

diff -Nru trac-0.11.7/trac/timeline/templates/timeline.rss trac-0.12.1~ppa2/trac/timeline/templates/timeline.rss --- trac-0.11.7/trac/timeline/templates/timeline.rss 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/timeline/templates/timeline.rss 2010-02-24 01:25:29.000000000 +0000 @@ -2,12 +2,13 @@ - ${project.name} ${abs_href.timeline()} Trac Timeline - en-US + ${req.locale and \ + '%s-%s' % (req.locale.language, req.locale.territory) or \ + 'en-US'} Trac ${trac.version} ${project.name} @@ -20,7 +21,7 @@ plaintext(event.render('summary', context) or event.render('title', context), keeplinebreaks=False) } - ${author_or_creator(event.author, email_map)} + ${http_date(event.date)} ${abs_url} diff -Nru trac-0.11.7/trac/timeline/tests/functional.py trac-0.12.1~ppa2/trac/timeline/tests/functional.py --- trac-0.11.7/trac/timeline/tests/functional.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/timeline/tests/functional.py 2010-05-01 17:01:31.000000000 +0100 @@ -1,6 +1,4 @@ #!/usr/bin/python -import sys -from subprocess import call from trac.tests.functional import * @@ -17,7 +15,7 @@ self._tester.create_wiki_page(pagename) self._tester.go_to_timeline() tc.find(pagename) - tc.notfind(pagename + '.*\$diff\$') + tc.notfind(pagename + '.*diff\\)') self._tester.go_to_wiki(pagename) tc.formvalue('modifypage', 'action', 'edit') tc.submit() @@ -26,7 +24,7 @@ tc.formvalue('edit', 'comment', random_sentence()) tc.submit('save') self._tester.go_to_timeline() - tc.find(pagename + '.*\$diff\$') + tc.find(pagename + '.*diff\\)') def functionalSuite(suite=None): diff -Nru trac-0.11.7/trac/timeline/web_ui.py trac-0.12.1~ppa2/trac/timeline/web_ui.py --- trac-0.11.7/trac/timeline/web_ui.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/timeline/web_ui.py 2010-04-25 00:48:26.000000000 +0100 @@ -20,8 +20,6 @@ from datetime import datetime, timedelta import pkg_resources import re -import time -from urlparse import urlparse from genshi.builder import tag @@ -30,11 +28,10 @@ from trac.mimeview import Context from trac.perm import IPermissionRequestor from trac.timeline.api import ITimelineEventProvider -from trac.util.compat import sorted from trac.util.datefmt import format_date, format_datetime, parse_date, \ - to_timestamp, utc, pretty_timedelta + to_utimestamp, utc, pretty_timedelta from trac.util.text import exception_to_unicode, to_unicode -from trac.util.translation import _ +from trac.util.translation import _, tag_ from trac.web import IRequestHandler, IRequestFilter from trac.web.chrome import add_link, add_stylesheet, prevnext_nav, Chrome, \ INavigationContributor, ITemplateProvider @@ -65,6 +62,8 @@ specific event providers, see their own documentation. (''Since 0.11'')""") + _authors_pattern = re.compile(r'(-)?(?:"([^"]*)"|\'([^\']*)\'|([^\s]+))') + # INavigationContributor methods def get_active_navigation_item(self, req): @@ -107,7 +106,8 @@ precision = timedelta(hours=1) else: precision = None - fromdate = fromdate.replace(hour=23, minute=59, second=59) + fromdate = fromdate.replace(hour=23, minute=59, second=59, + microsecond=999999) try: daysback = int(req.args.get('daysback', '')) except ValueError: @@ -118,8 +118,12 @@ daysback = max(0, daysback) if self.max_daysback >= 0: daysback = min(self.max_daysback, daysback) + authors = req.args.get('authors', + req.session.get('timeline.authors', '')) + authors = authors.strip() data = {'fromdate': fromdate, 'daysback': daysback, + 'authors': authors, 'today': format_date(today), 'yesterday': format_date(today - timedelta(days=1)), 'precisedate': precisedate, 'precision': precision, @@ -152,13 +156,27 @@ stop = fromdate start = stop - timedelta(days=daysback + 1) + # create author include and exclude sets + include = set() + exclude = set() + for match in self._authors_pattern.finditer(authors): + name = (match.group(2) or match.group(3) or match.group(4)).lower() + if match.group(1): + exclude.add(name) + else: + include.add(name) + # gather all events for the given period of time events = [] for provider in self.event_providers: try: for event in provider.get_timeline_events(req, start, stop, filters): - events.append(self._event_data(provider, event)) + # Check for 0.10 events + author = (event[len(event) < 6 and 2 or 4] or '').lower() + if (not include or author in include) \ + and not author in exclude: + events.append(self._event_data(provider, event)) except Exception, e: # cope with a failure of that provider self._provider_failure(e, req, provider, filters, [f[0] for f in available_filters]) @@ -185,6 +203,7 @@ return 'timeline.rss', data, 'application/rss+xml' else: req.session['timeline.daysback'] = daysback + req.session['timeline.authors'] = authors html_context = Context.from_request(req) html_context.set_hints(wiki_flavor='oneliner', shorten_lines=self.abbreviated_messages) @@ -192,7 +211,8 @@ add_stylesheet(req, 'common/css/timeline.css') rss_href = req.href.timeline([(f, 'on') for f in filters], - daysback=90, max=50, format='rss') + daysback=90, max=50, authors=authors, + format='rss') add_link(req, 'alternate', rss_href, _('RSS Feed'), 'application/rss+xml', 'rss') @@ -204,15 +224,17 @@ previous_start = format_date(fromdate - timedelta(days=daysback+1), format='%Y-%m-%d', tzinfo=req.tz) add_link(req, 'prev', req.href.timeline(from_=previous_start, + authors=authors, daysback=daysback), - _('Previous period')) + _('Previous Period')) if today - fromdate > timedelta(days=0): next_start = format_date(fromdate + timedelta(days=daysback+1), format='%Y-%m-%d', tzinfo=req.tz) add_link(req, 'next', req.href.timeline(from_=next_start, + authors=authors, daysback=daysback), - _('Next period')) - prevnext_nav(req, 'Period') + _('Next Period')) + prevnext_nav(req, _('Previous Period'), _('Next Period')) return 'timeline.html', data, None @@ -292,11 +314,9 @@ kind, date, author, data = event render = lambda field, context: \ provider.render_timeline_event(context, field, event) - if isinstance(date, datetime): - dateuid = to_timestamp(date) - else: - dateuid = date + if not isinstance(date, datetime): date = datetime.fromtimestamp(date, utc) + dateuid = to_utimestamp(date) return {'kind': kind, 'author': author, 'date': date, 'dateuid': dateuid, 'render': render, 'event': event, 'data': data, 'provider': provider} @@ -307,21 +327,28 @@ At the same time, the message will contain a link to the timeline without the filters corresponding to the guilty event provider `ep`. """ - ep_name, exc_name = [i.__class__.__name__ for i in (ep, exc)] self.log.error('Timeline event provider failed: %s', exception_to_unicode(exc, traceback=True)) - guilty_filters = [f[0] for f in ep.get_timeline_filters(req)] - guilty_kinds = [f[1] for f in ep.get_timeline_filters(req)] - other_filters = [f for f in current_filters if not f in guilty_filters] + ep_kinds = dict((f[0], f[1]) for f in ep.get_timeline_filters(req)) + ep_filters = set(ep_kinds.keys()) + current_filters = set(current_filters) + other_filters = set(current_filters) - ep_filters if not other_filters: - other_filters = [f for f in all_filters if not f in guilty_filters] + other_filters = set(all_filters) - ep_filters args = [(a, req.args.get(a)) for a in ('from', 'format', 'max', 'daysback')] - href = req.href.timeline(args+[(f, 'on') for f in other_filters]) + href = req.href.timeline(args + [(f, 'on') for f in other_filters]) + # TRANSLATOR: ...want to see the 'other kinds of events' from... (link) + other_events = tag.a(_('other kinds of events'), href=href) raise TracError(tag( - tag.p(', '.join(guilty_kinds), - ' event provider (', tag.tt(ep_name), ') failed:', tag.br(), - exc_name, ': ', to_unicode(exc), class_='message'), - tag.p('You may want to see the other kind of events from the ', - tag.a('Timeline', href=href)))) + tag.p(tag_("Event provider %(name)s failed for filters " + "%(kinds)s: ", + name=tag.tt(ep.__class__.__name__), + kinds=', '.join('"%s"' % ep_kinds[f] for f in + current_filters & ep_filters)), + tag.b(exception_to_unicode(exc)), class_='message'), + tag.p(tag_("You may want to see the %(other_events)s from the " + "Timeline or notify your Trac administrator about the " + "error (detailed information was written to the log).", + other_events=other_events)))) diff -Nru trac-0.11.7/trac/upgrades/db15.py trac-0.12.1~ppa2/trac/upgrades/db15.py --- trac-0.11.7/trac/upgrades/db15.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/upgrades/db15.py 2010-02-20 02:58:38.000000000 +0000 @@ -10,7 +10,7 @@ Column('authenticated', type='int'), Column('var_name'), Column('var_value')] - db_backend, _ = DatabaseManager(env)._get_connector() + db_backend, _ = DatabaseManager(env).get_connector() for stmt in db_backend.to_sql(session_table): cursor.execute(stmt) diff -Nru trac-0.11.7/trac/upgrades/db17.py trac-0.12.1~ppa2/trac/upgrades/db17.py --- trac-0.11.7/trac/upgrades/db17.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/upgrades/db17.py 2010-02-20 02:58:38.000000000 +0000 @@ -16,7 +16,7 @@ Column('base_rev'), Index(['rev']) ] - db_connector, _ = DatabaseManager(env)._get_connector() + db_connector, _ = DatabaseManager(env).get_connector() for stmt in db_connector.to_sql(table): cursor.execute(stmt) diff -Nru trac-0.11.7/trac/upgrades/db18.py trac-0.12.1~ppa2/trac/upgrades/db18.py --- trac-0.11.7/trac/upgrades/db18.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/upgrades/db18.py 2010-02-20 02:58:38.000000000 +0000 @@ -29,7 +29,7 @@ Index(['ticket']), Index(['time'])]] - db_connector, _ = DatabaseManager(env)._get_connector() + db_connector, _ = DatabaseManager(env).get_connector() for table in tables: for stmt in db_connector.to_sql(table): cursor.execute(stmt) diff -Nru trac-0.11.7/trac/upgrades/db19.py trac-0.12.1~ppa2/trac/upgrades/db19.py --- trac-0.11.7/trac/upgrades/db19.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/upgrades/db19.py 2010-02-20 02:58:38.000000000 +0000 @@ -13,7 +13,7 @@ Column('query'), Column('description') ] - db_connector, _ = DatabaseManager(env)._get_connector() + db_connector, _ = DatabaseManager(env).get_connector() for stmt in db_connector.to_sql(table): cursor.execute(stmt) diff -Nru trac-0.11.7/trac/upgrades/db20.py trac-0.12.1~ppa2/trac/upgrades/db20.py --- trac-0.11.7/trac/upgrades/db20.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/upgrades/db20.py 2010-04-22 21:30:22.000000000 +0100 @@ -1,5 +1,3 @@ -from trac.db import Table, Column, Index, DatabaseManager -from trac.core import TracError from trac.versioncontrol.cache import CACHE_YOUNGEST_REV def do_upgrade(env, ver, cursor): @@ -8,15 +6,19 @@ Now we use the 'youngest_rev' entry in the system table to explicitly store the youngest rev in the cache. """ - db = env.get_db_cnx() - try: - repos = env.get_repository() - youngest = repos.get_youngest_rev_in_cache(db) or '' - except TracError: # no repository available - youngest = '' + youngest = '' + cursor.execute("SELECT value FROM system WHERE name='repository_dir'") + for repository_dir, in cursor: + if repository_dir.startswith('svn:'): + cursor.execute("SELECT rev FROM revision " + "ORDER BY -LENGTH(rev), rev DESC LIMIT 1") + row = cursor.fetchone() + youngest = row and row[0] or '' + else: + print 'Please perform a "repository resync" after this upgrade.' + # deleting first, for the 0.11dev and 0.10.4dev users cursor.execute("DELETE FROM system WHERE name=%s", (CACHE_YOUNGEST_REV,)) cursor.execute("INSERT INTO system (name, value) VALUES (%s, %s)", (CACHE_YOUNGEST_REV, youngest)) - diff -Nru trac-0.11.7/trac/upgrades/db22.py trac-0.12.1~ppa2/trac/upgrades/db22.py --- trac-0.11.7/trac/upgrades/db22.py 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/trac/upgrades/db22.py 2010-02-20 02:58:38.000000000 +0000 @@ -0,0 +1,11 @@ +from trac.db import Table, Column, DatabaseManager + +def do_upgrade(env, ver, cursor): + """Add the cache table.""" + table = Table('cache', key='id')[ + Column('id'), + Column('generation', type='int') + ] + db_connector, _ = DatabaseManager(env).get_connector() + for stmt in db_connector.to_sql(table): + cursor.execute(stmt) diff -Nru trac-0.11.7/trac/upgrades/db23.py trac-0.12.1~ppa2/trac/upgrades/db23.py --- trac-0.11.7/trac/upgrades/db23.py 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/trac/upgrades/db23.py 2010-03-30 08:43:35.000000000 +0100 @@ -0,0 +1,51 @@ +from trac.db import Table, Column, Index, DatabaseManager + +def do_upgrade(env, ver, cursor): + # Make changeset cache multi-repository aware + cursor.execute("CREATE TEMPORARY TABLE rev_old " + "AS SELECT * FROM revision") + cursor.execute("DROP TABLE revision") + cursor.execute("CREATE TEMPORARY TABLE nc_old " + "AS SELECT * FROM node_change") + cursor.execute("DROP TABLE node_change") + + tables = [Table('repository', key=('id', 'name'))[ + Column('id'), + Column('name'), + Column('value')], + Table('revision', key=('repos', 'rev'))[ + Column('repos'), + Column('rev', key_size=20), + Column('time', type='int'), + Column('author'), + Column('message'), + Index(['repos', 'time'])], + Table('node_change', key=('repos', 'rev', 'path', 'change_type'))[ + Column('repos', key_size=56), + Column('rev', key_size=20), + Column('path', key_size=255), + Column('node_type', size=1), + Column('change_type', size=1, key_size=2), + Column('base_path'), + Column('base_rev'), + Index(['repos', 'rev'])]] + + db_connector, _ = DatabaseManager(env)._get_connector() + for table in tables: + for stmt in db_connector.to_sql(table): + cursor.execute(stmt) + + cursor.execute("INSERT INTO revision (repos,rev,time,author,message) " + "SELECT '',rev,time,author,message FROM rev_old") + cursor.execute("DROP TABLE rev_old") + cursor.execute("INSERT INTO node_change (repos,rev,path,node_type," + "change_type,base_path,base_rev) " + "SELECT '',rev,path,node_type,change_type,base_path," + "base_rev FROM nc_old") + cursor.execute("DROP TABLE nc_old") + + cursor.execute("INSERT INTO repository (id,name,value) " + "SELECT '',name,value FROM system " + "WHERE name IN ('repository_dir', 'youngest_rev')") + cursor.execute("DELETE FROM system " + "WHERE name IN ('repository_dir', 'youngest_rev')") diff -Nru trac-0.11.7/trac/upgrades/db24.py trac-0.12.1~ppa2/trac/upgrades/db24.py --- trac-0.11.7/trac/upgrades/db24.py 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/trac/upgrades/db24.py 2010-03-30 08:43:35.000000000 +0100 @@ -0,0 +1,61 @@ +from trac.db import Table, Column, Index, DatabaseManager + +def do_upgrade(env, ver, cursor): + # Change repository key from reponame to a surrogate id + cursor.execute("SELECT id FROM repository " + "UNION SELECT repos AS id FROM revision " + "UNION SELECT repos AS id FROM node_change " + "ORDER BY id") + id_name_list = [(i + 1, name) for i, (name,) in enumerate(cursor)] + + cursor.execute("CREATE TEMPORARY TABLE repo_old " + "AS SELECT * FROM repository") + cursor.execute("DROP TABLE repository") + cursor.execute("CREATE TEMPORARY TABLE rev_old " + "AS SELECT * FROM revision") + cursor.execute("DROP TABLE revision") + cursor.execute("CREATE TEMPORARY TABLE nc_old " + "AS SELECT * FROM node_change") + cursor.execute("DROP TABLE node_change") + + tables = [Table('repository', key=('id', 'name'))[ + Column('id', type='int'), + Column('name'), + Column('value')], + Table('revision', key=('repos', 'rev'))[ + Column('repos', type='int'), + Column('rev', key_size=20), + Column('time', type='int'), + Column('author'), + Column('message'), + Index(['repos', 'time'])], + Table('node_change', key=('repos', 'rev', 'path', 'change_type'))[ + Column('repos', type='int'), + Column('rev', key_size=20), + Column('path', key_size=255), + Column('node_type', size=1), + Column('change_type', size=1, key_size=2), + Column('base_path'), + Column('base_rev'), + Index(['repos', 'rev'])]] + + db_connector, _ = DatabaseManager(env)._get_connector() + for table in tables: + for stmt in db_connector.to_sql(table): + cursor.execute(stmt) + + cursor.executemany("INSERT INTO repository (id,name,value) " + "VALUES (%s,'name',%s)", id_name_list) + cursor.executemany("INSERT INTO repository (id,name,value) " + "SELECT %s,name,value FROM repo_old WHERE id=%s", + id_name_list) + cursor.execute("DROP TABLE repo_old") + cursor.executemany("INSERT INTO revision (repos,rev,time,author,message) " + "SELECT %s,rev,time,author,message FROM rev_old " + "WHERE repos=%s", id_name_list) + cursor.execute("DROP TABLE rev_old") + cursor.executemany("INSERT INTO node_change (repos,rev,path,node_type," + " change_type,base_path,base_rev) " + "SELECT %s,rev,path,node_type,change_type,base_path," + " base_rev FROM nc_old WHERE repos=%s", id_name_list) + cursor.execute("DROP TABLE nc_old") diff -Nru trac-0.11.7/trac/upgrades/db25.py trac-0.12.1~ppa2/trac/upgrades/db25.py --- trac-0.11.7/trac/upgrades/db25.py 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/trac/upgrades/db25.py 2010-02-20 03:06:24.000000000 +0000 @@ -0,0 +1,34 @@ +from trac.db import DatabaseManager + + +def do_upgrade(env, ver, cursor): + """Convert time values from integer seconds to integer microseconds.""" + tables = [ + ('attachment', {'time': ('int', 'int64')}), + ('wiki', {'time': ('int', 'int64')}), + ('revision', {'time': ('int', 'int64')}), + ('ticket', {'time': ('int', 'int64'), + 'changetime': ('int', 'int64')}), + ('ticket_change', {'time': ('int', 'int64')}), + ('milestone', {'due': ('int', 'int64'), + 'completed': ('int', 'int64')}), + ('version', {'time': ('int', 'int64')}), + ] + + db_connector, _ = DatabaseManager(env).get_connector() + db = env.get_db_cnx() + for table, columns in tables: + # Alter column types + for sql in db_connector.alter_column_types(table, columns): + cursor.execute(sql) + + # Convert timestamps to microseconds + cursor.execute("UPDATE %s SET %s" % (table, + ', '.join("%s=%s*1000000" % (column, column) + for column in columns))) + + # Convert comment edit timestamps to microseconds + cursor.execute("UPDATE ticket_change SET newvalue=%s*1000000 " + "WHERE field %s" % (db.cast('newvalue', 'int64'), + db.like()), + ('_comment%',)) diff -Nru trac-0.11.7/trac/upgrades/db26.py trac-0.12.1~ppa2/trac/upgrades/db26.py --- trac-0.11.7/trac/upgrades/db26.py 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/trac/upgrades/db26.py 2010-02-22 02:09:26.000000000 +0000 @@ -0,0 +1,20 @@ + +def do_upgrade(env, ver, cursor): + """Zero-pad Subversion revision numbers in the cache.""" + cursor.execute(""" + SELECT id, value FROM repository WHERE name='repository_dir' + """) + for id in [id for id, dir in cursor if dir.startswith('svn:')]: + cursor.execute("SELECT DISTINCT rev FROM revision WHERE repos=%s", + (id,)) + for rev in set(row[0] for row in cursor): + cursor.execute(""" + UPDATE revision SET rev=%s WHERE repos=%s AND rev=%s + """, ('%010d' % int(rev), id, rev)) + + cursor.execute("SELECT DISTINCT rev FROM node_change WHERE repos=%s", + (id,)) + for rev in set(row[0] for row in cursor): + cursor.execute(""" + UPDATE node_change SET rev=%s WHERE repos=%s AND rev=%s + """, ('%010d' % int(rev), id, rev)) diff -Nru trac-0.11.7/trac/util/compat.py trac-0.12.1~ppa2/trac/util/compat.py --- trac-0.11.7/trac/util/compat.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/util/compat.py 2009-12-24 14:16:49.000000000 +0000 @@ -14,59 +14,18 @@ # history and logs, available at http://trac.edgewall.org/log/. """Various classes and functions to provide some backwards-compatibility with -previous of Python prior to 2.4. +previous versions of Python from 2.4 onward. """ import os -try: - set = set - frozenset = frozenset -except NameError: - from sets import Set as set - from sets import ImmutableSet as frozenset - -try: - reversed = reversed -except NameError: - def reversed(x): - if hasattr(x, 'keys'): - raise ValueError('mappings do not support reverse iteration') - i = len(x) - while i > 0: - i -= 1 - yield x[i] - -try: - sorted = sorted -except NameError: - def sorted(iterable, cmp=None, key=None, reverse=False): - """Partial implementation of the "sorted" function from Python 2.4""" - if key is None: - lst = list(iterable) - else: - lst = [(key(val), idx, val) for idx, val in enumerate(iterable)] - lst.sort() - if key is None: - if reverse: - return lst[::-1] - return lst - if reverse: - lst = reversed(lst) - return [i[-1] for i in lst] - -# Note: not used, suggest to remove in 0.12 -try: - from operator import attrgetter, itemgetter -except ImportError: - def attrgetter(name): - def _getattr(obj): - return getattr(obj, name) - return _getattr - def itemgetter(name): - def _getitem(obj): - return obj[name] - return _getitem +# Import symbols previously defined here for Python 2.3 compatibility from +# __builtin__ so that plugins importing them don't suddenly stop working +set = set +frozenset = frozenset +reversed = reversed +sorted = sorted +from itertools import groupby, tee class py_groupby(object): def __init__(self, iterable, key=None): @@ -88,28 +47,6 @@ yield self.currvalue self.currvalue = self.it.next() # Exit on StopIteration self.currkey = self.keyfunc(self.currvalue) -try: - from itertools import groupby -except ImportError: - groupby = py_groupby - -# Note: only used by pairwise, which is now deprecated -# (suggest to remove it from 0.12 as well) -try: - from itertools import tee -except ImportError: - from itertools import count - def tee(iterable): - def gen(next, data={}, cnt=[0]): - for i in count(): - if i == cnt[0]: - item = data[i] = next() - cnt[0] += 1 - else: - item = data.pop(i) - yield item - it = iter(iterable) - return (gen(it.next), gen(it.next)) try: all = all @@ -118,15 +55,26 @@ def any(S): for x in S: if x: - return True + return True return False def all(S): for x in S: if not x: - return False + return False return True +if hasattr('', 'rpartition'): + def rpartition(s, sep): + return s.rpartition(sep) +else: + def rpartition(s, sep): + idx = s.rfind(sep) + if idx < 0: + return ('', '', s) + else: + return (s[:idx], sep, s[idx+len(sep):]) + try: from functools import partial except ImportError: diff -Nru trac-0.11.7/trac/util/daemon.py trac-0.12.1~ppa2/trac/util/daemon.py --- trac-0.11.7/trac/util/daemon.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/util/daemon.py 2009-10-29 18:37:45.000000000 +0000 @@ -78,7 +78,7 @@ # process exits def remove_pidfile(): if os.path.exists(pidfile): - os.remove(pidfile) + os.remove(pidfile) atexit.register(remove_pidfile) fileobj = open(pidfile, 'w') try: diff -Nru trac-0.11.7/trac/util/datefmt.py trac-0.12.1~ppa2/trac/util/datefmt.py --- trac-0.11.7/trac/util/datefmt.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/util/datefmt.py 2010-02-21 16:25:28.000000000 +0000 @@ -25,6 +25,7 @@ from trac.core import TracError from trac.util.text import to_unicode +from trac.util.translation import _, ngettext # Date/time utilities @@ -47,7 +48,7 @@ return t elif isinstance(t, date): return (tzinfo or localtz).localize(datetime(t.year, t.month, t.day)) - elif isinstance(t, (int,long,float)): + elif isinstance(t, (int, long, float)): return datetime.fromtimestamp(t, tzinfo or localtz) raise TypeError('expecting datetime, int, long, float, or None; got %s' % type(t)) @@ -60,9 +61,28 @@ else: return 0 +def to_utimestamp(dt): + """Return a microsecond POSIX timestamp for the given `datetime`.""" + if not dt: + return 0 + diff = dt - _epoc + return (diff.days * 86400000000L + diff.seconds * 1000000 + + diff.microseconds) + +def from_utimestamp(ts): + """Return the `datetime` for the given microsecond POSIX timestamp.""" + return _epoc + timedelta(microseconds=ts or 0) # -- formatting +_units = ( + (3600*24*365, lambda r: ngettext('%(num)d year', '%(num)d years', r)), + (3600*24*30, lambda r: ngettext('%(num)d month', '%(num)d months', r)), + (3600*24*7, lambda r: ngettext('%(num)d week', '%(num)d weeks', r)), + (3600*24, lambda r: ngettext('%(num)d day', '%(num)d days', r)), + (3600, lambda r: ngettext('%(num)d hour', '%(num)d hours', r)), + (60, lambda r: ngettext('%(num)d minute', '%(num)d minutes', r))) + def pretty_timedelta(time1, time2=None, resolution=None): """Calculate time delta between two `datetime` objects. (the result is somewhat imprecise, only use for prettyprinting). @@ -74,24 +94,20 @@ time2 = to_datetime(time2) if time1 > time2: time2, time1 = time1, time2 - units = ((3600 * 24 * 365, 'year', 'years'), - (3600 * 24 * 30, 'month', 'months'), - (3600 * 24 * 7, 'week', 'weeks'), - (3600 * 24, 'day', 'days'), - (3600, 'hour', 'hours'), - (60, 'minute', 'minutes')) + diff = time2 - time1 age_s = int(diff.days * 86400 + diff.seconds) if resolution and age_s < resolution: return '' if age_s <= 60 * 1.9: - return '%i second%s' % (age_s, age_s != 1 and 's' or '') - for u, unit, unit_plural in units: + return ngettext('%(num)i second', '%(num)i seconds', age_s) + for u, format_units in _units: r = float(age_s) / float(u) if r >= 1.9: r = int(round(r)) - return '%d %s' % (r, r == 1 and unit or unit_plural) + return format_units(r) return '' + def format_datetime(t=None, format='%x %X', tzinfo=None): """Format the `datetime` object `t` into an `unicode` string @@ -100,7 +116,7 @@ The formatting will be done using the given `format`, which consist of conventional `strftime` keys. In addition the format can be 'iso8601' - to specify the international date format. + to specify the international date format (compliant with RFC 3339). `tzinfo` will default to the local timezone if left to `None`. """ @@ -108,23 +124,19 @@ t = to_datetime(t, tzinfo).astimezone(tz) normalize_Z = False if format.lower().startswith('iso8601'): - date_only = time_only = False if 'date' in format: - date_only = True - elif 'time' in format: - time_only = True - if date_only: format = '%Y-%m-%d' - elif time_only: - format = '%H:%M:%S' + elif 'time' in format: + format = '%H:%M:%S%z' + normalize_Z = True else: - format = '%Y-%m-%dT%H:%M:%S' - if not date_only: - format += '%z' + format = '%Y-%m-%dT%H:%M:%S%z' normalize_Z = True text = t.strftime(format) if normalize_Z: text = text.replace('+0000', 'Z') + if not text.endswith('Z'): + text = text[:-2] + ":" + text[-2:] encoding = locale.getpreferredencoding() or sys.getdefaultencoding() if sys.platform != 'win32' or sys.version_info[:2] > (2, 3): encoding = locale.getlocale(locale.LC_TIME)[1] or encoding @@ -184,16 +196,15 @@ # -- parsing -_ISO_8601_RE = re.compile(r'(\d\d\d\d)(?:-?(\d\d)(?:-?(\d\d))?)?' # date - r'(?:T(\d\d)(?::?(\d\d)(?::?(\d\d))?)?)?' # time - r'(Z?(?:([-+])?(\d\d):?(\d\d)?)?)?$' # timezone - ) +_ISO_8601_RE = re.compile(r''' + (\d\d\d\d)(?:-?(\d\d)(?:-?(\d\d))?)? # date + (?:T(\d\d)(?::?(\d\d)(?::?(\d\d))?)?)? # time + (Z?(?:([-+])?(\d\d):?(\d\d)?)?)?$ # timezone + ''', re.VERBOSE) def parse_date(text, tzinfo=None): tzinfo = tzinfo or localtz - if text == 'now': # TODO: today, yesterday, etc. - return datetime.now(utc) - tm = None + dt = None text = text.strip() # normalize ISO time match = _ISO_8601_RE.match(text) @@ -217,33 +228,98 @@ tm = time.strptime('%s ' * 6 % (years, months, days, hours, minutes, seconds), '%Y %m %d %H %M %S ') + dt = tzinfo.localize(datetime(*tm[0:6])) except ValueError: pass - else: + if dt is None: for format in ['%x %X', '%x, %X', '%X %x', '%X, %x', '%x', '%c', '%b %d, %Y']: try: tm = time.strptime(text, format) + dt = tzinfo.localize(datetime(*tm[0:6])) break except ValueError: continue - if tm == None: + if dt is None: + dt = _parse_relative_time(text, tzinfo) + if dt is None: hint = get_date_format_hint() - raise TracError('"%s" is an invalid date, or the date format ' - 'is not known. Try "%s" instead.' % (text, hint), - 'Invalid Date') - dt = tzinfo.localize(datetime(*tm[0:6])) + raise TracError(_('"%(date)s" is an invalid date, or the date format ' + 'is not known. Try "%(hint)s" instead.', + date=text, hint=hint), _('Invalid Date')) # Make sure we can convert it to a timestamp and back - fromtimestamp() # may raise ValueError if larger than platform C localtime() or gmtime() try: to_datetime(to_timestamp(dt), tzinfo) except ValueError: - raise TracError('The date "%s" is outside valid range. ' - 'Try a date closer to present time.' % (text,), - 'Invalid Date') + raise TracError(_('The date "%(date)s" is outside valid range. ' + 'Try a date closer to present time.', date=text), + _('Invalid Date')) return dt +_REL_TIME_RE = re.compile( + r'(\d+\.?\d*)\s*' + r'(second|minute|hour|day|week|month|year|[hdwmy])s?\s*' + r'(?:ago)?$') +_time_intervals = dict( + second=lambda v: timedelta(seconds=v), + minute=lambda v: timedelta(minutes=v), + hour=lambda v: timedelta(hours=v), + day=lambda v: timedelta(days=v), + week=lambda v: timedelta(weeks=v), + month=lambda v: timedelta(days=30 * v), + year=lambda v: timedelta(days=365 * v), + h=lambda v: timedelta(hours=v), + d=lambda v: timedelta(days=v), + w=lambda v: timedelta(weeks=v), + m=lambda v: timedelta(days=30 * v), + y=lambda v: timedelta(days=365 * v), +) +_TIME_START_RE = re.compile(r'(this|last)\s*' + r'(second|minute|hour|day|week|month|year)$') +_time_starts = dict( + second=lambda now: now.replace(microsecond=0), + minute=lambda now: now.replace(microsecond=0, second=0), + hour=lambda now: now.replace(microsecond=0, second=0, minute=0), + day=lambda now: now.replace(microsecond=0, second=0, minute=0, hour=0), + week=lambda now: now.replace(microsecond=0, second=0, minute=0, hour=0) \ + - timedelta(days=now.weekday()), + month=lambda now: now.replace(microsecond=0, second=0, minute=0, hour=0, + day=1), + year=lambda now: now.replace(microsecond=0, second=0, minute=0, hour=0, + day=1, month=1), +) + +def _parse_relative_time(text, tzinfo): + now = tzinfo.localize(datetime.now()) + if text == 'now': + return now + if text == 'today': + return now.replace(microsecond=0, second=0, minute=0, hour=0) + if text == 'yesterday': + return now.replace(microsecond=0, second=0, minute=0, hour=0) \ + - timedelta(days=1) + match = _REL_TIME_RE.match(text) + if match: + (value, interval) = match.groups() + return now - _time_intervals[interval](float(value)) + match = _TIME_START_RE.match(text) + if match: + (which, start) = match.groups() + dt = _time_starts[start](now) + if which == 'last': + if start == 'month': + if dt.month > 1: + dt = dt.replace(month=dt.month - 1) + else: + dt = dt.replace(year=dt.year - 1, month=12) + else: + dt -= _time_intervals[start](1) + return dt + return None + + # -- timezone utilities class FixedOffset(tzinfo): @@ -285,6 +361,14 @@ class LocalTimezone(tzinfo): """A 'local' time zone implementation""" + + def __str__(self): + return self.tzname(datetime.now()) + + def __repr__(self): + return '' % ( + time.tzname[False], STDOFFSET, + time.tzname[True], DSTOFFSET) def utcoffset(self, dt): if self._isdst(dt): @@ -383,6 +467,7 @@ _pytz_zones[_gmt_index:] except ImportError: + pytz = None def timezone(tzname): """Fetch timezone instance by name or raise `KeyError`""" diff -Nru trac-0.11.7/trac/util/html.py trac-0.12.1~ppa2/trac/util/html.py --- trac-0.11.7/trac/util/html.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/util/html.py 2009-02-15 12:44:04.000000000 +0000 @@ -18,8 +18,6 @@ from genshi.builder import Element, ElementFactory, Fragment from genshi.filters.html import HTMLSanitizer -from trac.util.compat import set - __all__ = ['escape', 'unescape', 'html', 'plaintext', 'TracHTMLSanitizer'] diff -Nru trac-0.11.7/trac/util/__init__.py trac-0.12.1~ppa2/trac/util/__init__.py --- trac-0.11.7/trac/util/__init__.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/util/__init__.py 2010-05-05 03:21:11.000000000 +0100 @@ -18,27 +18,26 @@ # Matthew Good import errno +import inspect +from itertools import izip, tee import locale import os.path +from pkg_resources import find_distributions import random import re +import shutil import sys -import time import tempfile +try: + import threading +except ImportError: + import dummy_threading as threading + threading._get_ident = lambda: 0 +import time from urllib import quote, unquote, urlencode -from itertools import izip -# Imports for backward compatibility -from trac.core import TracError -from trac.util.compat import md5, reversed, sha1, sorted, tee -from trac.util.html import escape, unescape, Markup, Deuglifier -from trac.util.text import CRLF, to_utf8, to_unicode, shorten_line, \ - wrap, pretty_size -from trac.util.datefmt import pretty_timedelta, format_datetime, \ - format_date, format_time, \ - get_date_format_hint, \ - get_datetime_format_hint, http_date, \ - parse_date +from trac.util.compat import any, md5, sha1, sorted +from trac.util.text import to_unicode # -- req/session utils @@ -113,7 +112,7 @@ can_rename_open_file = True def _rename_atomic(src, dst): - ta = CreateTransaction(None, 0, 0, 0, 0, 1000, 'Trac rename') + ta = CreateTransaction(None, 0, 0, 0, 0, 10000, 'Trac rename') if ta == -1: return False try: @@ -286,10 +285,82 @@ if capturestderr and os.path.isfile(errfile): os.remove(errfile) + +def makedirs(path, overwrite=False): + if overwrite and os.path.exists(path): + return + os.makedirs(path) + + +def copytree(src, dst, symlinks=False, skip=[], overwrite=False): + """Recursively copy a directory tree using copy2() (from shutil.copytree.) + + Added a `skip` parameter consisting of absolute paths + which we don't want to copy. + """ + def str_path(path): + if isinstance(path, unicode): + path = path.encode(sys.getfilesystemencoding() or + locale.getpreferredencoding()) + return path + + def remove_if_overwriting(path): + if overwrite and os.path.exists(path): + os.unlink(path) + + skip = [str_path(f) for f in skip] + def copytree_rec(src, dst): + names = os.listdir(src) + makedirs(dst, overwrite=overwrite) + errors = [] + for name in names: + srcname = os.path.join(src, name) + if srcname in skip: + continue + dstname = os.path.join(dst, name) + try: + if symlinks and os.path.islink(srcname): + remove_if_overwriting(dstname) + linkto = os.readlink(srcname) + os.symlink(linkto, dstname) + elif os.path.isdir(srcname): + copytree_rec(srcname, dstname) + else: + remove_if_overwriting(dstname) + shutil.copy2(srcname, dstname) + # XXX What about devices, sockets etc.? + except (IOError, OSError), why: + errors.append((srcname, dstname, str(why))) + # catch the Error from the recursive copytree so that we can + # continue with other files + except shutil.Error, err: + errors.extend(err.args[0]) + try: + shutil.copystat(src, dst) + except WindowsError, why: + pass # Ignore errors due to limited Windows copystat support + except OSError, why: + errors.append((src, dst, str(why))) + if errors: + raise shutil.Error(errors) + copytree_rec(str_path(src), str_path(dst)) + + # -- sys utils +class ThreadLocal(threading.local): + """A thread-local storage allowing to set default values on construction. + """ + def __init__(self, **kwargs): + threading.local.__init__(self) + self.__dict__.update(kwargs) + + def arity(f): - return f.func_code.co_argcount + """Return the number of arguments expected by the given function, unbound + or bound method. + """ + return f.func_code.co_argcount - bool(getattr(f, 'im_self', False)) def get_last_traceback(): import traceback @@ -331,6 +402,27 @@ fileobj.close() return (), None, () +def get_frame_info(tb): + """Return frame information for a traceback.""" + frames = [] + while tb: + tb_hide = tb.tb_frame.f_locals.get('__traceback_hide__') + if tb_hide in ('before', 'before_and_this'): + del frames[:] + tb_hide = tb_hide[6:] + if not tb_hide: + filename = tb.tb_frame.f_code.co_filename + filename = filename.replace('\\', '/') + lineno = tb.tb_lineno - 1 + before, line, after = get_lines_from_file(filename, lineno, 5) + frames.append({'traceback': tb, 'filename': filename, + 'lineno': lineno, 'line': line, + 'lines_before': before, 'lines_after': after, + 'function': tb.tb_frame.f_code.co_name, + 'vars': tb.tb_frame.f_locals}) + tb = tb.tb_next + return frames + def safe__import__(module_name): """ Safe imports: rollback after a failed import. @@ -349,10 +441,23 @@ del(sys.modules[modname]) raise e +def get_doc(obj): + """Return the docstring of an object as a tuple `(summary, description)`, + where `summary` is the first paragraph and `description` is the remaining + text. + """ + doc = inspect.getdoc(obj) + if not doc: + return (None, None) + doc = to_unicode(doc).split('\n\n', 1) + summary = doc[0].replace('\n', ' ') + description = len(doc) > 1 and doc[1] or None + return (summary, description) + # -- setuptools utils def get_module_path(module): - # Determine the plugin that this component belongs to + """Return the base path the given module is imported from""" path = module.__file__ module_name = module.__name__ if path.endswith('.pyc') or path.endswith('.pyo'): @@ -361,12 +466,29 @@ path = os.path.dirname(path) base_path = os.path.splitext(path)[0] while base_path.replace(os.sep, '.').endswith(module_name): + if "." not in module_name: + break base_path = os.path.dirname(base_path) module_name = '.'.join(module_name.split('.')[:-1]) - if not module_name: - break return base_path +def get_sources(path): + """Return a dictionary mapping Python module source paths to the + distributions that contain them. + """ + sources = {} + for dist in find_distributions(path, only=True): + try: + toplevels = dist.get_metadata('top_level.txt').splitlines() + toplevels = [each + '/' for each in toplevels] + files = dist.get_metadata('SOURCES.txt').splitlines() + sources.update((src, dist) for src in files + if any(src.startswith(toplevel) + for toplevel in toplevels)) + except KeyError: + pass # Metadata not found + return sources + def get_pkginfo(dist): """Get a dictionary containing package information for a package @@ -379,17 +501,13 @@ """ import types if isinstance(dist, types.ModuleType): - try: - from pkg_resources import find_distributions - module = dist - module_path = get_module_path(module) - for dist in find_distributions(module_path, only=True): - if os.path.isfile(module_path) or \ - dist.key == module.__name__.lower(): - break - else: - return {} - except ImportError: + module = dist + module_path = get_module_path(module) + for dist in find_distributions(module_path, only=True): + if os.path.isfile(module_path) or \ + dist.key == module.__name__.lower(): + break + else: return {} import email attrs = ('author', 'author-email', 'license', 'home-page', 'summary', @@ -414,7 +532,6 @@ # -- crypto utils def hex_entropy(bytes=32): - import random return sha1(str(random.random())).hexdigest()[:bytes] @@ -477,11 +594,13 @@ for a, b, c in ((0, 6, 12), (1, 7, 13), (2, 8, 14), (3, 9, 15), (4, 10, 5)): v = ord(final[a]) << 16 | ord(final[b]) << 8 | ord(final[c]) for i in range(4): - rearranged += itoa64[v & 0x3f]; v >>= 6 + rearranged += itoa64[v & 0x3f] + v >>= 6 v = ord(final[11]) for i in range(2): - rearranged += itoa64[v & 0x3f]; v >>= 6 + rearranged += itoa64[v & 0x3f] + v >>= 6 return magic + salt + '$' + rearranged @@ -716,7 +835,9 @@ return type def pairwise(iterable): - """s -> (s0,s1), (s1,s2), (s2, s3), ... + """ + >>> list(pairwise([0, 1, 2, 3])) + [(0, 1), (1, 2), (2, 3)] :deprecated: since 0.11 (if this really needs to be used, rewrite it without izip) @@ -729,6 +850,12 @@ return izip(a, b) def partition(iterable, order=None): + """ + >>> partition([(1,"a"),(2, "b"),(3, "a")]) + {'a': [1, 3], 'b': [2]} + >>> partition([(1,"a"),(2, "b"),(3, "a")], "ab") + [[1, 3], [2]] + """ result = {} if order is not None: for key in order: @@ -738,3 +865,33 @@ if order is None: return result return [result[key] for key in order] + +def as_int(s, default, min=None, max=None): + """Convert s to an int and limit it to the given range, or return default + if unsuccessful.""" + try: + value = int(s) + except (TypeError, ValueError): + return default + if min is not None and value < min: + value = min + if max is not None and value > max: + value = max + return value + +def pathjoin(*args): + """Strip `/` from the arguments and join them with a single `/`.""" + return '/'.join(filter(None, (each.strip('/') for each in args if each))) + + +# Imports for backward compatibility (at bottom to avoid circular dependencies) +from trac.core import TracError +from trac.util.compat import reversed +from trac.util.html import escape, unescape, Markup, Deuglifier +from trac.util.text import CRLF, to_utf8, shorten_line, wrap, pretty_size +from trac.util.datefmt import pretty_timedelta, format_datetime, \ + format_date, format_time, \ + get_date_format_hint, \ + get_datetime_format_hint, http_date, \ + parse_date + diff -Nru trac-0.11.7/trac/util/presentation.py trac-0.12.1~ppa2/trac/util/presentation.py --- trac-0.11.7/trac/util/presentation.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/util/presentation.py 2009-12-07 00:28:49.000000000 +0000 @@ -169,6 +169,7 @@ retval = items[start:stop] except TypeError: # Slicing not supported, so iterate through the whole list retval = [] + idx = -1 # Needed if items = [] for idx, item in enumerate(items): if start <= idx < stop: retval.append(item) @@ -276,3 +277,36 @@ yield last, sep last = i yield last, None + + +try: + from json import dumps + + def to_json(value): + """Encode `value` to JSON.""" + return dumps(value, sort_keys=True, separators=(',', ':')) + +except ImportError: + from trac.util.text import javascript_quote + + def to_json(value): + """Encode `value` to JSON.""" + if isinstance(value, basestring): + return '"%s"' % javascript_quote(value) + elif value is None: + return 'null' + elif value is False: + return 'false' + elif value is True: + return 'true' + elif isinstance(value, (int, long)): + return str(value) + elif isinstance(value, float): + return repr(value) + elif isinstance(value, (list, tuple)): + return '[%s]' % ','.join(to_json(each) for each in value) + elif isinstance(value, dict): + return '{%s}' % ','.join('%s:%s' % (to_json(k), to_json(v)) + for k, v in sorted(value.iteritems())) + else: + raise TypeError('Cannot encode type %s' % value.__class__.__name__) diff -Nru trac-0.11.7/trac/util/tests/datefmt.py trac-0.12.1~ppa2/trac/util/tests/datefmt.py --- trac-0.11.7/trac/util/tests/datefmt.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/util/tests/datefmt.py 2010-02-20 02:58:38.000000000 +0000 @@ -69,7 +69,7 @@ def test_to_datetime_tz(self): tz = datefmt.timezone('GMT +1:00') - expected = datetime.datetime(1970,1,1,1,0,23,0,tz) + expected = datetime.datetime(1970, 1, 1, 1, 0, 23, 0, tz) self.assertEqual(datefmt.to_datetime(23, tz), expected) self.assertEqual(datefmt.to_datetime(23L, tz), expected) self.assertEqual(datefmt.to_datetime(23.0, tz), expected) @@ -80,7 +80,7 @@ self.assertEqual(datefmt.to_datetime(23.0, tz), expected) def test_format_datetime_utc(self): - t = datetime.datetime(1970,1,1,1,0,23,0,datefmt.utc) + t = datetime.datetime(1970, 1, 1, 1, 0, 23, 0, datefmt.utc) expected = '1970-01-01T01:00:23Z' self.assertEqual(datefmt.format_datetime(t, '%Y-%m-%dT%H:%M:%SZ', datefmt.utc), expected) @@ -95,10 +95,11 @@ def test_format_datetime_gmt01(self): gmt01 = datefmt.FixedOffset(60, 'GMT +1:00') - t = datetime.datetime(1970,1,1,1,0,23,0,gmt01) - expected = '1970-01-01T01:00:23+0100' - self.assertEqual(datefmt.format_datetime(t, '%Y-%m-%dT%H:%M:%S%z', - gmt01), expected) + t = datetime.datetime(1970, 1, 1, 1, 0, 23, 0, gmt01) + self.assertEqual('1970-01-01T01:00:23+0100', + datefmt.format_datetime(t, '%Y-%m-%dT%H:%M:%S%z', + gmt01)) + expected = '1970-01-01T01:00:23+01:00' self.assertEqual(datefmt.format_datetime(t, 'iso8601', gmt01), expected) self.assertEqual(datefmt.format_datetime(t, 'iso8601date', gmt01), @@ -112,6 +113,15 @@ datefmt.format_date(a_date, format='%Y-%m-%d')) +class UTimestampTestCase(unittest.TestCase): + + def test_sub_second(self): + t = datetime.datetime(2001, 2, 3, 4, 5, 6, 123456, datefmt.utc) + ts = datefmt.to_utimestamp(t) + self.assertEqual(981173106123456L, ts) + self.assertEqual(t, datefmt.from_utimestamp(ts)) + + def suite(): suite = unittest.TestSuite() if PytzTestCase: @@ -119,6 +129,7 @@ else: print "SKIP: utils/tests/datefmt.py (no pytz installed)" suite.addTest(unittest.makeSuite(DateFormatTestCase)) + suite.addTest(unittest.makeSuite(UTimestampTestCase)) return suite if __name__ == '__main__': diff -Nru trac-0.11.7/trac/util/tests/__init__.py trac-0.12.1~ppa2/trac/util/tests/__init__.py --- trac-0.11.7/trac/util/tests/__init__.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/util/tests/__init__.py 2010-04-05 14:16:58.000000000 +0100 @@ -14,6 +14,7 @@ import doctest import os.path import tempfile +import threading import unittest from trac import util @@ -64,7 +65,13 @@ rf.close() self.assertEqual('Replaced content', util.read_file(self.path)) - def test_unicode_path(self): + # FIXME: It is currently not possible to make this test pass on all + # platforms and with all locales. Typically, it will fail on Linux with + # LC_ALL=C. + # Python 3 adds sys.setfilesystemencoding(), which could be used here + # to remove the dependency on the locale. So the test is disabled until + # we require Python 3. + def _test_unicode_path(self): self.path = os.path.join(tempfile.gettempdir(), u'träc-témpfilè') f = util.AtomicFile(self.path) try: @@ -74,6 +81,24 @@ self.assertEqual('test content', util.read_file(self.path)) +class ThreadLocalTestCase(unittest.TestCase): + + def test_thread_local(self): + local = util.ThreadLocal(a=1, b=2) + local.b = 3 + local.c = 4 + local_dict = [local.__dict__.copy()] + def f(): + local.b = 5 + local.d = 6 + local_dict.append(local.__dict__.copy()) + thread = threading.Thread(target=f) + thread.start() + thread.join() + self.assertEqual(dict(a=1, b=3, c=4), local_dict[0]) + self.assertEqual(dict(a=1, b=5, d=6), local_dict[1]) + + class ContentDispositionTestCase(unittest.TestCase): def test_filename(self): @@ -90,6 +115,7 @@ def suite(): suite = unittest.TestSuite() suite.addTest(unittest.makeSuite(AtomicFileTestCase, 'test')) + suite.addTest(unittest.makeSuite(ThreadLocalTestCase, 'test')) suite.addTest(unittest.makeSuite(ContentDispositionTestCase, 'test')) suite.addTest(datefmt.suite()) suite.addTest(presentation.suite()) diff -Nru trac-0.11.7/trac/util/tests/presentation.py trac-0.12.1~ppa2/trac/util/tests/presentation.py --- trac-0.11.7/trac/util/tests/presentation.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/util/tests/presentation.py 2009-12-07 00:28:49.000000000 +0000 @@ -18,10 +18,31 @@ from trac.util import presentation +class ToJsonTestCase(unittest.TestCase): + + def test_simple_types(self): + self.assertEqual('42', presentation.to_json(42)) + self.assertEqual('123.456', presentation.to_json(123.456)) + self.assertEqual('true', presentation.to_json(True)) + self.assertEqual('false', presentation.to_json(False)) + self.assertEqual('null', presentation.to_json(None)) + self.assertEqual('"String"', presentation.to_json('String')) + self.assertEqual(r'"a \" quote"', presentation.to_json('a " quote')) + + def test_compound_types(self): + self.assertEqual('[1,2,[true,false]]', + presentation.to_json([1, 2, [True, False]])) + self.assertEqual('{"one":1,"other":[null,0],"two":2}', + presentation.to_json({"one": 1, "two": 2, + "other": [None, 0]})) + + def suite(): suite = unittest.TestSuite() suite.addTest(doctest.DocTestSuite(presentation)) + suite.addTest(unittest.makeSuite(ToJsonTestCase)) return suite + if __name__ == '__main__': unittest.main(defaultTest='suite') diff -Nru trac-0.11.7/trac/util/tests/text.py trac-0.12.1~ppa2/trac/util/tests/text.py --- trac-0.11.7/trac/util/tests/text.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/util/tests/text.py 2010-03-21 10:57:06.000000000 +0000 @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- -import doctest import unittest -from trac.util.text import to_unicode, expandtabs +from trac.util.text import expandtabs, javascript_quote, \ + normalize_whitespace, to_unicode + class ToUnicodeTestCase(unittest.TestCase): @@ -15,7 +16,7 @@ def test_explicit_charset_with_replace(self): uc = to_unicode('\xc3', 'utf-8') assert isinstance(uc, unicode) - self.assertEquals(u'\ufffd', uc) + self.assertEquals(u'\xc3', uc) def test_implicit_charset(self): uc = to_unicode('\xc3\xa7') @@ -48,10 +49,32 @@ self.assertEquals(' ', expandtabs(' \t')) self.assertEquals(' ', expandtabs('\t\t')) + +class JavascriptQuoteTestCase(unittest.TestCase): + def test_quoting(self): + self.assertEqual(r'Quote \" in text', + javascript_quote('Quote " in text')) + self.assertEqual(r'\\\"\b\f\n\r\t\'', + javascript_quote('\\"\b\f\n\r\t\'')) + self.assertEqual(r'\u0002\u001e', + javascript_quote('\x02\x1e')) + + +class WhitespaceTestCase(unittest.TestCase): + def test_default(self): + self.assertEqual(u'This is text ', + normalize_whitespace(u'Th\u200bis\u00a0is te\u200bxt\u00a0')) + self.assertEqual(u'Some other text', + normalize_whitespace(u'Some\tother\ntext\r', to_space='\t\n', + remove='\r')) + + def suite(): suite = unittest.TestSuite() suite.addTest(unittest.makeSuite(ToUnicodeTestCase, 'test')) suite.addTest(unittest.makeSuite(ExpandtabsTestCase, 'test')) + suite.addTest(unittest.makeSuite(JavascriptQuoteTestCase, 'test')) + suite.addTest(unittest.makeSuite(WhitespaceTestCase, 'test')) return suite if __name__ == '__main__': diff -Nru trac-0.11.7/trac/util/text.py trac-0.12.1~ppa2/trac/util/text.py --- trac-0.11.7/trac/util/text.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/util/text.py 2010-03-21 11:07:02.000000000 +0000 @@ -21,50 +21,52 @@ import __builtin__ import locale import os +import re import sys from urllib import quote, quote_plus, unquote, urlencode CRLF = '\r\n' +class Empty(unicode): + """A special tag object evaluating to the empty string""" + __slots__ = [] + +empty = Empty() + +del Empty # shouldn't be used outside of Trac core + + # -- Unicode def to_unicode(text, charset=None): - """Convert a `str` object to an `unicode` object. + """Convert input to an `unicode` object. - If `charset` is given, we simply assume that encoding for the text, - but we'll use the "replace" mode so that the decoding will always - succeed. - If `charset` is ''not'' specified, we'll make some guesses, first - trying the UTF-8 encoding, then trying the locale preferred encoding, - in "replace" mode. This differs from the `unicode` builtin, which - by default uses the locale preferred encoding, in 'strict' mode, - and is therefore prompt to raise `UnicodeDecodeError`s. - - Because of the "replace" mode, the original content might be altered. - If this is not what is wanted, one could map the original byte content - by using an encoding which maps each byte of the input to an unicode - character, e.g. by doing `unicode(text, 'iso-8859-1')`. + For a `str` object, we'll first try to decode the bytes using the given + `charset` encoding (or UTF-8 if none is specified), then we fall back to + the latin1 encoding which might be correct or not, but at least preserves + the original byte sequence by mapping each byte to the corresponding + unicode code point in the range U+0000 to U+00FF. + + Otherwise, a simple `unicode()` conversion is attempted, with some special + care taken for `Exception` objects. """ - if not isinstance(text, str): - if isinstance(text, Exception): - # two possibilities for storing unicode strings in exception data: - try: - # custom __str__ method on the exception (e.g. PermissionError) - return unicode(text) - except UnicodeError: - # unicode arguments given to the exception (e.g. parse_date) - return ' '.join([to_unicode(arg) for arg in text.args]) - return unicode(text) - if charset: - return unicode(text, charset, 'replace') - else: + if isinstance(text, str): + try: + return unicode(text, charset or 'utf-8') + except UnicodeDecodeError: + return unicode(text, 'latin1') + elif isinstance(text, Exception): + # two possibilities for storing unicode strings in exception data: try: - return unicode(text, 'utf-8') + # custom __str__ method on the exception (e.g. PermissionError) + return unicode(text) except UnicodeError: - return unicode(text, locale.getpreferredencoding(), 'replace') + # unicode arguments given to the exception (e.g. parse_date) + return ' '.join([to_unicode(arg) for arg in text.args]) + return unicode(text) -def exception_to_unicode(e, traceback=""): +def exception_to_unicode(e, traceback=False): message = '%s: %s' % (e.__class__.__name__, to_unicode(e)) if traceback: from trac.util import get_last_traceback @@ -72,13 +74,19 @@ message = '\n%s\n%s' % (to_unicode('\n'.join(traceback_only)), message) return message +_js_quote = {'\\': '\\\\', '"': '\\"', '\b': '\\b', '\f': '\\f', + '\n': '\\n', '\r': '\\r', '\t': '\\t', "'": "\\'"} +for i in range(0x20): + _js_quote.setdefault(chr(i), '\\u%04x' % i) +_js_quote_re = re.compile(r'[\x00-\x1f\\"\b\f\n\r\t\']') + def javascript_quote(text): """Quote strings for inclusion in javascript""" if not text: return '' - return text.replace('\\', '\\\\').replace('\r', '\\r') \ - .replace('\n', '\\n').replace('"', '\\"') \ - .replace("'", "\\'") + def replace(match): + return _js_quote[match.group(0)] + return _js_quote_re.sub(replace, text) def unicode_quote(value, safe='/'): """A unicode aware version of urllib.quote""" @@ -96,11 +104,23 @@ return unquote(value).decode('utf-8') def unicode_urlencode(params): - """A unicode aware version of urllib.urlencode""" + """A unicode aware version of urllib.urlencode. + + Values set to `empty` are converted to the key alone, without the + equal sign. + """ if isinstance(params, dict): - params = params.items() - return urlencode([(k, isinstance(v, unicode) and v.encode('utf-8') or v) - for k, v in params]) + params = params.iteritems() + l = [] + for k, v in params: + k = quote_plus(str(k)) + if v is empty: + l.append(k) + elif isinstance(v, unicode): + l.append(k + '=' + quote_plus(v.encode('utf-8'))) + else: + l.append(k + '=' + quote_plus(str(v))) + return '&'.join(l) def to_utf8(text, charset='iso-8859-15'): """Convert a string to UTF-8, assuming the encoding is either UTF-8, ISO @@ -137,8 +157,14 @@ if kwargs.get('newline', True): out.write('\n') +def printout(*args, **kwargs): + console_print(sys.stdout, *args, **kwargs) + +def printerr(*args, **kwargs): + console_print(sys.stderr, *args, **kwargs) + def raw_input(prompt): - console_print(sys.stdout, prompt, newline=False) + printout(prompt, newline=False) return to_unicode(__builtin__.raw_input(), sys.stdin.encoding) # -- Plain text formatting @@ -214,13 +240,37 @@ (address[-1] == '>' and '>' or '') return address +def breakable_path(path): + """Make a path breakable after path separators, and conversely, avoid + breaking at spaces. + """ + if not path: + return path + prefix = '' + if path.startswith('/'): # Avoid breaking after a leading / + prefix = '/' + path = path[1:] + return prefix + path.replace('/', u'/\u200b').replace('\\', u'\\\u200b') \ + .replace(' ', u'\u00a0') + +def normalize_whitespace(text, to_space=u'\u00a0', remove=u'\u200b'): + """Normalize whitespace in a string, by replacing special spaces by normal + spaces and removing zero-width spaces.""" + if not text: + return text + for each in to_space: + text = text.replace(each, ' ') + for each in remove: + text = text.replace(each, '') + return text + # -- Conversion def pretty_size(size, format='%.1f'): if size is None: return '' - jump = 512 + jump = 1024 if size < jump: return '%d bytes' % size @@ -233,8 +283,10 @@ return (format + ' %s') % (size, units[i - 1]) def expandtabs(s, tabstop=8, ignoring=None): - if '\t' not in s: return s - if ignoring is None: return s.expandtabs(tabstop) + if '\t' not in s: + return s + if ignoring is None: + return s.expandtabs(tabstop) outlines = [] for line in s.split('\n'): @@ -245,9 +297,9 @@ s = [] for c in line: if c == '\t': - n = tabstop-p%tabstop - s.append(' '*n) - p+=n + n = tabstop - p % tabstop + s.append(' ' * n) + p += n elif not ignoring or c not in ignoring: p += 1 s.append(c) diff -Nru trac-0.11.7/trac/util/translation.py trac-0.12.1~ppa2/trac/util/translation.py --- trac-0.11.7/trac/util/translation.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/util/translation.py 2010-04-05 14:16:58.000000000 +0100 @@ -11,27 +11,338 @@ # individuals. For the exact contribution history, see the revision # history and logs, available at http://trac.edgewall.org/log/. -"""Utilities for text translation with gettext. +"""Utilities for text translation with gettext.""" -Currently (for version 0.11) the functions here are noops, and only used to -flag localizable strings as such. -""" +import pkg_resources +import re -__all__ = ['gettext', 'ngettext', 'gettext_noop', 'ngettext_noop'] +from genshi.builder import tag -def gettext_noop(string, **kwargs): - retval = string +from trac.util import ThreadLocal, threading + + +__all__ = ['gettext', 'ngettext', 'gettext_noop', 'ngettext_noop', + 'tgettext', 'tgettext_noop', 'tngettext', 'tngettext_noop'] + +def safefmt(string, kwargs): if kwargs: - retval %= kwargs - return retval + try: + return string % kwargs + except KeyError: + pass + return string + + +def gettext_noop(string, **kwargs): + return safefmt(string, kwargs) + +def dgettext_noop(domain, string, **kwargs): + return gettext_noop(string, **kwargs) + N_ = gettext_noop -gettext = _ = gettext_noop def ngettext_noop(singular, plural, num, **kwargs): - if num == 1: - retval = singular - else: - retval = plural + string = (plural, singular)[num == 1] + kwargs.setdefault('num', num) + return safefmt(string, kwargs) + +def dngettext_noop(domain, singular, plural, num, **kwargs): + return ngettext_noop(singular, plural, num, **kwargs) + +_param_re = re.compile(r"%$(\w+)$(?:s|[\d]*d|\d*.?\d*[fg])") +def _tag_kwargs(trans, kwargs): + trans_elts = _param_re.split(trans) + for i in xrange(1, len(trans_elts), 2): + trans_elts[i] = kwargs.get(trans_elts[i], '???') + return tag(*trans_elts) + +def tgettext_noop(string, **kwargs): + return kwargs and _tag_kwargs(string, kwargs) or string + +def dtgettext_noop(domain, string, **kwargs): + return tgettext_noop(string, **kwargs) + +def tngettext_noop(singular, plural, num, **kwargs): + string = (plural, singular)[num == 1] kwargs.setdefault('num', num) - return retval % kwargs -ngettext = ngettext_noop + return _tag_kwargs(string, kwargs) + +def dtngettext_noop(domain, singular, plural, num, **kwargs): + return tngettext_noop(singular, plural, num, **kwargs) + +def add_domain(domain, env_path, locale_dir): + pass + +def domain_functions(domain, *symbols): + _functions = { + 'gettext': gettext_noop, + '_': gettext_noop, + 'N_': gettext_noop, + 'ngettext': ngettext_noop, + 'tgettext': tgettext_noop, + 'tag_': tgettext_noop, + 'tngettext': tngettext_noop, + 'tagn_': tngettext_noop, + 'add_domain': lambda env_path, locale_dir: None, + } + return [_functions[s] for s in symbols] + + +from gettext import NullTranslations + +class NullTranslationsBabel(NullTranslations): + """NullTranslations doesn't have the domain related methods.""" + + def dugettext(self, domain, string): + return self.ugettext(string) + + def dungettext(self, domain, singular, plural, num): + return self.ungettext(singular, plural, num) + + +try: + from babel.support import LazyProxy, Translations + + class TranslationsProxy(object): + """Delegate Translations calls to the currently active Translations. + + If there's none, wrap those calls in LazyProxy objects. + + Activation is controlled by `activate` and `deactivate` methods. + However, if retrieving the locale information is costly, it's also + possible to enable activation on demand only, by providing a callable + to `make_activable`. + """ + + def __init__(self): + self._current = ThreadLocal(args=None, translations=None) + self._null_translations = NullTranslationsBabel() + self._plugin_domains = {} + self._plugin_domains_lock = threading.RLock() + + # Public API + + def add_domain(self, domain, env_path, locales_dir): + self._plugin_domains_lock.acquire() + try: + if env_path not in self._plugin_domains: + self._plugin_domains[env_path] = [] + self._plugin_domains[env_path].append((domain, locales_dir)) + finally: + self._plugin_domains_lock.release() + + def make_activable(self, get_locale, env_path=None): + self._current.args = (get_locale, env_path) + + def activate(self, locale, env_path=None): + try: + locale_dir = pkg_resources.resource_filename('trac', 'locale') + except pkg_resources.ExtractionError: + return # delay extraction + t = Translations.load(locale_dir, locale or 'en_US') + if not t or t.__class__ is NullTranslations: + t = self._null_translations + elif env_path: + self._plugin_domains_lock.acquire() + try: + domains = list(self._plugin_domains.get(env_path, [])) + finally: + self._plugin_domains_lock.release() + for domain, dirname in domains: + t.add(Translations.load(dirname, locale, domain)) + self._current.translations = t + + def deactivate(self): + self._current.args = None + t, self._current.translations = self._current.translations, None + return t + + def reactivate(self, t): + if t: + self._current.translations = t + + @property + def active(self): + return self._current.translations or self._null_translations + + @property + def isactive(self): + if self._current.args is not None: + get_locale, env_path = self._current.args + self._current.args = None + self.activate(get_locale(), env_path) + return self._current.translations is not None + + # Delegated methods + + def __getattr__(self, name): + return getattr(self.active, name) + + def gettext(self, string, **kwargs): + def _gettext(): + return safefmt(self.active.ugettext(string), kwargs) + if not self.isactive: + return LazyProxy(_gettext) + return _gettext() + + def dgettext(self, domain, string, **kwargs): + def _dgettext(): + return safefmt(self.active.dugettext(domain, string), kwargs) + if not self.isactive: + return LazyProxy(_dgettext) + return _dgettext() + + def ngettext(self, singular, plural, num, **kwargs): + kwargs = kwargs.copy() + kwargs.setdefault('num', num) + def _ngettext(): + trans = self.active.ungettext(singular, plural, num) + return safefmt(trans, kwargs) + if not self.isactive: + return LazyProxy(_ngettext) + return _ngettext() + + def dngettext(self, domain, singular, plural, num, **kwargs): + kwargs = kwargs.copy() + kwargs.setdefault('num', num) + def _dngettext(): + trans = self.active.dungettext(domain, singular, plural, num) + return safefmt(trans, kwargs) + if not self.isactive: + return LazyProxy(_dngettext) + return _dngettext() + + def tgettext(self, string, **kwargs): + def _tgettext(): + trans = self.active.ugettext(string) + return kwargs and _tag_kwargs(trans, kwargs) or trans + if not self.isactive: + return LazyProxy(_tgettext) + return _tgettext() + + def dtgettext(self, domain, string, **kwargs): + def _dtgettext(): + trans = self.active.dugettext(domain, string) + return kwargs and _tag_kwargs(trans, kwargs) or trans + if not self.isactive: + return LazyProxy(_dtgettext) + return _dtgettext() + + def tngettext(self, singular, plural, num, **kwargs): + kwargs = kwargs.copy() + kwargs.setdefault('num', num) + def _tngettext(): + trans = self.active.ungettext(singular, plural, num) + return _tag_kwargs(trans, kwargs) + if not self.isactive: + return LazyProxy(_tngettext) + return _tngettext() + + def dtngettext(self, domain, singular, plural, num, **kwargs): + kwargs = kwargs.copy() + def _dtngettext(): + trans = self.active.dungettext(domain, singular, plural, num) + if '%(num)' in trans: + kwargs.update(num=num) + return kwargs and _tag_kwargs(trans, kwargs) or trans + if not self.isactive: + return LazyProxy(_dtngettext) + return _dtngettext() + + + translations = TranslationsProxy() + + def domain_functions(domain, *symbols): + _functions = { + 'gettext': translations.dgettext, + '_': translations.dgettext, + 'ngettext': translations.dngettext, + 'tgettext': translations.dtgettext, + 'tag_': translations.dtgettext, + 'tngettext': translations.dtngettext, + 'tagn_': translations.dtngettext, + 'add_domain': translations.add_domain, + } + def wrapdomain(symbol): + if symbol == 'N_': + return gettext_noop + return lambda *args, **kw: _functions[symbol](domain, *args, **kw) + return [wrapdomain(s) for s in symbols] + + gettext = translations.gettext + _ = gettext + dgettext = translations.dgettext + ngettext = translations.ngettext + dngettext = translations.dngettext + tgettext = translations.tgettext + tag_ = tgettext + dtgettext = translations.dtgettext + tngettext = translations.tngettext + tagn_ = tngettext + dtngettext = translations.dtngettext + + def deactivate(): + """Deactivate translations. + :return: the current Translations, if any + """ + return translations.deactivate() + + def reactivate(t): + """Reactivate previously deactivated translations. + :param t: the Translations, as returned by `deactivate` + """ + return translations.reactivate(t) + + def make_activable(get_locale, env_path=None): + """Defer activation of translations. + :param get_locale: a callable returning a Babel Locale object + :param env_path: the environment to use for looking up catalogs + """ + translations.make_activable(get_locale, env_path) + + def activate(locale, env_path=None): + translations.activate(locale, env_path) + + def add_domain(domain, env_path, locale_dir): + translations.add_domain(domain, env_path, locale_dir) + + def get_translations(): + return translations + + def get_available_locales(): + """Return a list of locale identifiers of the locales for which + translations are available. + """ + return [dirname for dirname + in pkg_resources.resource_listdir('trac', 'locale') + if '.' not in dirname] + +except ImportError: # fall back on 0.11 behavior, i18n functions are no-ops + gettext = _ = gettext_noop + dgettext = dgettext_noop + ngettext = ngettext_noop + dngettext = dngettext_noop + tgettext = tag_ = tgettext_noop + dtgettext = dtgettext_noop + tngettext = tagn_ = tngettext_noop + dtngettext = dtngettext_noop + + translations = NullTranslationsBabel() + + def activate(locale, env_path=None): + pass + + def deactivate(): + pass + + def reactivate(t): + pass + + def make_activable(get_locale, env_path=None): + pass + + def get_translations(): + return translations + + def get_available_locales(): + return [] diff -Nru trac-0.11.7/trac/versioncontrol/admin.py trac-0.12.1~ppa2/trac/versioncontrol/admin.py --- trac-0.11.7/trac/versioncontrol/admin.py 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/trac/versioncontrol/admin.py 2010-04-26 08:58:56.000000000 +0100 @@ -0,0 +1,316 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2008 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.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 + +from genshi.builder import tag + +from trac.admin import IAdminCommandProvider, IAdminPanelProvider +from trac.config import _TRUE_VALUES +from trac.core import * +from trac.perm import IPermissionRequestor +from trac.util.text import breakable_path, normalize_whitespace, print_table, \ + printout +from trac.util.translation import _, ngettext, tag_ +from trac.versioncontrol import DbRepositoryProvider, RepositoryManager, \ + is_default +from trac.web.chrome import Chrome, add_notice, add_warning + + +class VersionControlAdmin(Component): + """trac-admin command provider for version control administration.""" + + implements(IAdminCommandProvider, IPermissionRequestor, + IAdminPanelProvider) + + # IAdminCommandProvider methods + + def get_admin_commands(self): + yield ('changeset added', ' [rev] [...]', + """Notify trac about changesets added to a repository + + This command should be called from a post-commit hook. It will + trigger a cache update and notify components about the addition. + """, + self._complete_repos, self._do_changeset_added) + yield ('changeset modified', ' [rev] [...]', + """Notify trac about changesets modified in a repository + + This command should be called from a post-revprop hook after + revision properties like the commit message, author or date + have been changed. It will trigger a cache update for the given + revisions and notify components about the change. + """, + self._complete_repos, self._do_changeset_modified) + yield ('repository list', '', + 'List source repositories', + None, self._do_list) + yield ('repository resync', ' [rev]', + """Re-synchronize trac with repositories + + When [rev] is specified, only that revision is synchronized. + Otherwise, the complete revision history is synchronized. Note + that this operation can take a long time to complete. + If synchronization gets interrupted, it can be resumed later + using the `sync` command. + + To synchronize all repositories, specify "*" as the repository. + """, + self._complete_repos, self._do_resync) + yield ('repository sync', ' [rev]', + """Resume synchronization of repositories + + Similar to `resync`, but doesn't clear the already synchronized + changesets. Useful for resuming an interrupted `resync`. + + To synchronize all repositories, specify "*" as the repository. + """, + self._complete_repos, self._do_sync) + + def get_reponames(self): + rm = RepositoryManager(self.env) + return [reponame or '(default)' for reponame + in rm.get_all_repositories()] + + def _complete_repos(self, args): + if len(args) == 1: + return self.get_reponames() + + def _do_changeset_added(self, reponame, *revs): + if is_default(reponame): + reponame = '' + rm = RepositoryManager(self.env) + rm.notify('changeset_added', reponame, revs) + + def _do_changeset_modified(self, reponame, *revs): + if is_default(reponame): + reponame = '' + rm = RepositoryManager(self.env) + rm.notify('changeset_modified', reponame, revs) + + def _do_list(self): + rm = RepositoryManager(self.env) + values = [] + for (reponame, info) in sorted(rm.get_all_repositories().iteritems()): + alias = '' + if 'alias' in info: + alias = info['alias'] or '(default)' + values.append((reponame or '(default)', info.get('type', ''), + alias, info.get('dir', ''))) + print_table(values, [_('Name'), _('Type'), _('Alias'), _('Directory')]) + + def _sync(self, reponame, rev, clean): + rm = RepositoryManager(self.env) + if reponame == '*': + if rev is not None: + raise TracError(_('Cannot synchronize a single revision ' + 'on multiple repositories')) + repositories = rm.get_real_repositories() + else: + if is_default(reponame): + reponame = '' + repos = rm.get_repository(reponame) + if repos is None: + raise TracError(_("Repository '%(repo)s' not found", + repo=reponame or '(default)')) + if rev is not None: + repos.sync_changeset(rev) + printout(_('%(rev)s resynced on %(reponame)s.', rev=rev, + reponame=repos.reponame or '(default)')) + return + repositories = [repos] + + db = self.env.get_db_cnx() + for repos in sorted(repositories, key=lambda r: r.reponame): + printout(_('Resyncing repository history for %(reponame)s... ', + reponame=repos.reponame or '(default)')) + repos.sync(self._sync_feedback, clean=clean) + cursor = db.cursor() + cursor.execute("SELECT count(rev) FROM revision WHERE repos=%s", + (repos.id,)) + for cnt, in cursor: + printout(ngettext('%(num)s revision cached.', + '%(num)s revisions cached.', num=cnt)) + printout(_('Done.')) + + def _sync_feedback(self, rev): + sys.stdout.write(' [%s]\r' % rev) + sys.stdout.flush() + + def _do_resync(self, reponame, rev=None): + self._sync(reponame, rev, clean=True) + + def _do_sync(self, reponame, rev=None): + self._sync(reponame, rev, clean=False) + + # IPermissionRequestor methods + + def get_permission_actions(self): + return [('VERSIONCONTROL_ADMIN', ['BROWSER_VIEW', 'CHANGESET_VIEW', + 'FILE_VIEW', 'LOG_VIEW'])] + + # IAdminPanelProvider methods + + def get_admin_panels(self, req): + if 'VERSIONCONTROL_ADMIN' in req.perm: + yield ('versioncontrol', _('Version Control'), 'repository', + _('Repositories')) + + def render_admin_panel(self, req, category, page, path_info): + req.perm.require('VERSIONCONTROL_ADMIN') + + # Retrieve info for all repositories + rm = RepositoryManager(self.env) + all_repos = rm.get_all_repositories() + db_provider = self.env[DbRepositoryProvider] + + if path_info: + # Detail view + reponame = not is_default(path_info) and path_info or '' + info = all_repos.get(reponame) + if info is None: + raise TracError(_("Repository '%(repo)s' not found", + repo=path_info)) + if req.method == 'POST': + if req.args.get('cancel'): + req.redirect(req.href.admin(category, page)) + + elif db_provider and req.args.get('save'): + # Modify repository + changes = {} + for field in db_provider.repository_attrs: + value = normalize_whitespace(req.args.get(field)) + if (value is not None or field == 'hidden') \ + and value != info.get(field): + changes[field] = value + if changes: + db_provider.modify_repository(reponame, changes) + add_notice(req, _('Your changes have been saved.')) + name = req.args.get('name') + resync = tag.tt('trac-admin $ENV repository resync "%s"' + % (name or '(default)')) + if 'dir' in changes: + msg = tag_('You should now run %(resync)s to ' + 'synchronize Trac with the repository.', + resync=resync) + add_notice(req, msg) + elif 'type' in changes: + msg = tag_('You may have to run %(resync)s to ' + 'synchronize Trac with the repository.', + resync=resync) + add_notice(req, msg) + if name and name != path_info and not 'alias' in info: + cset_added = tag.tt('trac-admin $ENV changeset ' + 'added "%s" $REV' + % (name or '(default)')) + msg = tag_('You will need to update your post-commit ' + 'hook to call %(cset_added)s with the new ' + 'repository name.', cset_added=cset_added) + add_notice(req, msg) + req.redirect(req.href.admin(category, page)) + + Chrome(self.env).add_wiki_toolbars(req) + data = {'view': 'detail', 'reponame': reponame} + + else: + # List view + if req.method == 'POST': + # Add a repository + if db_provider and req.args.get('add_repos'): + name = req.args.get('name') + type_ = req.args.get('type') + dir = req.args.get('dir') + if name is not None and type_ is not None and dir: + # Avoid errors when copy/pasting paths + dir = normalize_whitespace(dir) + db_provider.add_repository(name, dir, type_) + name = name or '(default)' + add_notice(req, _('The repository "%(name)s" has been ' + 'added.', name=name)) + resync = tag.tt('trac-admin $ENV repository resync ' + '"%s"' % name) + msg = tag_('You should now run %(resync)s to ' + 'synchronize Trac with the repository.', + resync=resync) + add_notice(req, msg) + cset_added = tag.tt('trac-admin $ENV changeset ' + 'added "%s" $REV' % name) + msg = tag_('You should also set up a post-commit hook ' + 'on the repository to call %(cset_added)s ' + 'for each committed changeset.', + cset_added=cset_added) + add_notice(req, msg) + req.redirect(req.href.admin(category, page)) + add_warning(req, _('Missing arguments to add a ' + 'repository.')) + + # Add a repository alias + elif db_provider and req.args.get('add_alias'): + name = req.args.get('name') + alias = req.args.get('alias') + if name is not None and alias is not None: + db_provider.add_alias(name, alias) + add_notice(req, _('The alias "%(name)s" has been ' + 'added.', name=name or '(default)')) + req.redirect(req.href.admin(category, page)) + add_warning(req, _('Missing arguments to add an ' + 'alias.')) + + # Refresh the list of repositories + elif req.args.get('refresh'): + req.redirect(req.href.admin(category, page)) + + # Remove repositories + elif db_provider and req.args.get('remove'): + sel = req.args.getlist('sel') + if sel: + for name in sel: + db_provider.remove_repository(name) + add_notice(req, _('The selected repositories have ' + 'been removed.')) + req.redirect(req.href.admin(category, page)) + add_warning(req, _('No repositories were selected.')) + + data = {'view': 'list'} + + # Find repositories that are editable + db_repos = {} + if db_provider is not None: + db_repos = dict(db_provider.get_repositories()) + + # Prepare common rendering data + repositories = dict((reponame, self._extend_info(reponame, info.copy(), + reponame in db_repos)) + for (reponame, info) in all_repos.iteritems()) + types = sorted([''] + rm.get_supported_types()) + data.update({'types': types, 'default_type': rm.repository_type, + 'repositories': repositories}) + + return 'admin_repositories.html', data + + def _extend_info(self, reponame, info, editable): + """Extend repository info for rendering.""" + info['name'] = reponame + if info.get('dir') is not None: + info['prettydir'] = breakable_path(info['dir']) or '' + info['hidden'] = info.get('hidden') in _TRUE_VALUES + info['editable'] = editable + if not info.get('alias'): + try: + repos = RepositoryManager(self.env).get_repository(reponame) + youngest_rev = repos.get_youngest_rev() + info['rev'] = youngest_rev + info['display_rev'] = repos.display_rev(youngest_rev) + except Exception: + pass + return info diff -Nru trac-0.11.7/trac/versioncontrol/api.py trac-0.12.1~ppa2/trac/versioncontrol/api.py --- trac-0.11.7/trac/versioncontrol/api.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/versioncontrol/api.py 2010-05-01 17:01:31.000000000 +0100 @@ -15,22 +15,23 @@ # Author: Christopher Lenz import os.path +import time -try: - import threading -except ImportError: - import dummy_threading as threading - threading._get_ident = lambda: 0 - -from trac.config import Option +from trac.admin import AdminCommandError, IAdminCommandProvider +from trac.config import ListOption, Option from trac.core import * -from trac.perm import PermissionError -from trac.resource import IResourceManager, ResourceSystem, ResourceNotFound -from trac.util.text import to_unicode +from trac.resource import IResourceManager, Resource, ResourceNotFound +from trac.util import threading +from trac.util.text import printout, to_unicode from trac.util.translation import _ from trac.web.api import IRequestFilter +def is_default(reponame): + """Check whether `reponame` is the default repository.""" + return not reponame or reponame in ('(default)', _('(default)')) + + class IRepositoryConnector(Interface): """Provide support for a specific version control system.""" @@ -51,125 +52,612 @@ store an error message or exception relevant to the problem detected. """ - def get_repository(repos_type, repos_dir, authname): + def get_repository(repos_type, repos_dir, params): """Return a Repository instance for the given repository type and dir. """ -class RepositoryManager(Component): - """Component registering the supported version control systems, +class IRepositoryProvider(Interface): + """Provide known named instances of Repository.""" + + def get_repositories(): + """Generate repository information for known repositories. + + Repository information is a key,value pair, where the value is + a dictionary which must contain at the very least either of the + following entries: + - `'dir'`: the repository directory which can be used by the + connector to create a `Repository` instance. This defines + a "real" repository. + - `'alias'`: the name of another repository. This defines an alias to + another (real) repository. + Optional entries: + - `'type'`: the type of the repository (if not given, the default + repository type will be used). + - `'description'`: a description of the repository (can contain + WikiFormatting). + - `'hidden'`: if set to `'true'`, the repository is hidden from the + repository index. + - `'url'`: the base URL for checking out the repository. + """ + + +class IRepositoryChangeListener(Interface): + """Listen for changes in repositories.""" + + def changeset_added(repos, changeset): + """Called after a changeset has been added to a repository.""" + + def changeset_modified(repos, changeset, old_changeset): + """Called after a changeset has been modified in a repository. + + The `old_changeset` argument contains the metadata of the changeset + prior to the modification. It is `None` if the old metadata cannot + be retrieved. + """ - It provides easy access to the configured implementation. - """ - implements(IRequestFilter, IResourceManager) +class DbRepositoryProvider(Component): + """Component providing repositories registered in the DB.""" + + implements(IRepositoryProvider, IAdminCommandProvider) + + repository_attrs = ('alias', 'description', 'dir', 'hidden', 'name', + 'type', 'url') + + # IRepositoryProvider methods + + def get_repositories(self): + """Retrieve repositories specified in the repository DB table.""" + db = self.env.get_db_cnx() + cursor = db.cursor() + cursor.execute("SELECT id,name,value FROM repository " + "WHERE name IN (%s)" % ",".join( + "'%s'" % each for each in self.repository_attrs)) + repos = {} + for id, name, value in cursor: + if value is not None: + repos.setdefault(id, {})[name] = value + reponames = {} + for id, info in repos.iteritems(): + if 'name' in info and ('dir' in info or 'alias' in info): + info['id'] = id + reponames[info['name']] = info + return reponames.iteritems() + + # IAdminCommandProvider methods + + def get_admin_commands(self): + yield ('repository add', ' [type]', + 'Add a source repository', + self._complete_add, self._do_add) + yield ('repository alias', ' ', + 'Create an alias for a repository', + self._complete_alias, self._do_alias) + yield ('repository remove', '', + 'Remove a source repository', + self._complete_repos, self._do_remove) + yield ('repository set', ' ', + """Set an attribute of a repository + + The following keys are supported: %s + """ % ', '.join(self.repository_attrs), + self._complete_set, self._do_set) + + def get_reponames(self): + rm = RepositoryManager(self.env) + return [reponame or '(default)' for reponame + in rm.get_all_repositories()] + + def _complete_add(self, args): + if len(args) == 2: + return get_dir_list(args[-1], True) + elif len(args) == 3: + return RepositoryManager(self.env).get_supported_types() + + def _complete_alias(self, args): + if len(args) == 2: + return self.get_reponames() + + def _complete_repos(self, args): + if len(args) == 1: + return self.get_reponames() + + def _complete_set(self, args): + if len(args) == 1: + return self.get_reponames() + elif len(args) == 2: + return self.repository_attrs + + def _do_add(self, reponame, dir, type_=None): + self.add_repository(reponame, dir, type_) + + def _do_alias(self, reponame, target): + self.add_alias(reponame, target) + + def _do_remove(self, reponame): + self.remove_repository(reponame) + + def _do_set(self, reponame, key, value): + if key not in self.repository_attrs: + raise AdminCommandError(_('Invalid key "%(key)s"', key=key)) + self.modify_repository(reponame, {key: value}) + if not reponame: + reponame = '(default)' + if key == 'dir': + printout(_('You should now run "repository resync %(name)s".', + name=reponame)) + elif key == 'type': + printout(_('You may have to run "repository resync %(name)s".', + name=reponame)) + + # Public interface + + def add_repository(self, reponame, dir, type_=None): + """Add a repository.""" + if is_default(reponame): + reponame = '' + rm = RepositoryManager(self.env) + if type_ and type_ not in rm.get_supported_types(): + raise TracError(_("The repository type '%(type)s' is not " + "supported", type=type_)) + @self.env.with_transaction() + def do_add(db): + id = rm.get_repository_id(reponame) + cursor = db.cursor() + cursor.executemany("INSERT INTO repository (id, name, value) " + "VALUES (%s, %s, %s)", + [(id, 'dir', dir), + (id, 'type', type_ or '')]) + rm.reload_repositories() + + def add_alias(self, reponame, target): + """Create an alias repository.""" + if is_default(reponame): + reponame = '' + if is_default(target): + target = '' + rm = RepositoryManager(self.env) + @self.env.with_transaction() + def do_add(db): + id = rm.get_repository_id(reponame) + cursor = db.cursor() + cursor.executemany("INSERT INTO repository (id, name, value) " + "VALUES (%s, %s, %s)", + [(id, 'dir', None), + (id, 'alias', target)]) + rm.reload_repositories() + + def remove_repository(self, reponame): + """Remove a repository.""" + if is_default(reponame): + reponame = '' + rm = RepositoryManager(self.env) + @self.env.with_transaction() + def do_remove(db): + id = rm.get_repository_id(reponame) + cursor = db.cursor() + cursor.execute("DELETE FROM repository WHERE id=%s", (id,)) + cursor.execute("DELETE FROM revision WHERE repos=%s", (id,)) + cursor.execute("DELETE FROM node_change WHERE repos=%s", (id,)) + rm.reload_repositories() + + def modify_repository(self, reponame, changes): + """Modify attributes of a repository.""" + if is_default(reponame): + reponame = '' + rm = RepositoryManager(self.env) + @self.env.with_transaction() + def do_modify(db): + cursor = db.cursor() + id = rm.get_repository_id(reponame) + for (k, v) in changes.iteritems(): + if k not in self.repository_attrs: + continue + if k in ('alias', 'name') and is_default(v): + v = '' + cursor.execute("UPDATE repository SET value=%s " + "WHERE id=%s AND name=%s", (v, id, k)) + cursor.execute("SELECT value FROM repository " + "WHERE id=%s AND name=%s", (id, k)) + if not cursor.fetchone(): + cursor.execute("INSERT INTO repository (id, name, value) " + "VALUES (%s, %s, %s)", (id, k, v)) + rm.reload_repositories() + + +class RepositoryManager(Component): + """Version control system manager.""" + + implements(IRequestFilter, IResourceManager, IRepositoryProvider) connectors = ExtensionPoint(IRepositoryConnector) + providers = ExtensionPoint(IRepositoryProvider) + change_listeners = ExtensionPoint(IRepositoryChangeListener) repository_type = Option('trac', 'repository_type', 'svn', - """Repository connector type. (''since 0.10'')""") + """Default repository connector type. (''since 0.10'') + + This is also used as the default repository type for repositories + defined in [[TracIni#repositories-section repositories]] or using the + "Repositories" admin panel. (''since 0.12'') + """) + repository_dir = Option('trac', 'repository_dir', '', - """Path to local repository. This can also be a relative path - (''since 0.11'').""") + """Path to the default repository. This can also be a relative path + (''since 0.11''). + + This option is deprecated, and repositories should be defined in the + [[TracIni#repositories-section repositories]] section, or using the + "Repositories" admin panel. (''since 0.12'')""") + + repository_sync_per_request = ListOption('trac', + 'repository_sync_per_request', '(default)', + doc="""List of repositories that should be synchronized on every page + request. + + Leave this option empty if you have set up post-commit hooks calling + `trac-admin $ENV changeset added` on all your repositories + (recommended). Otherwise, set it to a comma-separated list of + repository names. Note that this will negatively affect performance, + and will prevent changeset listeners from receiving events from the + repositories specified here. The default is to synchronize the default + repository, for backward compatibility. (''since 0.12'')""") def __init__(self): self._cache = {} self._lock = threading.Lock() - self._connector = None + self._connectors = None + self._all_repositories = None # IRequestFilter methods def pre_process_request(self, req, handler): from trac.web.chrome import Chrome, add_warning if handler is not Chrome(self.env): - try: - self.get_repository(req.authname).sync() - except TracError, e: - add_warning(req, _("Can't synchronize with the repository " - "(%(error)s). Look in the Trac log for more " - "information.", error=to_unicode(e.message))) - + for reponame in self.repository_sync_per_request: + start = time.time() + if is_default(reponame): + reponame = '' + try: + repo = self.get_repository(reponame) + if repo: + repo.sync() + except TracError, e: + add_warning(req, + _("Can't synchronize with repository \"%(name)s\" " + "(%(error)s). Look in the Trac log for more " + "information.", name=reponame or '(default)', + error=to_unicode(e.message))) + self.log.info("Synchronized '%s' repository in %0.2f seconds", + reponame, time.time() - start) return handler - def post_process_request(self, req, template, content_type): - return (template, content_type) + def post_process_request(self, req, template, data, content_type): + return (template, data, content_type) # IResourceManager methods def get_resource_realms(self): yield 'changeset' yield 'source' + yield 'repository' def get_resource_description(self, resource, format=None, **kwargs): if resource.realm == 'changeset': - return _("Changeset %(rev)s", rev=resource.id) + reponame, id = resource.parent.id, resource.id + if reponame: + return _("Changeset %(rev)s in %(repo)s", rev=id, repo=reponame) + else: + return _("Changeset %(rev)s", rev=id) elif resource.realm == 'source': + reponame, id = resource.parent.id, resource.id version = '' if format == 'summary': - repos = resource.env.get_repository() # no perm.username! + repos = self.get_repository(reponame) node = repos.get_node(resource.id, resource.version) if node.isdir: - kind = _("Directory") + kind = _("directory") elif node.isfile: - kind = _("File") + kind = _("file") if resource.version: - version = _("at version %(rev)s", rev=resource.version) + version = _(" at version %(rev)s", rev=resource.version) else: - kind = _("Path") + kind = _("path") if resource.version: version = '@%s' % resource.version - return '%s %s%s' % (kind, resource.id, version) + in_repo = reponame and _(" in %(repo)s", repo=reponame) or '' + # TRANSLATOR: file /trunk/setup.py at version 13 in trac + return _('%(kind)s %(id)%(at_version)s%(in_repo)s', + kind=kind, id=id, at_version=version, in_repo=in_repo) + elif resource.realm == 'repository': + return _("Repository %(repo)s", repo=resource.id) + + def get_resource_url(self, resource, href, **kwargs): + if resource.realm == 'changeset': + return href.changeset(resource.id, resource.parent.id or None) + elif resource.realm == 'source': + return href.source(resource.parent.id or None, resource.id) + elif resource.realm == 'repository': + return href.source(resource.id or None) + + # IRepositoryProvider methods + + def get_repositories(self): + """Retrieve repositories specified in TracIni. + + The `[repositories]` section can be used to specify a list + of repositories. + """ + repositories = self.config['repositories'] + reponames = {} + # eventually add pre-0.12 default repository + if self.repository_dir: + reponames[''] = {'dir': self.repository_dir} + # first pass to gather the .dir entries + for option in repositories: + if option.endswith('.dir'): + reponames[option[:-4]] = {} + # second pass to gather aliases + for option in repositories: + alias = repositories.get(option) + if '.' not in option: # Support = syntax + option += '.alias' + if option.endswith('.alias') and alias in reponames: + reponames.setdefault(option[:-6], {})['alias'] = alias + # third pass to gather the . entries + for option in repositories: + if '.' in option: + name, detail = option.rsplit('.', 1) + if name in reponames and detail != 'alias': + reponames[name][detail] = repositories.get(option) + + for reponame, info in reponames.iteritems(): + yield (reponame, info) # Public API methods - def get_repository(self, authname): + def get_supported_types(self): + """Return the list of supported repository types.""" + types = set(type_ for connector in self.connectors + for (type_, prio) in connector.get_supported_types() + if prio >= 0) + return list(types) + + def get_repositories_by_dir(self, directory): + """Retrieve the repositories based on the given directory. + + :param directory: the key for identifying the repositories. + :return: list of Repository instances. + """ + directory = os.path.join(os.path.normcase(directory), '') + repositories = [] + for reponame, repoinfo in self.get_all_repositories().iteritems(): + dir = repoinfo.get('dir') + if dir: + dir = os.path.join(os.path.normcase(dir), '') + if dir.startswith(directory): + repos = self.get_repository(reponame) + if repos: + repositories.append(repos) + return repositories + + def get_repository_id(self, reponame): + """Return a unique id for the given repository name.""" + repo_id = [None] + @self.env.with_transaction() + def do_get(db): + cursor = db.cursor() + cursor.execute("SELECT id FROM repository " + "WHERE name='name' AND value=%s", (reponame,)) + for id, in cursor: + repo_id[0] = id + return + cursor.execute("SELECT COALESCE(MAX(id),0) FROM repository") + id = cursor.fetchone()[0] + 1 + cursor.execute("INSERT INTO repository (id, name, value) " + "VALUES (%s,%s,%s)", (id, 'name', reponame)) + repo_id[0] = id + return repo_id[0] + + def get_repository(self, reponame): + """Retrieve the appropriate Repository for the given name. + + :param reponame: the key for specifying the repository. + If no name is given, take the default + repository. + :return: if no corresponding repository was defined, + simply return `None`. + """ + reponame = reponame or '' + repoinfo = self.get_all_repositories().get(reponame, {}) + if 'alias' in repoinfo: + reponame = repoinfo['alias'] + repoinfo = self.get_all_repositories().get(reponame, {}) + rdir = repoinfo.get('dir') + if not rdir: + return None + rtype = repoinfo.get('type') or self.repository_type + + # get a Repository for the reponame (use a thread-level cache) db = self.env.get_db_cnx() # prevent possible deadlock, see #4465 try: self._lock.acquire() - if not self._connector: - candidates = [ - (prio, connector) - for connector in self.connectors - for repos_type, prio in connector.get_supported_types() - if repos_type == self.repository_type - ] - if candidates: - prio, connector = max(candidates) - if prio < 0: # error condition - raise TracError( - _('Unsupported version control system "%(name)s"' - ': "%(error)s" ', name=self.repository_type, - error=to_unicode(connector.error))) - self._connector = connector - else: - raise TracError( - _('Unsupported version control system "%(name)s": ' - 'Can\'t find an appropriate component, maybe the ' - 'corresponding plugin was not enabled? ', - name=self.repository_type)) tid = threading._get_ident() if tid in self._cache: - repos = self._cache[tid] + repositories = self._cache[tid] else: - rtype, rdir = self.repository_type, self.repository_dir + repositories = self._cache[tid] = {} + repos = repositories.get(reponame) + if not repos: if not os.path.isabs(rdir): rdir = os.path.join(self.env.path, rdir) - repos = self._connector.get_repository(rtype, rdir, authname) - self._cache[tid] = repos + connector = self._get_connector(rtype) + repos = connector.get_repository(rtype, rdir, repoinfo.copy()) + repositories[reponame] = repos return repos finally: self._lock.release() + def get_repository_by_path(self, path): + """Retrieve a matching Repository for the given path. + + :param path: the eventually scoped repository-scoped path + :return: a `(reponame, repos, path)` triple, where `path` is + the remaining part of `path` once the `reponame` has + been truncated, if needed. + """ + matches = [] + path = path and path.strip('/') + '/' or '/' + for reponame in self.get_all_repositories().keys(): + stripped_reponame = reponame.strip('/') + '/' + if path.startswith(stripped_reponame): + matches.append((len(stripped_reponame), reponame)) + if matches: + matches.sort() + length, reponame = matches[-1] + path = path[length:] + else: + reponame = '' + return (reponame, self.get_repository(reponame), + path.rstrip('/') or '/') + + def get_default_repository(self, context): + """Recover the appropriate repository from the current context. + + Lookup the closest source or changeset resource in the context + hierarchy and return the name of its associated repository. + """ + while context: + if context.resource.realm in ('source', 'changeset'): + return context.resource.parent.id + context = context.parent + + def get_all_repositories(self): + """Return a dictionary of repository information, indexed by name.""" + if not self._all_repositories: + self._all_repositories = {} + for provider in self.providers: + for reponame, info in provider.get_repositories(): + if reponame in self._all_repositories: + self.log.warn("Discarding duplicate repository '%s'", + reponame) + else: + info['name'] = reponame + if 'id' not in info: + info['id'] = self.get_repository_id(reponame) + self._all_repositories[reponame] = info + return self._all_repositories + + def get_real_repositories(self): + """Return a set of all real repositories (i.e. excluding aliases).""" + repositories = set() + for reponame in self.get_all_repositories(): + try: + repos = self.get_repository(reponame) + if repos is not None: + repositories.add(repos) + except TracError: + pass # Skip invalid repositories + return repositories + + def reload_repositories(self): + """Reload the repositories from the providers.""" + self._lock.acquire() + try: + # FIXME: trac-admin doesn't reload the environment + self._cache = {} + self._all_repositories = None + finally: + self._lock.release() + self.config.touch() # Force environment reload + + def notify(self, event, reponame, revs): + """Notify repositories and change listeners about repository events. + + The supported events are the names of the methods defined in the + `IRepositoryChangeListener` interface. + """ + self.log.debug("Event %s on %s for changesets %r", + event, reponame, revs) + + # Notify a repository by name, and all repositories with the same + # base, or all repositories by base or by repository dir + repos = self.get_repository(reponame) + repositories = [] + if repos: + base = repos.get_base() + else: + repositories = self.get_repositories_by_dir(reponame) + if repositories: + base = None + else: + base = reponame + if base: + repositories = [r for r in self.get_real_repositories() + if r.get_base() == base] + if not repositories: + self.log.warn("Found no repositories matching '%s' base.", + base or reponame) + return + for repos in sorted(repositories, key=lambda r: r.reponame): + repos.sync() + for rev in revs: + args = [] + if event == 'changeset_modified': + args.append(repos.sync_changeset(rev)) + try: + changeset = repos.get_changeset(rev) + except NoSuchChangeset: + continue + self.log.debug("Event %s on %s for revision %s", + event, repos.reponame or '(default)', rev) + for listener in self.change_listeners: + getattr(listener, event)(repos, changeset, *args) + def shutdown(self, tid=None): if tid: assert tid == threading._get_ident() try: self._lock.acquire() - repos = self._cache.pop(tid, None) - if repos: + repositories = self._cache.pop(tid, {}) + for reponame, repos in repositories.iteritems(): repos.close() finally: self._lock.release() + + # private methods + + def _get_connector(self, rtype): + """Retrieve the appropriate connector for the given repository type. + + Note that the self._lock must be held when calling this method. + """ + if self._connectors is None: + # build an environment-level cache for the preferred connectors + self._connectors = {} + for connector in self.connectors: + for type_, prio in connector.get_supported_types(): + keep = (connector, prio) + if type_ in self._connectors and \ + prio <= self._connectors[type_][1]: + keep = None + if keep: + self._connectors[type_] = keep + if rtype in self._connectors: + connector, prio = self._connectors[rtype] + if prio >= 0: # no error condition + return connector + else: + raise TracError( + _('Unsupported version control system "%(name)s"' + ': %(error)s', name=rtype, + error=to_unicode(connector.error))) + else: + raise TracError( + _('Unsupported version control system "%(name)s": ' + 'Can\'t find an appropriate component, maybe the ' + 'corresponding plugin was not enabled? ', name=rtype)) class NoSuchChangeset(ResourceNotFound): @@ -179,24 +667,52 @@ rev=rev), _('No such changeset')) + class NoSuchNode(ResourceNotFound): def __init__(self, path, rev, msg=None): - ResourceNotFound.__init__(self, "%sNo node %s at revision %s" % - ((msg and '%s: ' % msg) or '', path, rev), - _('No such node')) + if msg is None: + msg = _("No node %(path)s at revision %(rev)s", path=path, rev=rev) + else: + msg = _("%(msg)s: No node %(path)s at revision %(rev)s", + msg=msg, path=path, rev=rev) + ResourceNotFound.__init__(self, msg, _('No such node')) + class Repository(object): """Base class for a repository provided by a version control system.""" - def __init__(self, name, authz, log): + def __init__(self, name, params, log): + """Initialize a repository. + + :param name: a unique name identifying the repository, usually a + type-specific prefix followed by the path to the + repository. + :param params: a `dict` of parameters for the repository. Contains + the name of the repository under the key "name" and + the surrogate key that identifies the repository in + the database under the key "id". + :param log: a logger instance. + """ self.name = name - self.authz = authz or Authorizer() + self.params = params + self.reponame = params['name'] + self.id = params['id'] self.log = log + self.resource = Resource('repository', self.reponame) def close(self): """Close the connection to the repository.""" raise NotImplementedError + def get_base(self): + """Return the name of the base repository for this repository. + + This function returns the name of the base repository to which scoped + repositories belong. For non-scoped repositories, it returns the + repository name. + """ + return self.name + def clear(self, youngest_rev=None): """Clear any data that may have been cached in instance properties. @@ -205,19 +721,24 @@ """ pass - def sync(self, rev_callback=None): + def sync(self, rev_callback=None, clean=False): """Perform a sync of the repository cache, if relevant. If given, `rev_callback` must be a callable taking a `rev` parameter. The backend will call this function for each `rev` it decided to synchronize, once the synchronization changes are committed to the - cache. + cache. When `clean` is `True`, the cache is cleaned first. """ pass def sync_changeset(self, rev): - """Resync the repository cache for the given `rev`, if relevant.""" - raise NotImplementedError + """Resync the repository cache for the given `rev`, if relevant. + + Returns a "metadata-only" changeset containing the metadata prior to + the resync, or `None` if the old values cannot be retrieved (typically + when the repository is not cached). + """ + return None def get_quickjump_entries(self, rev): """Generate a list of interesting places in the repository. @@ -229,21 +750,36 @@ """ return [] + def get_path_url(self, path, rev): + """Return the repository URL for the given path and revision. + + The returned URL can be `None`, meaning that no URL has been specified + for the repository, an absolute URL, or a scheme-relative URL starting + with `//`, in which case the scheme of the request should be prepended. + """ + return None + def get_changeset(self, rev): - """Retrieve a Changeset corresponding to the given revision `rev`.""" + """Retrieve a Changeset corresponding to the given revision `rev`.""" raise NotImplementedError + def get_changeset_uid(self, rev): + """Return a globally unique identifier for the ''rev'' changeset. + + Two changesets from different repositories can sometimes refer to + the ''very same'' changeset (e.g. the repositories are clones). + """ + def get_changesets(self, start, stop): """Generate Changeset belonging to the given time period (start, stop). """ rev = self.youngest_rev while rev: - if self.authz.has_permission_for_changeset(rev): - chgset = self.get_changeset(rev) - if chgset.date < start: - return - if chgset.date < stop: - yield chgset + chgset = self.get_changeset(rev) + if chgset.date < start: + return + if chgset.date < stop: + yield chgset rev = self.previous_rev(rev) def has_node(self, path, rev=None): @@ -309,7 +845,7 @@ return row and row[0] or None def get_path_history(self, path, rev=None, limit=None): - """Retrieve all the revisions containing this path + """Retrieve all the revisions containing this path. If given, `rev` is used as a starting point (i.e. no revision ''newer'' than `rev` should be returned). @@ -322,7 +858,7 @@ raise NotImplementedError def normalize_rev(self, rev): - """Return a canonical representation of a revision. + """Return a (unique) canonical representation of a revision. It's up to the backend to decide which string values of `rev` (usually provided by the user) should be accepted, and how they @@ -337,6 +873,15 @@ def short_rev(self, rev): """Return a compact representation of a revision in the repos.""" return self.normalize_rev(rev) + + def display_rev(self, rev): + """Return a representation of a revision in the repos for displaying to + the user. + + This can be a shortened revision string, e.g. for repositories using + long hashes. + """ + return self.normalize_rev(rev) def get_changes(self, old_path, old_rev, new_path, new_rev, ignore_ancestry=1): @@ -350,6 +895,10 @@ """ raise NotImplementedError + def can_view(self, perm): + """Return True if view permission is granted on the repository.""" + return 'BROWSER_VIEW' in perm(self.resource.child('source', '/')) + class Node(object): """Represents a directory or file in the repository at a given revision.""" @@ -357,6 +906,10 @@ DIRECTORY = "dir" FILE = "file" + resource = property(lambda self: Resource('source', self.created_path, + version=self.created_rev, + parent=self.repos.resource)) + # created_path and created_rev properties refer to the Node "creation" # in the Subversion meaning of a Node in a versioned tree (see #3340). # @@ -365,9 +918,10 @@ created_rev = None created_path = None - def __init__(self, path, rev, kind): + def __init__(self, repos, path, rev, kind): assert kind in (Node.DIRECTORY, Node.FILE), \ "Unknown node kind %s" % kind + self.repos = repos self.path = to_unicode(path) self.rev = rev self.kind = kind @@ -457,6 +1011,11 @@ isdir = property(lambda x: x.kind == Node.DIRECTORY) isfile = property(lambda x: x.kind == Node.FILE) + def can_view(self, perm): + """Return True if view permission is granted on the node.""" + return (self.isdir and 'BROWSER_VIEW' or 'FILE_VIEW') \ + in perm(self.resource) + class Changeset(object): """Represents a set of changes committed at once in a repository.""" @@ -472,12 +1031,16 @@ OTHER_CHANGES = (ADD, DELETE) ALL_CHANGES = DIFF_CHANGES + OTHER_CHANGES - def __init__(self, rev, message, author, date): + resource = property(lambda self: Resource('changeset', self.rev, + parent=self.repos.resource)) + + def __init__(self, repos, rev, message, author, date): + self.repos = repos self.rev = rev self.message = message or '' self.author = author or '' self.date = date - + def get_properties(self): """Returns the properties (meta-data) of the node, as a dictionary. @@ -490,7 +1053,7 @@ return [] def get_changes(self): - """Generator that produces a tuple for every change in the changeset + """Generator that produces a tuple for every change in the changeset. The tuple will contain `(path, kind, change, base_path, base_rev)`, where `change` can be one of Changeset.ADD, Changeset.COPY, @@ -503,36 +1066,20 @@ """ raise NotImplementedError + def get_branches(self): + """Yield branches to which this changeset belong. + Each branch is given as a pair `(name, head)`, where `name` is + the branch name and `head` a flag set if the changeset is a head + for this branch (i.e. if it has no children changeset). + """ + return [] -class PermissionDenied(PermissionError): - """Exception raised by an authorizer. - - This exception is raise if the user has insufficient permissions - to view a specific part of the repository. - """ - def __str__(self): - return self.action - - -class Authorizer(object): - """Controls the view access to parts of the repository. - - Base class for authorizers that are responsible to granting or denying - access to view certain parts of a repository. - """ - - def assert_permission(self, path): - if not self.has_permission(path): - raise PermissionDenied(_('Insufficient permissions to access ' - '%(path)s', path=path)) - - def assert_permission_for_changeset(self, rev): - if not self.has_permission_for_changeset(rev): - raise PermissionDenied(_('Insufficient permissions to access ' - 'changeset %(id)s', id=rev)) + def can_view(self, perm): + """Return True if view permission is granted on the changeset.""" + return 'CHANGESET_VIEW' in perm(self.resource) - def has_permission(self, path): - return True - def has_permission_for_changeset(self, rev): - return True +# Note: Since Trac 0.12, Exception PermissionDenied class is gone, +# and class Authorizer is gone as well. +# +# Fine-grained permissions are now handled via normal permission policies. diff -Nru trac-0.11.7/trac/versioncontrol/cache.py trac-0.12.1~ppa2/trac/versioncontrol/cache.py --- trac-0.11.7/trac/versioncontrol/cache.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/versioncontrol/cache.py 2010-04-05 20:19:13.000000000 +0100 @@ -14,15 +14,13 @@ # # Author: Christopher Lenz -from datetime import datetime import os -import posixpath +from trac.cache import cached from trac.core import TracError -from trac.util.datefmt import utc, to_timestamp +from trac.util.datefmt import from_utimestamp, to_utimestamp from trac.util.translation import _ -from trac.versioncontrol import Changeset, Node, Repository, Authorizer, \ - NoSuchChangeset +from trac.versioncontrol import Changeset, Node, Repository, NoSuchChangeset _kindmap = {'D': Node.DIRECTORY, 'F': Node.FILE} @@ -42,333 +40,412 @@ scope = property(lambda self: self.repos.scope) - def __init__(self, getdb, repos, authz, log): - Repository.__init__(self, repos.name, authz, log) - if callable(getdb): - self.getdb = getdb - else: - self.getdb = lambda: getdb + def __init__(self, env, repos, log): + self.env = env self.repos = repos + self._metadata_id = (self.__class__.__module__ + '.' + + self.__class__.__name__ + '.metadata:' + + str(self.repos.id)) + Repository.__init__(self, repos.name, repos.params, log) def close(self): self.repos.close() + def get_base(self): + return self.repos.get_base() + def get_quickjump_entries(self, rev): - for category, name, path, rev in self.repos.get_quickjump_entries(rev): - yield category, name, path, rev + return self.repos.get_quickjump_entries(self.normalize_rev(rev)) + + def get_path_url(self, path, rev): + return self.repos.get_path_url(path, rev) def get_changeset(self, rev): - return CachedChangeset(self.repos, self.repos.normalize_rev(rev), - self.getdb, self.authz) + return CachedChangeset(self, self.normalize_rev(rev), self.env) + + def get_changeset_uid(self, rev): + return self.repos.get_changeset_uid(rev) def get_changesets(self, start, stop): - db = self.getdb() + db = self.env.get_db_cnx() cursor = db.cursor() cursor.execute("SELECT rev FROM revision " - "WHERE time >= %s AND time < %s " + "WHERE repos=%s AND time >= %s AND time < %s " "ORDER BY time DESC, rev DESC", - (to_timestamp(start), to_timestamp(stop))) + (self.id, to_utimestamp(start), to_utimestamp(stop))) for rev, in cursor: try: - if self.authz.has_permission_for_changeset(rev): - yield self.get_changeset(rev) + yield self.get_changeset(rev) except NoSuchChangeset: pass # skip changesets currently being resync'ed def sync_changeset(self, rev): cset = self.repos.get_changeset(rev) - db = self.getdb() - cursor = db.cursor() - cursor.execute("UPDATE revision SET time=%s, author=%s, message=%s " - "WHERE rev=%s", (to_timestamp(cset.date), - cset.author, cset.message, - (str(cset.rev)))) - db.commit() - - def sync(self, feedback=None): - db = self.getdb() + srev = self.db_rev(cset.rev) + old_cset = [None] + + @self.env.with_transaction() + def do_sync(db): + cursor = db.cursor() + cursor.execute(""" + SELECT time,author,message FROM revision + WHERE repos=%s AND rev=%s + """, (self.id, srev)) + for time, author, message in cursor: + old_cset[0] = Changeset(self.repos, cset.rev, message, author, + from_utimestamp(time)) + cursor.execute(""" + UPDATE revision SET time=%s, author=%s, message=%s + WHERE repos=%s AND rev=%s + """, (to_utimestamp(cset.date), cset.author, cset.message, + self.id, srev)) + return old_cset[0] + + @cached('_metadata_id') + def metadata(self, db): + """Retrieve data for the cached `metadata` attribute.""" cursor = db.cursor() - cursor.execute("SELECT name, value FROM system WHERE name IN (%s)" % - ','.join(["'%s'" % key for key in CACHE_METADATA_KEYS])) - metadata = {} - for name, value in cursor: - metadata[name] = value - - # -- check that we're populating the cache for the correct repository - repository_dir = metadata.get(CACHE_REPOSITORY_DIR) - if repository_dir: - # directory part of the repo name can vary on case insensitive fs - if os.path.normcase(repository_dir) != os.path.normcase(self.name): - self.log.info("'repository_dir' has changed from %r to %r" - % (repository_dir, self.name)) - raise TracError(_("The 'repository_dir' has changed, a " - "'trac-admin resync' operation is needed.")) - elif repository_dir is None: # - self.log.info('Storing initial "repository_dir": %s' % self.name) - cursor.execute("INSERT INTO system (name,value) VALUES (%s,%s)", - (CACHE_REPOSITORY_DIR, self.name,)) - else: # 'repository_dir' cleared by a resync - self.log.info('Resetting "repository_dir": %s' % self.name) - cursor.execute("UPDATE system SET value=%s WHERE name=%s", - (self.name, CACHE_REPOSITORY_DIR)) + cursor.execute("SELECT name, value FROM repository " + "WHERE id=%%s AND name IN (%s)" % + ','.join(['%s'] * len(CACHE_METADATA_KEYS)), + (self.id,) + CACHE_METADATA_KEYS) + return dict(cursor) + + def sync(self, feedback=None, clean=False): + if clean: + self.log.info('Cleaning cache') + @self.env.with_transaction() + def do_clean(db): + cursor = db.cursor() + cursor.execute("DELETE FROM revision WHERE repos=%s", + (self.id,)) + cursor.execute("DELETE FROM node_change WHERE repos=%s", + (self.id,)) + cursor.executemany(""" + DELETE FROM repository WHERE id=%s AND name=%s + """, [(self.id, k) for k in CACHE_METADATA_KEYS]) + cursor.executemany(""" + INSERT INTO repository (id,name,value) VALUES (%s,%s,%s) + """, [(self.id, k, '') for k in CACHE_METADATA_KEYS]) + del self.metadata - db.commit() # save metadata changes made up to now + metadata = self.metadata + + @self.env.with_transaction() + def do_transaction(db): + cursor = db.cursor() + invalidate = False + + # -- check that we're populating the cache for the correct + # repository + repository_dir = metadata.get(CACHE_REPOSITORY_DIR) + if repository_dir: + # directory part of the repo name can vary on case insensitive + # fs + if os.path.normcase(repository_dir) \ + != os.path.normcase(self.name): + self.log.info("'repository_dir' has changed from %r to %r", + repository_dir, self.name) + raise TracError(_("The 'repository_dir' has changed, a " + "'trac-admin $ENV repository resync' " + "operation is needed.")) + elif repository_dir is None: # + self.log.info('Storing initial "repository_dir": %s', + self.name) + cursor.execute(""" + INSERT INTO repository (id,name,value) VALUES (%s,%s,%s) + """, (self.id, CACHE_REPOSITORY_DIR, self.name)) + invalidate = True + else: # 'repository_dir' cleared by a resync + self.log.info('Resetting "repository_dir": %s', self.name) + cursor.execute(""" + UPDATE repository SET value=%s WHERE id=%s AND name=%s + """, (self.name, self.id, CACHE_REPOSITORY_DIR)) + invalidate = True + + # -- insert a 'youngeset_rev' for the repository if necessary + if metadata.get(CACHE_YOUNGEST_REV) is None: + cursor.execute(""" + INSERT INTO repository (id,name,value) VALUES (%s,%s,%s) + """, (self.id, CACHE_YOUNGEST_REV, '')) + invalidate = True + + if invalidate: + del self.metadata - # -- retrieve the youngest revision in the repository + # -- retrieve the youngest revision in the repository and the youngest + # revision cached so far self.repos.clear() repos_youngest = self.repos.youngest_rev + youngest = metadata.get(CACHE_YOUNGEST_REV) - # -- retrieve the youngest revision cached so far - if CACHE_YOUNGEST_REV not in metadata: - raise TracError(_('Missing "youngest_rev" in cache metadata')) - - self.youngest = metadata[CACHE_YOUNGEST_REV] - - if self.youngest: - self.youngest = self.repos.normalize_rev(self.youngest) - if not self.youngest: - self.log.debug('normalize_rev failed (youngest_rev=%r)' % + # -- verify and normalize youngest revision + if youngest: + youngest = self.repos.normalize_rev(youngest) + if not youngest: + self.log.debug('normalize_rev failed (youngest_rev=%r)', self.youngest_rev) else: - self.log.debug('cache metadata undefined (youngest_rev=%r)' % + self.log.debug('cache metadata undefined (youngest_rev=%r)', self.youngest_rev) - self.youngest = None + youngest = None # -- compare them and try to resync if different - if self.youngest != repos_youngest: - self.log.info("repos rev [%s] != cached rev [%s]" % - (repos_youngest, self.youngest)) - if self.youngest: - next_youngest = self.repos.next_rev(self.youngest) + next_youngest = None + if youngest != repos_youngest: + self.log.info("repos rev [%s] != cached rev [%s]", + repos_youngest, youngest) + if youngest: + next_youngest = self.repos.next_rev(youngest) else: - next_youngest = None try: next_youngest = self.repos.oldest_rev # Ugly hack needed because doing that everytime in # oldest_rev suffers from horrendeous performance (#5213) if hasattr(self.repos, 'scope'): if self.repos.scope != '/': - next_youngest = self.repos.next_rev(next_youngest, + next_youngest = self.repos.next_rev(next_youngest, find_initial_rev=True) next_youngest = self.repos.normalize_rev(next_youngest) except TracError: - return # can't normalize oldest_rev: repository was empty + # can't normalize oldest_rev: repository was empty + return if next_youngest is None: # nothing to cache yet return + srev = self.db_rev(next_youngest) # 0. first check if there's no (obvious) resync in progress - cursor.execute("SELECT rev FROM revision WHERE rev=%s", - (str(next_youngest),)) + db = self.env.get_read_db() + cursor = db.cursor() + cursor.execute(""" + SELECT rev FROM revision WHERE repos=%s AND rev=%s + """, (self.id, srev)) for rev, in cursor: # already there, but in progress, so keep ''previous'' # notion of 'youngest' - self.repos.clear(youngest_rev=self.youngest) + self.repos.clear(youngest_rev=youngest) return # 1. prepare for resyncing # (there still might be a race condition at this point) - authz = self.repos.authz - self.repos.authz = Authorizer() # remove permission checking - kindmap = dict(zip(_kindmap.values(), _kindmap.keys())) actionmap = dict(zip(_actionmap.values(), _actionmap.keys())) - try: - while next_youngest is not None: + while next_youngest is not None: + srev = self.db_rev(next_youngest) + exit = [False] + + @self.env.with_transaction() + def do_transaction(db): + cursor = db.cursor() # 1.1 Attempt to resync the 'revision' table - self.log.info("Trying to sync revision [%s]" % + self.log.info("Trying to sync revision [%s]", next_youngest) cset = self.repos.get_changeset(next_youngest) try: - cursor.execute("INSERT INTO revision " - " (rev,time,author,message) " - "VALUES (%s,%s,%s,%s)", - (str(next_youngest), - to_timestamp(cset.date), - cset.author, cset.message)) + cursor.execute(""" + INSERT INTO revision + (repos,rev,time,author,message) + VALUES (%s,%s,%s,%s,%s) + """, (self.id, srev, to_utimestamp(cset.date), + cset.author, cset.message)) except Exception, e: # *another* 1.1. resync attempt won - self.log.warning('Revision %s already cached: %s' % - (next_youngest, e)) + self.log.warning('Revision %s already cached: %r', + next_youngest, e) # also potentially in progress, so keep ''previous'' # notion of 'youngest' - self.repos.clear(youngest_rev=self.youngest) + self.repos.clear(youngest_rev=youngest) + # FIXME: This aborts a containing transaction db.rollback() + exit[0] = True return - + # 1.2. now *only* one process was able to get there # (i.e. there *shouldn't* be any race condition here) - - for path,kind,action,bpath,brev in cset.get_changes(): - self.log.debug("Caching node change in [%s]: %s" - % (next_youngest, - (path,kind,action,bpath,brev))) + + for path, kind, action, bpath, brev in cset.get_changes(): + self.log.debug("Caching node change in [%s]: %r", + next_youngest, + (path, kind, action, bpath, brev)) kind = kindmap[kind] action = actionmap[action] - cursor.execute("INSERT INTO node_change " - " (rev,path,node_type,change_type, " - " base_path,base_rev) " - "VALUES (%s,%s,%s,%s,%s,%s)", - (str(next_youngest), - path, kind, action, bpath, brev)) - - # 1.3. iterate (1.1 should always succeed now) - self.youngest = next_youngest - next_youngest = self.repos.next_rev(next_youngest) - - # 1.4. update 'youngest_rev' metadata + cursor.execute(""" + INSERT INTO node_change + (repos,rev,path,node_type, + change_type,base_path,base_rev) + VALUES (%s,%s,%s,%s,%s,%s,%s) + """, (self.id, srev, path, kind, action, bpath, + brev)) + + # 1.3. update 'youngest_rev' metadata # (minimize possibility of failures at point 0.) - cursor.execute("UPDATE system SET value=%s WHERE name=%s", - (str(self.youngest), CACHE_YOUNGEST_REV)) - db.commit() - - # 1.5. provide some feedback - if feedback: - feedback(self.youngest) - finally: - # 3. restore permission checking (after 1.) - self.repos.authz = authz + cursor.execute(""" + UPDATE repository SET value=%s WHERE id=%s AND name=%s + """, (str(next_youngest), self.id, CACHE_YOUNGEST_REV)) + del self.metadata + + if exit[0]: + return + + # 1.4. iterate (1.1 should always succeed now) + youngest = next_youngest + next_youngest = self.repos.next_rev(next_youngest) + + # 1.5. provide some feedback + if feedback: + feedback(youngest) def get_node(self, path, rev=None): - return self.repos.get_node(path, rev) + return self.repos.get_node(path, self.normalize_rev(rev)) def _get_node_revs(self, path, last=None, first=None): """Return the revisions affecting `path` between `first` and `last` revisions. """ last = self.normalize_rev(last) - node = self.get_node(path, last) # Check node existence and perms - db = self.getdb() + slast = self.db_rev(last) + node = self.get_node(path, last) # Check node existence + db = self.env.get_db_cnx() cursor = db.cursor() - rev_as_int = db.cast('rev', 'int') if first is None: cursor.execute("SELECT rev FROM node_change " - "WHERE path = %%s " + "WHERE repos=%s AND rev<=%s " + " AND path=%s " " AND change_type IN ('A', 'C', 'M') " - " AND %s <= %%s " - "ORDER BY %s DESC " - "LIMIT 1" % ((rev_as_int,) * 2), - (path, last)) + "ORDER BY rev DESC LIMIT 1", + (self.id, slast, path)) first = 0 for row in cursor: first = int(row[0]) + sfirst = self.db_rev(first) cursor.execute("SELECT DISTINCT rev FROM node_change " - "WHERE (path = %%s OR path %s) " - " AND %s >= %%s AND %s <= %%s" % - (db.like(), rev_as_int, rev_as_int), - (path, db.like_escape(path + '/') + '%', first, last)) + "WHERE repos=%%s AND rev>=%%s AND rev<=%%s " + " AND (path=%%s OR path %s)" % db.like(), + (self.id, sfirst, slast, path, + db.like_escape(path + '/') + '%')) return [int(row[0]) for row in cursor] def has_node(self, path, rev=None): - return self.repos.has_node(path, rev) + return self.repos.has_node(path, self.normalize_rev(rev)) def get_oldest_rev(self): return self.repos.oldest_rev def get_youngest_rev(self): - if not hasattr(self, 'youngest'): - self.sync() - return self.youngest + return self.rev_db(self.metadata.get(CACHE_YOUNGEST_REV)) def previous_rev(self, rev, path=''): if self.has_linear_changesets: return self._next_prev_rev('<', rev, path) else: - return self.repos.previous_rev(rev, path) + return self.repos.previous_rev(self.normalize_rev(rev), path) def next_rev(self, rev, path=''): if self.has_linear_changesets: return self._next_prev_rev('>', rev, path) else: - return self.repos.next_rev(rev, path) + return self.repos.next_rev(self.normalize_rev(rev), path) def _next_prev_rev(self, direction, rev, path=''): - db = self.getdb() + srev = self.db_rev(rev) + db = self.env.get_db_cnx() # the changeset revs are sequence of ints: - sql = "SELECT rev FROM node_change WHERE " + \ - db.cast('rev', 'int') + " " + direction + " %s" - args = [rev] + sql = "SELECT rev FROM node_change WHERE repos=%s AND " + \ + "rev" + direction + "%s" + args = [self.id, srev] if path: path = path.lstrip('/') - sql += " AND (" - # changes on path itself - sql += "path=%s " - args.append(path) - sql += " OR " - # changes on path children - sql += "path "+db.like() - args.append(db.like_escape(path+'/') + '%') - sql += " OR " + # changes on path itself or its children + sql += " AND (path=%s OR path " + db.like() + args.extend((path, db.like_escape(path + '/') + '%')) # deletion of path ancestors components = path.lstrip('/').split('/') - for i in range(1, len(components)+1): + parents = ','.join(('%s',) * len(components)) + sql += " OR (path IN (" + parents + ") AND change_type='D'))" + for i in range(1, len(components) + 1): args.append('/'.join(components[:i])) - parent_insert = ','.join(('%s',) * len(components)) - sql += " (path in (" + parent_insert + ") and change_type='D')" - sql += ")" - sql += " ORDER BY " + db.cast('rev', 'int') + \ - (direction == '<' and " DESC" or "") + " LIMIT 1" + sql += " ORDER BY rev" + (direction == '<' and " DESC" or "") \ + + " LIMIT 1" cursor = db.cursor() cursor.execute(sql, args) for rev, in cursor: - return rev + return int(rev) def rev_older_than(self, rev1, rev2): - return self.repos.rev_older_than(rev1, rev2) + return self.repos.rev_older_than(self.normalize_rev(rev1), + self.normalize_rev(rev2)) def get_path_history(self, path, rev=None, limit=None): - return self.repos.get_path_history(path, rev, limit) + return self.repos.get_path_history(path, self.normalize_rev(rev), + limit) def normalize_path(self, path): return self.repos.normalize_path(path) def normalize_rev(self, rev): - return self.repos.normalize_rev(rev) + if rev is None or isinstance(rev, basestring) and \ + rev.lower() in ('', 'head', 'latest', 'youngest'): + return self.rev_db(self.youngest_rev or 0) + else: + try: + rev = int(rev) + if rev <= self.youngest_rev: + return rev + except (ValueError, TypeError): + pass + raise NoSuchChangeset(rev) + + def db_rev(self, rev): + """Convert a revision to its representation in the database.""" + return str(rev) + + def rev_db(self, rev): + """Convert a revision from its representation in the database.""" + return rev def get_changes(self, old_path, old_rev, new_path, new_rev, - ignore_ancestry=1): - return self.repos.get_changes(old_path, old_rev, new_path, new_rev, - ignore_ancestry) + ignore_ancestry=1): + return self.repos.get_changes(old_path, self.normalize_rev(old_rev), + new_path, self.normalize_rev(new_rev), + ignore_ancestry) class CachedChangeset(Changeset): - def __init__(self, repos, rev, getdb, authz): - self.repos = repos - self.getdb = getdb - self.authz = authz - db = self.getdb() + def __init__(self, repos, rev, env): + self.env = env + db = self.env.get_db_cnx() cursor = db.cursor() cursor.execute("SELECT time,author,message FROM revision " - "WHERE rev=%s", (str(rev),)) + "WHERE repos=%s AND rev=%s", + (repos.id, repos.db_rev(rev))) row = cursor.fetchone() if row: _date, author, message = row - date = datetime.fromtimestamp(_date, utc) - Changeset.__init__(self, rev, message, author, date) + date = from_utimestamp(_date) + Changeset.__init__(self, repos, repos.rev_db(rev), message, author, + date) else: raise NoSuchChangeset(rev) - self.scope = getattr(repos, 'scope', '') + self.scope = getattr(repos.repos, 'scope', '') def get_changes(self): - db = self.getdb() + db = self.env.get_db_cnx() cursor = db.cursor() cursor.execute("SELECT path,node_type,change_type,base_path,base_rev " - "FROM node_change WHERE rev=%s " - "ORDER BY path", (str(self.rev),)) - for path, kind, change, base_path, base_rev in cursor: - if not self.authz.has_permission(posixpath.join(self.scope, - path.strip('/'))): - # FIXME: what about the base_path? - continue + "FROM node_change WHERE repos=%s AND rev=%s " + "ORDER BY path", + (self.repos.id, self.repos.db_rev(self.rev))) + for path, kind, change, base_path, base_rev in sorted(cursor): kind = _kindmap[kind] change = _actionmap[change] - yield path, kind, change, base_path, base_rev + yield path, kind, change, base_path, self.repos.rev_db(base_rev) def get_properties(self): - return self.repos.get_changeset(self.rev).get_properties() + return self.repos.repos.get_changeset(self.rev).get_properties() diff -Nru trac-0.11.7/trac/versioncontrol/diff.py trac-0.12.1~ppa2/trac/versioncontrol/diff.py --- trac-0.11.7/trac/versioncontrol/diff.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/versioncontrol/diff.py 2010-03-02 22:37:32.000000000 +0000 @@ -120,7 +120,7 @@ yield group group = [] i1, j1 = max(i1, i2 - n), max(j1, j2 - n) - group.append((tag, i1, i2, j1 ,j2)) + group.append((tag, i1, i2, j1, j2)) if group and not (len(group) == 1 and group[0][0] == 'equal'): if group[-1][0] == 'equal': # Fixup trailing unchanged block @@ -230,8 +230,8 @@ def get_bool_option(name, default=0): pref = int(req.session.get('diff_' + name, default)) - arg = int(req.args.has_key(name)) - if req.args.has_key('update') and arg != pref: + arg = int(name in req.args) + if 'update' in req.args and arg != pref: req.session['diff_' + name] = arg else: arg = pref @@ -239,19 +239,22 @@ pref = req.session.get('diff_style', 'inline') style = req.args.get('style', pref) - if req.args.has_key('update') and style != pref: + if 'update' in req.args and style != pref: req.session['diff_style'] = style data['style'] = style pref = int(req.session.get('diff_contextlines', 2)) try: - arg = int(req.args.get('contextlines', pref)) + context = int(req.args.get('contextlines', pref)) except ValueError: - arg = -1 - if req.args.has_key('update') and arg != pref: - req.session['diff_contextlines'] = arg - options = ['-U%d' % arg] - options_data['contextlines'] = arg + context = -1 + if 'update' in req.args and context != pref: + req.session['diff_contextlines'] = context + options_data['contextlines'] = context + + arg = int(req.args.get('contextall', 0)) + options_data['contextall'] = arg + options = ['-U%d' % (arg and -1 or context)] arg = get_bool_option('ignoreblanklines') if arg: diff -Nru trac-0.11.7/trac/versioncontrol/svn_authz.py trac-0.12.1~ppa2/trac/versioncontrol/svn_authz.py --- trac-0.11.7/trac/versioncontrol/svn_authz.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/versioncontrol/svn_authz.py 2010-03-16 08:51:56.000000000 +0000 @@ -18,34 +18,17 @@ import os.path -from trac.config import Option +from trac.config import Option, PathOption from trac.core import * -from trac.versioncontrol import Authorizer +from trac.perm import IPermissionPolicy +from trac.resource import Resource +from trac.util import read_file +from trac.util.compat import any +from trac.util.text import exception_to_unicode, to_unicode +from trac.util.translation import _ +from trac.versioncontrol.api import RepositoryManager -class SvnAuthzOptions(Component): - - authz_file = Option('trac', 'authz_file', '', - """Path to Subversion - [http://svnbook.red-bean.com/en/1.1/ch06s04.html#svn-ch-6-sect-4.4.2 authorization (authz) file] - """) - - authz_module_name = Option('trac', 'authz_module_name', '', - """The module prefix used in the authz_file.""") - - -def SubversionAuthorizer(env, repos, authname): - authz_file = env.config.get('trac', 'authz_file') - if not authz_file: - return Authorizer() - if not os.path.isabs(authz_file): - authz_file = os.path.join(env.path, authz_file) - if not os.path.exists(authz_file): - env.log.error('[trac] authz_file (%s) does not exist.' % authz_file) - - module_name = env.config.get('trac', 'authz_module_name') - return RealSubversionAuthorizer(repos, authname, module_name, authz_file) - def parent_iter(path): path = path.strip('/') if path: @@ -56,114 +39,167 @@ while 1: yield path if path == '/': - raise StopIteration() + return path = path[:-1] yield path idx = path.rfind('/') path = path[:idx + 1] -class RealSubversionAuthorizer(Authorizer): - """FIXME: this should become a IPermissionPolicy, of course. - - `check_permission(username, action, resource)` should be able to - replace `has_permission(path)` when resource is a `('source', path)` - and `has_permission_for_changeset` when resource is a `('changeset', rev)`. - """ - - auth_name = '' - module_name = '' - conf_authz = None - - def __init__(self, repos, auth_name, module_name, cfg_file, cfg_fp=None): - self.repos = repos - self.auth_name = auth_name - self.module_name = module_name - - from ConfigParser import ConfigParser - self.conf_authz = ConfigParser() - if cfg_fp: - self.conf_authz.readfp(cfg_fp, cfg_file) - elif cfg_file: - self.conf_authz.read(cfg_file) - - self.groups = self._groups() - - def has_permission(self, path): - if path is None: - return 1 - - for p in parent_iter(path): - if self.module_name: - for perm in self._get_section(self.module_name + ':' + p): - if perm is not None: - return perm - for perm in self._get_section(p): - if perm is not None: - return perm - - return 0 - - def has_permission_for_changeset(self, rev): - changeset = self.repos.get_changeset(rev) - for change in changeset.get_changes(): - # the repository checks permissions for each change, so just check - # if any changes can be accessed - return 1 - return 0 - - # Internal API - - def _groups(self): - if not self.conf_authz.has_section('groups'): - return [] - - grp_parents = {} - usr_grps = [] - - for group in self.conf_authz.options('groups'): - for member in self.conf_authz.get('groups', group).split(','): - member = member.strip() - if member == self.auth_name: - usr_grps.append(group) - elif member.startswith('@'): - grp_parents.setdefault(member[1:], []).append(group) - - expanded = {} - - def expand_group(group): - if group in expanded: - return - expanded[group] = True - for parent in grp_parents.get(group, []): - expand_group(parent) - - for g in usr_grps: - expand_group(g) - - # expand groups - return expanded.keys() - - def _get_section(self, section): - if not self.conf_authz.has_section(section): - return - - yield self._get_permission(section, self.auth_name) +class ParseError(Exception): + """Exception thrown for parse errors in authz files""" - group_perm = None - for g in self.groups: - p = self._get_permission(section, '@' + g) - if p is not None: - group_perm = p - if group_perm: - yield 1 +def parse(authz): + """Parse a Subversion authorization file. + + Return a dict of modules, each containing a dict of paths, each containing + a dict mapping users to permissions. + """ + groups = {} + aliases = {} + sections = {} + section = None + lineno = 0 + for line in authz.splitlines(): + lineno += 1 + line = to_unicode(line.strip()) + if not line or line.startswith('#') or line.startswith(';'): + continue + if line.startswith('[') and line.endswith(']'): + section = line[1:-1] + continue + if section is None: + raise ParseError(_('Line %(lineno)d: Entry before first ' + 'section header', lineno=lineno)) + parts = line.split('=', 1) + if len(parts) != 2: + raise ParseError(_('Line %(lineno)d: Invalid entry', + lineno=lineno)) + name, value = parts + name = name.strip() + if section == 'groups': + group = groups.setdefault(name, set()) + group.update(each.strip() for each in value.split(',')) + elif section == 'aliases': + aliases[name] = value.strip() + else: + sections.setdefault(section, []).append((name.strip(), value)) + + def resolve(subject, done): + if subject.startswith('@'): + done.add(subject) + for members in groups[subject[1:]] - done: + for each in resolve(members, done): + yield each + elif subject.startswith('&'): + yield aliases[subject[1:]] + else: + yield subject + + authz = {} + for name, items in sections.iteritems(): + parts = name.split(':', 1) + module = authz.setdefault(len(parts) > 1 and parts[0] or '', {}) + section = module.setdefault(parts[-1], {}) + for subject, perms in items: + for user in resolve(subject, set()): + section.setdefault(user, 'r' in perms) # The first match wins + + return authz + + +class AuthzSourcePolicy(Component): + """Permission policy for `source:` and `changeset:` resources using a + Subversion authz file. + + `FILE_VIEW` and `BROWSER_VIEW` permissions are granted as specified in the + authz file. + + `CHANGESET_VIEW` permission is granted for changesets where `FILE_VIEW` is + granted on at least one modified file, as well as for empty changesets. + """ - yield group_perm + implements(IPermissionPolicy) + + authz_file = PathOption('trac', 'authz_file', '', + """The path to the Subversion + [http://svnbook.red-bean.com/en/1.5/svn.serverconfig.pathbasedauthz.html authorization (authz) file]. + To enable authz permission checking, the `AuthzSourcePolicy` permission + policy must be added to `[trac] permission_policies`. + """) - yield self._get_permission(section, '*') + authz_module_name = Option('trac', 'authz_module_name', '', + """The module prefix used in the `authz_file` for the default + repository. If left empty, the global sections will be used. + """) - def _get_permission(self, section, subject): - if self.conf_authz.has_option(section, subject): - return 'r' in self.conf_authz.get(section, subject) - return None + _mtime = 0 + _authz = {} + _users = set() + + # IPermissionPolicy methods + + def check_permission(self, action, username, resource, perm): + if action == 'FILE_VIEW' or action == 'BROWSER_VIEW': + authz, users = self._get_authz_info() + if authz is None: + return False + if resource is None: + return users is True or username in users + if resource.realm == 'source': + modules = [resource.parent.id or self.authz_module_name] + if modules[0]: + modules.append('') + for p in parent_iter(resource.id): + for module in modules: + section = authz.get(module, {}).get(p, {}) + result = section.get(username) + if result is not None: + return result + result = section.get('*') + if result is not None: + return result + return False + elif action == 'CHANGESET_VIEW': + authz, users = self._get_authz_info() + if authz is None: + return False + if resource is None: + return users is True or username in users + if resource.realm == 'changeset': + rm = RepositoryManager(self.env) + repos = rm.get_repository(resource.parent.id) + changes = list(repos.get_changeset(resource.id).get_changes()) + if not changes: + return True + source = Resource('source', version=resource.id, + parent=resource.parent) + return any('FILE_VIEW' in perm(source(id=change[0])) + for change in changes) + + def _get_authz_info(self): + try: + mtime = os.path.getmtime(self.authz_file) + except OSError, e: + if self._authz is not None: + self.log.error('Error accessing authz file: %s', + exception_to_unicode(e)) + self._mtime = mtime = 0 + self._authz = None + self._users = set() + if mtime > self._mtime: + self._mtime = mtime + self.log.info('Parsing authz file: %s' % self.authz_file) + try: + self._authz = parse(read_file(self.authz_file)) + users = set(user for module in self._authz.itervalues() + for path in module.itervalues() + for user, result in path.iteritems() if result) + self._users = '*' in users or users + except Exception, e: + self._authz = None + self._users = set() + self.log.error('Error parsing authz file: %s', + exception_to_unicode(e)) + return self._authz, self._users diff -Nru trac-0.11.7/trac/versioncontrol/svn_fs.py trac-0.12.1~ppa2/trac/versioncontrol/svn_fs.py --- trac-0.11.7/trac/versioncontrol/svn_fs.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/versioncontrol/svn_fs.py 2010-02-26 18:27:22.000000000 +0000 @@ -16,52 +16,48 @@ # Author: Christopher Lenz # Christian Boos -""" -Note about Unicode: - - The Subversion bindings are not unicode-aware and they expect to - receive UTF-8 encoded `string` parameters, +"""Filesystem access to Subversion repositories. + +'''Note about Unicode:''' + +The Subversion bindings are not unicode-aware and they expect to +receive UTF-8 encoded `string` parameters, + +On the other hand, all paths manipulated by Trac are `unicode` objects. + +Therefore: - On the other hand, all paths manipulated by Trac are `unicode` objects. + * before being handed out to SVN, the Trac paths have to be encoded to + UTF-8, using `_to_svn()` + * before being handed out to Trac, a SVN path has to be decoded from + UTF-8, using `_from_svn()` - Therefore: +Whenever a value has to be stored as utf8, we explicitly mark the +variable name with "_utf8", in order to avoid any possible confusion. - * before being handed out to SVN, the Trac paths have to be encoded to - UTF-8, using `_to_svn()` - * before being handed out to Trac, a SVN path has to be decoded from - UTF-8, using `_from_svn()` - - Whenever a value has to be stored as utf8, we explicitly mark the - variable name with "_utf8", in order to avoid any possible confusion. - - Warning: `SubversionNode.get_content` returns an object from which one - can read a stream of bytes. - NO guarantees can be given about what that stream of bytes - represents. - It might be some text, encoded in some way or another. - SVN properties __might__ give some hints about the content, - but they actually only reflect the beliefs of whomever set - those properties... +Warning: + `SubversionNode.get_content()` returns an object from which one can read + a stream of bytes. NO guarantees can be given about what that stream of + bytes represents. It might be some text, encoded in some way or another. + SVN properties __might__ give some hints about the content, but they + actually only reflect the beliefs of whomever set those properties... """ import os.path -import time import weakref import posixpath -from datetime import datetime from trac.config import ListOption from trac.core import * +from trac.env import ISystemInfoProvider from trac.versioncontrol import Changeset, Node, Repository, \ IRepositoryConnector, \ NoSuchChangeset, NoSuchNode from trac.versioncontrol.cache import CachedRepository -from trac.versioncontrol.svn_authz import SubversionAuthorizer from trac.util import embedded_numbers -from trac.util.compat import sorted from trac.util.text import exception_to_unicode, to_unicode from trac.util.translation import _ -from trac.util.datefmt import utc +from trac.util.datefmt import from_utimestamp application_pool = None @@ -174,7 +170,7 @@ def assert_valid(self): """Assert that this memory_pool is still valid.""" - assert self.valid(); + assert self.valid() def clear(self): """Clear embedded memory pool. Invalidate all subpools.""" @@ -215,7 +211,7 @@ # are destroyed self._weakref = weakref.ref(self._parent_pool._is_valid, lambda x: \ - _mark_weakpool_invalid(weakself)); + _mark_weakpool_invalid(weakself)) # mark pool as valid self._is_valid = lambda: 1 @@ -232,9 +228,19 @@ del self._weakref +class SvnCachedRepository(CachedRepository): + """Subversion-specific cached repository, zero-pads revision numbers + in the cache tables. + """ + def db_rev(self, rev): + return '%010d' % rev + + def rev_db(self, rev): + return int(rev or 0) + class SubversionConnector(Component): - implements(IRepositoryConnector) + implements(ISystemInfoProvider, IRepositoryConnector) branches = ListOption('svn', 'branches', 'trunk,branches/*', doc= """Comma separated list of paths categorized as branches. @@ -255,7 +261,6 @@ def __init__(self): self._version = None - try: _import_svn() self.log.debug('Subversion bindings imported') @@ -263,8 +268,22 @@ self.error = e self.log.info('Failed to load Subversion bindings', exc_info=True) else: + version = (core.SVN_VER_MAJOR, core.SVN_VER_MINOR, + core.SVN_VER_MICRO) + self._version = '%d.%d.%d' % version + core.SVN_VER_TAG + if version[0] < 1: + self.error = _("Subversion >= 1.0 required, found %(version)s", + version=self._version) Pool() + # ISystemInfoProvider methods + + def get_system_info(self): + if self._version is not None: + yield 'Subversion', self._version + + # IRepositoryConnector methods + def get_supported_types(self): prio = 1 if self.error: @@ -273,55 +292,38 @@ yield ("svnfs", prio*4) yield ("svn", prio*2) - def get_repository(self, type, dir, authname): + def get_repository(self, type, dir, params): """Return a `SubversionRepository`. The repository is wrapped in a `CachedRepository`, unless `type` is 'direct-svnfs'. """ - if not self._version: - self._version = self._get_version() - self.env.systeminfo.append(('Subversion', self._version)) - fs_repos = SubversionRepository(dir, None, self.log, - {'tags': self.tags, - 'branches': self.branches}) + params.update(tags=self.tags, branches=self.branches) + fs_repos = SubversionRepository(dir, params, self.log) if type == 'direct-svnfs': repos = fs_repos else: - repos = CachedRepository(self.env.get_db_cnx, fs_repos, None, - self.log) + repos = SvnCachedRepository(self.env, fs_repos, self.log) repos.has_linear_changesets = True - if authname: - authz = SubversionAuthorizer(self.env, weakref.proxy(repos), - authname) - repos.authz = fs_repos.authz = authz return repos - def _get_version(self): - version = (core.SVN_VER_MAJOR, core.SVN_VER_MINOR, core.SVN_VER_MICRO) - version_string = '%d.%d.%d' % version + core.SVN_VER_TAG - if version[0] < 1: - raise TracError(_("Subversion >= 1.0 required: Found %(version)s", - version=version_string)) - return version_string - class SubversionRepository(Repository): """Repository implementation based on the svn.fs API.""" - def __init__(self, path, authz, log, options={}): + def __init__(self, path, params, log): self.log = log - self.options = options self.pool = Pool() # Remove any trailing slash or else subversion might abort if isinstance(path, unicode): - self.path = path path_utf8 = path.encode('utf-8') else: # note that this should usually not happen (unicode arg expected) - self.path = to_unicode(path) - path_utf8 = self.path.encode('utf-8') + path_utf8 = to_unicode(path).encode('utf-8') + path_utf8 = os.path.normpath(path_utf8).replace('\\', '/') + self.path = path_utf8.decode('utf-8') + root_path_utf8 = repos.svn_repos_find_root_path(path_utf8, self.pool()) if root_path_utf8 is None: raise TracError(_("%(path)s does not appear to be a Subversion " @@ -335,10 +337,11 @@ svn_error=exception_to_unicode(e))) self.fs_ptr = repos.svn_repos_fs(self.repos) - uuid = fs.get_uuid(self.fs_ptr, self.pool()) - name = 'svn:%s:%s' % (uuid, _from_svn(path_utf8)) + self.uuid = fs.get_uuid(self.fs_ptr, self.pool()) + self.base = 'svn:%s:%s' % (self.uuid, _from_svn(root_path_utf8)) + name = 'svn:%s:%s' % (self.uuid, self.path) - Repository.__init__(self, name, authz, log) + Repository.__init__(self, name, params, log) # if root_path_utf8 is shorter than the path_utf8, the difference is # this scope (which always starts with a '/') @@ -392,9 +395,12 @@ self.pool.destroy() self.repos = self.fs_ptr = self.pool = None + def get_base(self): + return self.base + def _get_tags_or_branches(self, paths): """Retrieve known branches or tags.""" - for path in self.options.get(paths, []): + for path in self.params.get(paths, []): if path.endswith('*'): folder = posixpath.dirname(path) try: @@ -421,15 +427,22 @@ for n in self._get_tags_or_branches('tags'): yield 'tags', n.path, n.created_path, n.created_rev + def get_path_url(self, path, rev): + url = self.params.get('url', '').rstrip('/') + if url: + if not path or path == '/': + return url + return url + '/' + path.lstrip('/') + def get_changeset(self, rev): rev = self.normalize_rev(rev) - return SubversionChangeset(rev, self.authz, self.scope, - self.fs_ptr, self.pool) + return SubversionChangeset(self, rev, self.scope, self.pool) + + def get_changeset_uid(self, rev): + return (self.uuid, rev) def get_node(self, path, rev=None): path = path or '' - self.authz.assert_permission(posixpath.join(self.scope, - path.strip('/'))) if path and path[-1] == '/': path = path[:-1] @@ -480,8 +493,6 @@ if rev < end: break path = _from_svn(path_utf8) - if not self.authz.has_permission(path): - break yield path, rev del tmp1 del tmp2 @@ -616,7 +627,8 @@ e_ptr, e_baton = delta.make_editor(editor, subpool()) old_root = fs.revision_root(self.fs_ptr, old_rev, subpool()) new_root = fs.revision_root(self.fs_ptr, new_rev, subpool()) - def authz_cb(root, path, pool): return 1 + def authz_cb(root, path, pool): + return 1 text_deltas = 0 # as this is anyway re-done in Diff.py... entry_props = 0 # "... typically used only for working copy updates" repos.svn_repos_dir_delta(old_root, @@ -656,9 +668,7 @@ class SubversionNode(Node): def __init__(self, path, rev, repos, pool=None, parent_root=None): - self.repos = repos self.fs_ptr = repos.fs_ptr - self.authz = repos.authz self.scope = repos.scope self._scoped_path_utf8 = _to_svn(self.scope, path) self.pool = Pool(pool) @@ -689,7 +699,7 @@ self.created_rev, self.created_path = rev, path self.rev = self.created_rev # TODO: check node id - Node.__init__(self, path, self.rev, _kindmap[node_type]) + Node.__init__(self, repos, path, self.rev, _kindmap[node_type]) def get_content(self): if self.isdir: @@ -708,9 +718,6 @@ entries = fs.dir_entries(self.root, self._scoped_path_utf8, pool()) for item in entries.keys(): path = posixpath.join(self.path, _from_svn(item)) - if not self.authz.has_permission(posixpath.join(self.scope, - path.strip('/'))): - continue yield SubversionNode(path, self._requested_rev, self.repos, self.pool, self.root) @@ -785,8 +792,7 @@ core.SVN_PROP_REVISION_DATE, self.pool()) if not _date: return None - ts = core.svn_time_from_cstring(_date, self.pool()) / 1000000 - return datetime.fromtimestamp(ts, utc) + return from_utimestamp(core.svn_time_from_cstring(_date, self.pool())) def _get_prop(self, name): return fs.node_prop(self.root, self._scoped_path_utf8, name, @@ -835,11 +841,10 @@ class SubversionChangeset(Changeset): - def __init__(self, rev, authz, scope, fs_ptr, pool=None): + def __init__(self, repos, rev, scope, pool=None): self.rev = rev - self.authz = authz self.scope = scope - self.fs_ptr = fs_ptr + self.fs_ptr = repos.fs_ptr self.pool = Pool(pool) try: message = self._get_prop(core.SVN_PROP_REVISION_LOG) @@ -851,16 +856,16 @@ author = author and to_unicode(author, 'utf-8') _date = self._get_prop(core.SVN_PROP_REVISION_DATE) if _date: - ts = core.svn_time_from_cstring(_date, self.pool()) / 1000000 - date = datetime.fromtimestamp(ts, utc) + ts = core.svn_time_from_cstring(_date, self.pool()) + date = from_utimestamp(ts) else: date = None - Changeset.__init__(self, rev, message, author, date) + Changeset.__init__(self, repos, rev, message, author, date) def get_properties(self): props = fs.revision_proplist(self.fs_ptr, self.rev, self.pool()) properties = {} - for k,v in props.iteritems(): + for k, v in props.iteritems(): if k not in (core.SVN_PROP_REVISION_LOG, core.SVN_PROP_REVISION_AUTHOR, core.SVN_PROP_REVISION_DATE): @@ -882,11 +887,10 @@ changes = [] revroots = {} for path_utf8, change in editor.changes.items(): - path = _from_svn(path_utf8) + new_path = _from_svn(path_utf8) # Filtering on `path` - if not (_is_path_within_scope(self.scope, path) and - self.authz.has_permission(path)): + if not _is_path_within_scope(self.scope, new_path): continue path_utf8 = change.path @@ -896,17 +900,14 @@ base_rev = change.base_rev # Ensure `base_path` is within the scope - if not (_is_path_within_scope(self.scope, base_path) and - self.authz.has_permission(base_path)): + if not _is_path_within_scope(self.scope, base_path): base_path, base_rev = None, -1 # Determine the action if not path: # deletion - if base_path: - if base_path in deletions: - continue # duplicates on base_path are possible (#3778) + if new_path: action = Changeset.DELETE - deletions[base_path] = idx + deletions[new_path.lstrip('/')] = idx elif self.scope == '/': # root property change action = Changeset.EDIT else: # deletion outside of scope, ignore @@ -915,7 +916,7 @@ action = Changeset.ADD if base_path and base_rev: action = Changeset.COPY - copies[base_path] = idx + copies[base_path.lstrip('/')] = idx else: action = Changeset.EDIT # identify the most interesting base_path/base_rev @@ -935,13 +936,15 @@ base_path, base_rev = cbase_path, cbase_rev kind = _kindmap[change.item_kind] - path = _path_within_scope(self.scope, path or base_path) + path = _path_within_scope(self.scope, new_path or base_path) base_path = _path_within_scope(self.scope, base_path) changes.append([path, kind, action, base_path, base_rev]) idx += 1 moves = [] - for k,v in copies.items(): + # a MOVE is a COPY whose `base_path` corresponds to a `new_path` + # which has been deleted + for k, v in copies.items(): if k in deletions: changes[v][2] = Changeset.MOVE moves.append(deletions[k]) diff -Nru trac-0.11.7/trac/versioncontrol/svn_prop.py trac-0.12.1~ppa2/trac/versioncontrol/svn_prop.py --- trac-0.11.7/trac/versioncontrol/svn_prop.py 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/versioncontrol/svn_prop.py 2010-02-05 14:57:46.000000000 +0000 @@ -21,13 +21,12 @@ from genshi.builder import tag from trac.core import * -from trac.versioncontrol import NoSuchNode +from trac.versioncontrol.api import NoSuchNode, RepositoryManager from trac.versioncontrol.svn_fs import _path_within_scope from trac.versioncontrol.web_ui.browser import IPropertyRenderer from trac.versioncontrol.web_ui.changeset import IPropertyDiffRenderer from trac.util import Ranges, to_ranges -from trac.util.compat import set -from trac.util.translation import _ +from trac.util.translation import _, tag_ class SubversionPropertyRenderer(Component): @@ -59,7 +58,7 @@ if len(value) != 2: self.log.warn("svn:externals entry %s doesn't contain " "a space-separated key value pair, skipping.", - label) + dummykey) continue key, value = value self._externals_map[key] = value.replace('%', '%%') \ @@ -81,7 +80,7 @@ prefix = [] base_url = url while base_url: - if base_url in self._externals_map or base_url==u'/': + if base_url in self._externals_map or base_url == u'/': break base_url, pref = posixpath.split(base_url) prefix.append(pref) @@ -148,8 +147,9 @@ has_eligible = name in ('svnmerge-integrated', 'svn:mergeinfo') revs_label = (_('merged'), _('blocked'))[name.endswith('blocked')] revs_cols = has_eligible and 2 or None - repos = self.env.get_repository() + reponame = context.resource.parent.id target_path = context.resource.id + repos = RepositoryManager(self.env).get_repository(reponame) target_rev = context.resource.version if has_eligible: node = repos.get_node(target_path, target_rev) @@ -171,7 +171,8 @@ deleted = False try: node = repos.get_node(spath, target_rev) - if 'LOG_VIEW' in context.perm('source', spath): + resource = context.resource.parent.child('source', spath) + if 'LOG_VIEW' in context.perm(resource): row = [_get_source_link(spath, context), _get_revs_link(revs_label, context, spath, revs)] if has_eligible: @@ -229,8 +230,9 @@ def _get_source_link(spath, context): """Return a link to a merge source.""" + reponame = context.resource.parent.id return tag.a('/' + spath, title=_('View merge source'), - href=context.href.browser(spath, + href=context.href.browser(reponame or None, spath, rev=context.resource.version)) def _get_revs_link(label, context, spath, revs): @@ -238,12 +240,13 @@ given, to the revision itself for a single revision, or a `` with "no revision" for none. """ + reponame = context.resource.parent.id if not revs: return tag.span(label, title=_('No revisions')) elif ',' in revs or '-' in revs: - revs_href = context.href.log(spath, revs=revs) + revs_href = context.href.log(reponame or None, spath, revs=revs) else: - revs_href = context.href.changeset(revs, spath) + revs_href = context.href.changeset(revs, reponame or None, spath) return tag.a(label, title=revs.replace(',', ', '), href=revs_href) @@ -261,7 +264,8 @@ # Build 3 columns table showing modifications on merge sources # || source || added revs || removed revs || # || source || removed || - repos = self.env.get_repository() + rm = RepositoryManager(self.env) + repos = rm.get_repository(old_context.resource.parent.id) def parse_sources(props): sources = {} for line in props[name].splitlines(): @@ -318,5 +322,5 @@ for spath, src in removed_sources]), class_='props') else: changes = tag.em(_(' (with no actual effect on merging)')) - return tag.li(tag('Property ', tag.strong(name), ' changed'), + return tag.li(tag_('Property %(prop)s changed', prop=tag.strong(name)), changes) diff -Nru trac-0.11.7/trac/versioncontrol/templates/admin_repositories.html trac-0.12.1~ppa2/trac/versioncontrol/templates/admin_repositories.html --- trac-0.11.7/trac/versioncontrol/templates/admin_repositories.html 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/trac/versioncontrol/templates/admin_repositories.html 2010-05-01 17:05:35.000000000 +0100 @@ -0,0 +1,152 @@ + + + + + Repositories + + + +

Manage Repositories

+ + +

+ Type:
+ + + Default: $default_type +

+ + + +

+ Repository:
+ + +

+ + + +

+ Modify Repository: + View Repository: +

Note: + This repository is defined in trac.ini + and cannot be edited on this page. +

+ Name:
+

+ + + ${alias_field(info.editable, info.alias)} + + + ${type_field(info.editable, info.type)} +

+ Directory:
+

+ URL:
+

+ + +

+ + Hide from repository index + +

+ + Description (you may use WikiFormatting here): + +

+ +$info.description +

+ + +

+ + + + + + +

+ + + + + + + + + + + + + + + +

	Name	Type	Directory	Revision
	+ ${info.name or '(default)'} +	${not info.alias and (info.type or _('(default)')) or None}	+ $info.prettydir + Alias of ${info.alias or '(default)'} +	[$info.display_rev]

+ + +

+ + + + + diff -Nru trac-0.11.7/trac/versioncontrol/templates/browser.html trac-0.12.1~ppa2/trac/versioncontrol/templates/browser.html --- trac-0.11.7/trac/versioncontrol/templates/browser.html 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/versioncontrol/templates/browser.html 2010-04-26 08:58:56.000000000 +0100 @@ -3,13 +3,18 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:i18n="http://genshi.edgewall.org/i18n"> - - $path + + <py:when test="1">/</py:when> + <py:when test="2">${path_links[-1].name}</py:when> + <py:otherwise><i18n:msg params="basename, dirname">${path_links[-1].name} in ${'/'.join(part.name for part in path_links[1:-1])}</i18n:msg></py:otherwise> + + @@ -41,53 +49,42 @@

${browser_path_links(path_links, stickyrev)}

- -

+ + +

Default Repository

+ + +

+ +

+ - - - - - - - ${sortable_th(dir.order, dir.desc, 'name', 'Name')} - ${sortable_th(dir.order, dir.desc, 'size', 'Size')} - - ${sortable_th(dir.order, dir.desc, 'date', 'Age')} - - - +

- $title -	Rev	Last Change

+ @@ -108,15 +105,18 @@

- @@ -124,6 +124,12 @@

- Revision $rev, ${sizeinfo(file.size)} - (checked in by ${authorinfo(file.changeset.author)}, ${dateinfo(file.changeset.date)} ago) +	+ Revision ${display_rev(rev)}, + ${pretty_size(file.size)} + checked in by ${authorinfo(file.changeset.author)}, ${dateinfo(file.changeset.date)} ago + (diff)
- ${wiki_to_html(context('changeset', file.changeset.rev), file.changeset.message, escape_newlines=True)} + ${wiki_to_html(context('changeset', file.changeset.rev, parent=repos.resource), + file.changeset.message, escape_newlines=True)} ${file.changeset.message}
+ + + `$prop.value` + $prop.value + + - Property $prop.name set to - - `$prop.value` - $prop.value - + Property $prop.name set to ${prop_value(prop)} @@ -143,23 +145,35 @@

+ ${wiki_to_html(context('source', '/', parent=repos.resource), repoinfo.description)} +

+ + +

Repository Index

+ + + + +

- ${preview_file(file.preview)} +

Note: See TracBrowser - for help on using the browser. + for help on using the repository browser.

diff -Nru trac-0.11.7/trac/versioncontrol/templates/changeset.html trac-0.12.1~ppa2/trac/versioncontrol/templates/changeset.html --- trac-0.11.7/trac/versioncontrol/templates/changeset.html 2010-03-09 22:49:38.000000000 +0000 +++ trac-0.12.1~ppa2/trac/versioncontrol/templates/changeset.html 2010-04-26 08:58:56.000000000 +0100 @@ -3,9 +3,9 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - $title + -

- +

+ Actions + Review + Preview + ↓ +

Editing ${name_of(page.resource)}

Someone else has modified that page since you started your edits.

If you save right away, you risk to revert those changes +

If you save right away, you risk to revert those changes (highlighted below as deletions).

Please review all those changes and manually merge them with your +

Please review all those changes and manually merge them with your own changes.
If you're unsure about what you're doing, please press Cancel (losing your changes) and start editing the latest version of the page again.

+ + + -

+
Change information for future version ${page.version+1} (modified by $author):
@@ -47,15 +119,28 @@

- ${diff and 'Review Changes' or 'Preview'} (skip) -

- +

+ Edit ↑

- ${wiki_to_html(context(page.resource), page.text)} +

+ Review Changes + Preview + No changes +

+ +

+ ${wiki_to_html(context(page.resource), page.text)} +

+ Actions ↑ +

@@ -64,67 +149,7 @@

- - - -

- Adjust edit area height: - -

-$page.text -

- Note: See WikiFormatting and - TracWiki for help on editing wiki content. -

- Change information -

- Your email or username:
- - -

- E-mail address and user name can be saved in the Preferences. -

- Comment about this change (optional):
- - -

- - Page is read-only - -

- - - - - - - - - - - -

diff -Nru trac-0.11.7/trac/wiki/templates/wiki_page_path.html trac-0.12.1~ppa2/trac/wiki/templates/wiki_page_path.html --- trac-0.11.7/trac/wiki/templates/wiki_page_path.html 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/trac/wiki/templates/wiki_page_path.html 2010-03-21 11:17:57.000000000 +0000 @@ -0,0 +1,12 @@ +

+ wiki:${part}/ +

diff -Nru trac-0.11.7/trac/wiki/templates/wiki_rename.html trac-0.12.1~ppa2/trac/wiki/templates/wiki_rename.html --- trac-0.11.7/trac/wiki/templates/wiki_rename.html 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/trac/wiki/templates/wiki_rename.html 2010-04-16 13:12:32.000000000 +0100 @@ -0,0 +1,38 @@ + + + + + $title + + + +

Rename $page.name

+ +

+ + diff -Nru trac-0.11.7/trac/wiki/templates/wiki_view.html trac-0.12.1~ppa2/trac/wiki/templates/wiki_view.html --- trac-0.11.7/trac/wiki/templates/wiki_view.html 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/wiki/templates/wiki_view.html 2010-05-01 17:01:31.000000000 +0100 @@ -3,15 +3,23 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + xmlns:i18n="http://genshi.edgewall.org/i18n" + xmlns:xi="http://www.w3.org/2001/XInclude" + py:with="modify_perm = 'WIKI_MODIFY' in perm(page.resource); + admin_perm = 'WIKI_ADMIN' in perm(page.resource)"> - $title - + + @@ -19,18 +27,13 @@

- ${part}/ -
-

- +
-

- Version $page.version (modified by ${authorinfo(page.author)}, ${dateinfo(page.time)} ago) +

+ Version $page.version (modified by ${authorinfo(page.author)}, ${dateinfo(page.time)} ago) + (diff)

${wiki_to_html(context, page.comment or '--')} @@ -40,19 +43,36 @@

- - ${wiki_to_html(context, page.text)} + + +

+ Last modified ${dateinfo(page.time)} ago +

- Describe ${name_of(page.resource)} here. +

The page ${name_of(page.resource)} does not exist. You can create it here.

+ +

You could also create the same page higher in the hierarchy:

${markup}

- ${list_of_attachments(attachments, compact=True)} + - +

@@ -70,7 +90,7 @@

@@ -79,9 +99,15 @@

- ${attach_file_form(attachments)} + +

@@ -98,6 +124,13 @@ +

The following pages have a name similar to this page, and may be related:

${markup}

diff -Nru trac-0.11.7/trac/wiki/tests/formatter.py trac-0.12.1~ppa2/trac/wiki/tests/formatter.py --- trac-0.11.7/trac/wiki/tests/formatter.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/wiki/tests/formatter.py 2010-04-04 17:00:41.000000000 +0100 @@ -1,8 +1,7 @@ +import difflib import os -import inspect -import StringIO +import re import unittest -import difflib from datetime import datetime from trac.core import * @@ -68,6 +67,15 @@ def expand_macro(self, formatter, name, content): return None +class WikiProcessorSampleMacro(WikiMacroBase): + def expand_macro(self, formatter, name, content, args): + if args is None: + return 'Called as a macro: ' + content + else: + return 'Called as a processor with params:

%s' % \ + ''.join('

' % kv for kv in args.items()) \ + + content + class SampleResolver(Component): """A dummy macro returning a div block, used by the unit test.""" @@ -92,12 +100,13 @@ class WikiTestCase(unittest.TestCase): - def __init__(self, input, correct, file, line, setup=None, teardown=None, - context=None): + generate_opts = {} + + def __init__(self, title, input, correct, file, line, setup=None, + teardown=None, context=None): unittest.TestCase.__init__(self, 'test') - self.title, self.input = input.split('\n', 1) - if self.title: - self.title = self.title.strip() + self.title = title + self.input = input self.correct = correct self.file = file self.line = line @@ -113,7 +122,11 @@ context = Context.from_request(req, 'wiki', 'WikiStart') self.context = context - self.env = EnvironmentStub() + all_test_components = [ + HelloWorldMacro, DivHelloWorldMacro, TableHelloWorldMacro, + DivCodeMacro, DivCodeElementMacro, DivCodeStreamMacro, + NoneMacro, WikiProcessorSampleMacro, SampleResolver] + self.env = EnvironmentStub(enable=['trac.*'] + all_test_components) # -- macros support self.env.path = '' # -- intertrac support @@ -148,12 +161,11 @@ def test(self): """Testing WikiFormatter""" formatter = self.formatter() - v = unicode(formatter.generate()).replace('\r','') + v = unicode(formatter.generate(**self.generate_opts)).replace('\r','') try: self.assertEquals(self.correct, v) except AssertionError, e: msg = to_unicode(e) - import re match = re.match(r"u?'(.*)' != u?'(.*)'", msg) if match: g1 = ["%s\n" % x for x in match.group(1).split(r'\n')] @@ -188,31 +200,57 @@ def formatter(self): return InlineHtmlFormatter(self.env, self.context, self.input) +class EscapeNewLinesTestCase(WikiTestCase): + generate_opts = {'escape_newlines': True} + def formatter(self): + return HtmlFormatter(self.env, self.context, self.input) + def suite(data=None, setup=None, file=__file__, teardown=None, context=None): suite = unittest.TestSuite() - if not data: - file = os.path.join(os.path.split(file)[0], 'wiki-tests.txt') - data = open(file, 'r').read().decode('utf-8') - tests = data.split('=' * 30) - next_line = 1 - line = 0 - for test in tests: - if line != next_line: - line = next_line - if not test or test == '\n': - continue - next_line += len(test.split('\n')) - 1 - blocks = test.split('-' * 30 + '\n') - if len(blocks) != 3: - continue - input, page, oneliner = blocks - tc = WikiTestCase(input, page, file, line, setup, teardown, context) - suite.addTest(tc) - if oneliner: - tc = OneLinerTestCase(input, oneliner[:-1], file, line, - setup, teardown, context) - suite.addTest(tc) + def add_test_cases(data, filename): + tests = re.compile('^(%s.*)$' % ('=' * 30), re.MULTILINE).split(data) + next_line = 1 + line = 0 + for title, test in zip(tests[1::2], tests[2::2]): + title = title.lstrip('=').strip() + if line != next_line: + line = next_line + if not test or test == '\n': + continue + next_line += len(test.split('\n')) - 1 + if 'SKIP' in title or 'WONTFIX' in title: + continue + blocks = test.split('-' * 30 + '\n') + page_escape_nl = oneliner = None + if len(blocks) < 4: + blocks.extend([None,] * (4 - len(blocks))) + input, page, oneliner, page_escape_nl = blocks[:4] + if page: + page = WikiTestCase( + title, input, page, filename, line, setup, + teardown, context) + if oneliner: + oneliner = OneLinerTestCase( + title, input, oneliner[:-1], filename, line, setup, + teardown, context) + if page_escape_nl: + page_escape_nl = EscapeNewLinesTestCase( + title, input, page_escape_nl, filename, line, setup, + teardown, context) + for tc in [page, oneliner, page_escape_nl]: + if tc: + suite.addTest(tc) + if data: + add_test_cases(data, file) + else: + for f in ('wiki-tests.txt', 'wikicreole-tests.txt'): + testfile = os.path.join(os.path.split(file)[0], f) + if os.path.exists(testfile): + data = open(testfile, 'r').read().decode('utf-8') + add_test_cases(data, testfile) + else: + print 'no ', testfile return suite if __name__ == '__main__': diff -Nru trac-0.11.7/trac/wiki/tests/functional.py trac-0.12.1~ppa2/trac/wiki/tests/functional.py --- trac-0.11.7/trac/wiki/tests/functional.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/wiki/tests/functional.py 2010-03-17 19:57:05.000000000 +0000 @@ -12,6 +12,68 @@ self._tester.attach_file_to_wiki(pagename) +class TestWikiRename(FunctionalTwillTestCaseSetup): + def runTest(self): + """Test for simple wiki rename""" + pagename = random_unique_camel() + self._tester.create_wiki_page(pagename) + attachment = self._tester.attach_file_to_wiki(pagename) + base_url = self._tester.url + page_url = base_url + "/wiki/" + pagename + + def click_rename(): + tc.formvalue('rename', 'action', 'rename') + tc.submit() + tc.url(page_url + r'\?action=rename') + tc.find("New name:") + + tc.go(page_url) + tc.find("Rename page") + click_rename() + # attempt to give an empty new name + tc.formvalue('rename-form', 'new_name', '') + tc.submit('submit') + tc.url(page_url) + tc.find("A new name is mandatory for a rename") + # attempt to rename the page to the current page name + tc.formvalue('rename-form', 'new_name', pagename) + tc.submit('submit') + tc.url(page_url) + tc.find("The new name must be different from the old name") + # attempt to rename the page to an existing page name + tc.formvalue('rename-form', 'new_name', 'WikiStart') + tc.submit('submit') + tc.url(page_url) + tc.find("The page WikiStart already exists") + # correct rename to new page name (old page replaced by a redirection) + tc.go(page_url) + click_rename() + newpagename = pagename + 'Renamed' + tc.formvalue('rename-form', 'new_name', newpagename) + tc.formvalue('rename-form', 'redirect', True) + tc.submit('submit') + # check redirection page + tc.url(page_url) + tc.find("See.*/wiki/" + newpagename) + # check whether attachment exists on the new page but not on old page + tc.go(base_url + '/attachment/wiki/' + newpagename + '/' + attachment) + tc.notfind("Error: Invalid Attachment") + tc.go(base_url + '/attachment/wiki/' + pagename + '/' + attachment) + tc.find("Error: Invalid Attachment") + # rename again to another new page name (this time, no redirection) + tc.go(page_url) + click_rename() + newpagename = pagename + 'RenamedAgain' + tc.formvalue('rename-form', 'new_name', newpagename) + tc.formvalue('rename-form', 'redirect', False) + tc.submit('submit') + tc.url(base_url + "/wiki/" + newpagename) + # this time, the original page is gone + tc.go(page_url) + tc.url(page_url) + tc.find("The page %s does not exist" % pagename) + + class RegressionTestTicket4812(FunctionalTwillTestCaseSetup): def runTest(self): """Test for regression of http://trac.edgewall.org/ticket/4812""" @@ -41,6 +103,7 @@ tc.follow("Some Link") tc.url(self._tester.url + "/wiki/WikiStart") + class ReStructuredTextCodeBlockTest(FunctionalTwillTestCaseSetup): def runTest(self): """Render reStructured code block""" @@ -58,11 +121,13 @@ tc.find('print') tc.find('"123"') + def functionalSuite(suite=None): if not suite: import trac.tests.functional.testcases suite = trac.tests.functional.testcases.functionalSuite() suite.addTest(TestWiki()) + suite.addTest(TestWikiRename()) suite.addTest(RegressionTestTicket4812()) if has_docutils: import docutils diff -Nru trac-0.11.7/trac/wiki/tests/__init__.py trac-0.12.1~ppa2/trac/wiki/tests/__init__.py --- trac-0.11.7/trac/wiki/tests/__init__.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/wiki/tests/__init__.py 2010-02-27 10:55:19.000000000 +0000 @@ -1,7 +1,8 @@ import doctest import unittest -from trac.wiki import api +import trac.wiki.api +import trac.wiki.formatter from trac.wiki.tests import formatter, macros, model, wikisyntax from trac.wiki.tests.functional import functionalSuite @@ -12,7 +13,8 @@ suite.addTest(macros.suite()) suite.addTest(model.suite()) suite.addTest(wikisyntax.suite()) - suite.addTest(doctest.DocTestSuite(api)) + suite.addTest(doctest.DocTestSuite(trac.wiki.api)) + suite.addTest(doctest.DocTestSuite(trac.wiki.formatter)) return suite if __name__ == '__main__': diff -Nru trac-0.11.7/trac/wiki/tests/macros.py trac-0.12.1~ppa2/trac/wiki/tests/macros.py --- trac-0.11.7/trac/wiki/tests/macros.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/wiki/tests/macros.py 2010-04-29 21:31:54.000000000 +0100 @@ -1,9 +1,13 @@ +from datetime import datetime import unittest -import trac.wiki.macros +from trac.util.datefmt import utc +from trac.wiki.model import WikiPage from trac.wiki.tests import formatter -IMAGE_MACRO_TEST_CASES=u""" +# == [[Image]] + +IMAGE_MACRO_TEST_CASES = u""" ============================== source: Image, no other arguments [[Image(source:test.png)]] ------------------------------ @@ -70,10 +74,179 @@ ------------------------------ """ + +# == [[TitleIndex]] + +def add_pages(tc, names): + now = datetime.now(utc) + for name in names: + w = WikiPage(tc.env) + w.name = name + w.text = '--' + w.save('joe', 'the page ' + name, '::1', now) + +def titleindex_teardown(tc): + tc.env.reset_db() + + + +TITLEINDEX1_MACRO_TEST_CASES = u""" +============================== TitleIndex, default format +[[TitleIndex()]] +------------------------------ +

WikiStart

+------------------------------ +[[TitleIndex]] +============================== TitleIndex, compact format +[[TitleIndex(format=compact)]] +------------------------------ +

+WikiStart +

+------------------------------ +[[TitleIndex(...)]] +""" + +TITLEINDEX2_MACRO_TEST_CASES = u""" +============================== TitleIndex, default format +[[TitleIndex()]] +------------------------------ +

+------------------------------ +[[TitleIndex]] +============================== TitleIndex, compact format +[[TitleIndex(format=compact)]] +------------------------------ +

+WikiEnd, WikiStart +

+------------------------------ +[[TitleIndex(...)]] +============================== TitleIndex, default format with prefix +[[TitleIndex(Wiki)]] +------------------------------ +

+------------------------------ +[[TitleIndex(...)]] +============================== TitleIndex, compact format with prefix +[[TitleIndex(Wiki,format=compact)]] +------------------------------ +

+WikiEnd, WikiStart +

+------------------------------ +[[TitleIndex(...)]] +============================== TitleIndex, default format with prefix hidden +[[TitleIndex(Wiki,hideprefix)]] +------------------------------ +

+------------------------------ +[[TitleIndex(...)]] +============================== TitleIndex, compact format with prefix hidden +[[TitleIndex(Wiki,hideprefix,format=compact)]] +------------------------------ +

+End, Start +

+------------------------------ +[[TitleIndex(...)]] +""" + +def titleindex2_setup(tc): + add_pages(tc, ['WikiEnd']) + + +TITLEINDEX3_MACRO_TEST_CASES = u""" +============================== TitleIndex, group format +[[TitleIndex(Wiki,format=group)]] +------------------------------ +

Wiki
- End
  - WikiEnd/First
  - WikiEnd/Second
- Start

+------------------------------ +============================== TitleIndex, hierarchy format +[[TitleIndex(WikiStart/, format=hierarchy)]] +------------------------------ +

WikiStart

+------------------------------ +============================== TitleIndex, group format, prefix hidden +[[TitleIndex(Wiki,hideprefix,format=group)]] +------------------------------ +

End
- WikiEnd/First
- WikiEnd/Second
Start

+------------------------------ +============================== TitleIndex, hierarchy format, prefix hidden +[[TitleIndex(WikiStart/,hideprefix,format=hierarchy)]] +------------------------------ +

+------------------------------ +""" + +def titleindex3_setup(tc): + add_pages(tc, [ + 'WikiStart/First', + 'WikiStart/Second', + 'WikiStart/Third', + 'WikiEnd/First', + 'WikiEnd/Second', + ]) + + +TITLEINDEX4_MACRO_TEST_CASES = u""" +============================== TitleIndex group and page with numbers (#7919) +[[TitleIndex(format=group)]] +------------------------------ +

0.11
- Group
  - 0.11/GroupOne
  - 0.11/GroupTwo
- 0.11/Test
Test
- 0.11Abc
  - Test0.11/Abc
  - Test0.11Abc
- 0.12
  - Test0.12Def
  - Test0.12Ijk
- 0.13
  - Test0.13alpha
  - Test0.13beta
- Test0.131
- Test2
- TestTest
- TestThing
WikiStart

+------------------------------ +""" + +def titleindex4_setup(tc): + add_pages(tc, [ + 'TestTest', + 'TestThing', + 'Test2', + 'Test0.11Abc', + 'Test0.11/Abc', + 'Test0.12Def', + 'Test0.12Ijk', + 'Test0.13alpha', + 'Test0.13beta', + 'Test0.131', + '0.11/Test', + '0.11/GroupOne', + '0.11/GroupTwo', + ]) + + def suite(): suite = unittest.TestSuite() suite.addTest(formatter.suite(IMAGE_MACRO_TEST_CASES, file=__file__)) + suite.addTest(formatter.suite(TITLEINDEX1_MACRO_TEST_CASES, file=__file__)) + suite.addTest(formatter.suite(TITLEINDEX2_MACRO_TEST_CASES, file=__file__, + setup=titleindex2_setup, + teardown=titleindex_teardown)) + suite.addTest(formatter.suite(TITLEINDEX3_MACRO_TEST_CASES, file=__file__, + setup=titleindex3_setup, + teardown=titleindex_teardown)) + suite.addTest(formatter.suite(TITLEINDEX4_MACRO_TEST_CASES, file=__file__, + setup=titleindex4_setup, + teardown=titleindex_teardown)) return suite if __name__ == '__main__': diff -Nru trac-0.11.7/trac/wiki/tests/model.py trac-0.12.1~ppa2/trac/wiki/tests/model.py --- trac-0.11.7/trac/wiki/tests/model.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/wiki/tests/model.py 2010-03-17 19:57:05.000000000 +0000 @@ -1,9 +1,16 @@ +# -*- coding: utf-8 -*- + from datetime import datetime +import os.path +import shutil +from StringIO import StringIO +import tempfile import unittest +from trac.attachment import Attachment from trac.core import * from trac.test import EnvironmentStub -from trac.util.datefmt import utc, to_timestamp +from trac.util.datefmt import utc, to_utimestamp from trac.wiki import WikiPage, IWikiChangeListener @@ -14,6 +21,7 @@ self.changed = [] self.deleted = [] self.deleted_version = [] + self.renamed = [] def wiki_page_added(self, page): self.added.append(page) @@ -27,14 +35,20 @@ def wiki_page_version_deleted(self, page): self.deleted_version.append(page) + def wiki_page_renamed(self, page, old_name): + self.renamed.append((page, old_name)) + class WikiPageTestCase(unittest.TestCase): def setUp(self): self.env = EnvironmentStub() + self.env.path = os.path.join(tempfile.gettempdir(), 'trac-tempenv') + os.mkdir(self.env.path) self.db = self.env.get_db_cnx() def tearDown(self): + shutil.rmtree(self.env.path) self.env.reset_db() def test_new_page(self): @@ -44,22 +58,34 @@ self.assertEqual(0, page.version) self.assertEqual('', page.text) self.assertEqual(0, page.readonly) + self.assertEqual('', page.author) + self.assertEqual('', page.comment) + self.assertEqual(None, page.time) def test_existing_page(self): t = datetime(2001, 1, 1, 1, 1, 1, 0, utc) cursor = self.db.cursor() cursor.execute("INSERT INTO wiki VALUES(%s,%s,%s,%s,%s,%s,%s,%s)", - ('TestPage', 0, to_timestamp(t), 'joe', '::1', 'Bla bla', - 'Testing', 0)) + ('TestPage', 1, to_utimestamp(t), 'joe', '::1', + 'Bla bla', 'Testing', 0)) page = WikiPage(self.env, 'TestPage') + self.assertEqual(True, page.exists) self.assertEqual('TestPage', page.name) - self.assertEqual(0, page.version) + self.assertEqual(1, page.version) + self.assertEqual(None, page.resource.version) # FIXME: Intentional? self.assertEqual('Bla bla', page.text) - self.assertEqual(False, page.readonly) + self.assertEqual(0, page.readonly) + self.assertEqual('joe', page.author) + self.assertEqual('Testing', page.comment) + self.assertEqual(t, page.time) + history = list(page.get_history()) self.assertEqual(1, len(history)) - self.assertEqual((0, t, 'joe', 'Testing', '::1'), history[0]) + self.assertEqual((1, t, 'joe', 'Testing', '::1'), history[0]) + + page = WikiPage(self.env, 'TestPage', 1) + self.assertEqual(1, page.resource.version) def test_create_page(self): page = WikiPage(self.env) @@ -67,11 +93,20 @@ page.text = 'Bla bla' t = datetime(2001, 1, 1, 1, 1, 1, 0, utc) page.save('joe', 'Testing', '::1', t) + + self.assertEqual(True, page.exists) + self.assertEqual(1, page.version) + self.assertEqual(1, page.resource.version) + self.assertEqual(0, page.readonly) + self.assertEqual('joe', page.author) + self.assertEqual('Testing', page.comment) + self.assertEqual(t, page.time) cursor = self.db.cursor() cursor.execute("SELECT version,time,author,ipnr,text,comment," "readonly FROM wiki WHERE name=%s", ('TestPage',)) - self.assertEqual((1, to_timestamp(t), 'joe', '::1', 'Bla bla', 'Testing', 0), + self.assertEqual((1, to_utimestamp(t), 'joe', '::1', 'Bla bla', + 'Testing', 0), cursor.fetchone()) listener = TestWikiChangeListener(self.env) @@ -82,19 +117,26 @@ t = datetime(2001, 1, 1, 1, 1, 1, 0, utc) t2 = datetime(2002, 1, 1, 1, 1, 1, 0, utc) cursor.execute("INSERT INTO wiki VALUES(%s,%s,%s,%s,%s,%s,%s,%s)", - ('TestPage', 1, to_timestamp(t), 'joe', '::1', 'Bla bla', - 'Testing', 0)) + ('TestPage', 1, to_utimestamp(t), 'joe', '::1', + 'Bla bla', 'Testing', 0)) page = WikiPage(self.env, 'TestPage') page.text = 'Bla' page.save('kate', 'Changing', '192.168.0.101', t2) + + self.assertEqual(2, page.version) self.assertEqual(2, page.resource.version) + self.assertEqual(0, page.readonly) + self.assertEqual('kate', page.author) + self.assertEqual('Changing', page.comment) + self.assertEqual(t2, page.time) cursor.execute("SELECT version,time,author,ipnr,text,comment," "readonly FROM wiki WHERE name=%s", ('TestPage',)) - self.assertEqual((1, to_timestamp(t), 'joe', '::1', 'Bla bla', 'Testing', 0), + self.assertEqual((1, to_utimestamp(t), 'joe', '::1', 'Bla bla', + 'Testing', 0), cursor.fetchone()) - self.assertEqual((2, to_timestamp(t2), 'kate', '192.168.0.101', 'Bla', + self.assertEqual((2, to_utimestamp(t2), 'kate', '192.168.0.101', 'Bla', 'Changing', 0), cursor.fetchone()) listener = TestWikiChangeListener(self.env) @@ -166,6 +208,38 @@ listener = TestWikiChangeListener(self.env) self.assertEqual(page, listener.deleted[0]) + def test_rename_page(self): + cursor = self.db.cursor() + data = (1, 42, 'joe', '::1', 'Bla bla', 'Testing', 0) + cursor.execute("INSERT INTO wiki VALUES(%s,%s,%s,%s,%s,%s,%s,%s)", + ('TestPage',) + data) + attachment = Attachment(self.env, 'wiki', 'TestPage') + attachment.insert('foo.txt', StringIO(), 0, 1) + + page = WikiPage(self.env, 'TestPage') + page.rename('PageRenamed') + self.assertEqual('PageRenamed', page.name) + + cursor.execute("SELECT version,time,author,ipnr,text,comment," + "readonly FROM wiki WHERE name=%s", ('PageRenamed',)) + self.assertEqual(data, cursor.fetchone()) + self.assertEqual(None, cursor.fetchone()) + + attachments = Attachment.select(self.env, 'wiki', 'PageRenamed') + self.assertEqual('foo.txt', attachments.next().filename) + self.assertRaises(StopIteration, attachments.next) + Attachment.delete_all(self.env, 'wiki', 'PageRenamed', self.db) + + old_page = WikiPage(self.env, 'TestPage') + self.assertEqual(False, old_page.exists) + + cursor.execute("SELECT version,time,author,ipnr,text,comment," + "readonly FROM wiki WHERE name=%s", ('TestPage',)) + self.assertEqual(None, cursor.fetchone()) + + listener = TestWikiChangeListener(self.env) + self.assertEqual((page, 'TestPage'), listener.renamed[0]) + def suite(): return unittest.makeSuite(WikiPageTestCase, 'test') diff -Nru trac-0.11.7/trac/wiki/tests/wikicreole-tests.txt trac-0.12.1~ppa2/trac/wiki/tests/wikicreole-tests.txt --- trac-0.11.7/trac/wiki/tests/wikicreole-tests.txt 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/trac/wiki/tests/wikicreole-tests.txt 2010-04-04 17:15:23.000000000 +0100 @@ -0,0 +1,301 @@ +============================================================ + + Font styles for Creole 1.0 + +============================== Bold +**bold** +------------------------------ +

+bold +

+------------------------------ +============================== Italics +//italics// +------------------------------ +

+italics +

+------------------------------ +============================== Bold and Italics +Bold and italics should //be +able// to cross lines. + +But, should //not be... + +...able// to cross paragraphs. +------------------------------ +

+Bold and italics should be +able to cross lines. +

+But, should not be... +

+...able to cross paragraphs. +

+------------------------------ +============================== More Bold Italics (SKIP) +**//bold italics//** +//**bold italics**// +//This is **also** good.// +------------------------------ +bold italics +bold italics +This is also good. +------------------------------ +============================== More Bold Italics +**//bold italics//** +//**bold italics**// +//This is **also** good.// +------------------------------ +

+bold italics +bold italics +This is also good. +

+------------------------------ +============================== Bold Italics counter examples +**//bold italics**// +//**bold italics//** +------------------------------ +

+bold italics +bold italics +

+------------------------------ +============================== Headings (WONTFIX) += Level 1 (largest) = +== Level 2 == +=== Level 3 === +==== Level 4 ==== +===== Level 5 ===== +====== Level 6 ====== +=== Also level 3 +=== Also level 3 = +=== Also level 3 == +=== **not** //parsed// === +------------------------------ +

Level 1 (largest)

Level 2

Level 3

Level 4

Level 5

Level 6

Also level 3

not //parsed//

+------------------------------ +============================== Headings (wikified headings + ids) += Level 1 (largest) = +== Level 2 == +=== Level 3 === +==== Level 4 ==== +===== Level 5 ===== +====== Level 6 ====== +=== Also level 3 +=== Also level 3 = +=== Also level 3 == +=== **not** //parsed// === +------------------------------ +

Level 1 (largest)

Level 2

Level 3

Level 4

Level 5

Level 6

Also level 3

Also level 3 =

Also level 3 ==

not parsed

+------------------------------ +============================== Links - Internal, External and Interwiki (SKIP) +[[link]] +[[MyBigPage|Go to my page]] +[[http://www.wikicreole.org/]] +http://www.rawlink.org/, http://www.another.rawlink.org +[[http://www.wikicreole.org/|Visit the WikiCreole website]] +[[Weird Stuff|**Weird** //Stuff//]] +[[Ohana:WikiFamily]] +------------------------------ +link +Go to my page +http://www.wikicreole.org/ +http://www.rawlink.org/, http://www.another.rawlink.org +Visit the WikiCreole website +**Weird** //Stuff// +Ohana:WikiFamily +------------------------------ +============================== Links - Internal, External and Interwiki +[[link]] +[[MyBigPage|Go to my page]] +[[http://www.wikicreole.org/]] +http://www.rawlink.org/, http://www.another.rawlink.org +[[http://www.wikicreole.org/|Visit the WikiCreole website]] +[[Weird Stuff|**Weird** //Stuff//]] +[[Trac:WikiFamily]] +------------------------------ +

+link? +Go to my page? + http://www.wikicreole.org/ + http://www.rawlink.org/, http://www.another.rawlink.org + Visit the WikiCreole website +**Weird** //Stuff//? + Trac:WikiFamily +

+============================================================ + + Structural Markup for Creole 1.0 + +============================== Paragraphs +This is my text. + +This is more text. +------------------------------ +

+This is my text. +

+This is more text. +

+------------------------------ +============================== Line breaks +This is the first line,\\and this is the second. +------------------------------ +

+This is the first line,
and this is the second. +

+------------------------------ +============================== Unordered Lists (SKIP) +* Item 1 +** Item 1.1 +* Item 2 +------------------------------ +

Item 1 +
- Item 1.1
+
Item 2

+------------------------------ +============================== Ordered Lists (SKIP) +# Item 1 +## Item 1.1 +# Item 2 +------------------------------ +

Item 1 +
1. Item 1.1
+
Item 2

+------------------------------ +============================== Horizontal Rule +---- +------------------------------ +

+------------------------------ +============================== Image (inline) (SKIP) +{{myimage.png|this is my image}} +------------------------------ +

Heading Col 1	Heading Col 2
Cell 1.1	Two lines in Cell 1.2
Cell 2.1	Cell 2.2

+------------------------------ +============================== Nowiki (Preformatted) +{{{ +//This// does **not** get [[formatted]] +}}} +Paragraph +------------------------------ +

//This// does **not** get [[formatted]]
+

+Paragraph +

+============================== Nowiki (inline) +Some examples of markup are: {{{** this ** }}} +------------------------------ +

+Some examples of markup are: ** <em>this</em> ** +

+------------------------------ +============================== Closing braces in nowiki (WONTFIX) +{{{ +if (x != NULL) { + for (i = 0; i < size; i++) { + if (x[i] > 0) { + x[i]--; + }}} +}}} +------------------------------ +============================================================ + + Miscellaneous syntax for Creole 1.0 + +============================== Escape Character (SKIP) +~#1 +http://www.foo.com/~bar/ +~http://www.foo.com/ +CamelCaseLink +~CamelCaseLink +Example output: +------------------------------ +#1 +http://www.foo.com/~bar/ +http://www.foo.com/ +CamelCaseLink +CamelCaseLink +------------------------------ +============================== Placeholder (SKIP) +<<>> +------------------------------ +============================== Bold and/or italic links +//[[Important page|this link is italicized]]// +**[[Important page]]** +//**[[Important page]]**// +------------------------------ +

+this link is italicized? +Important page? +Important page? +

+------------------------------ +============================== Bold, Italics, Links, Pre in Lists (SKIP) +* **bold** item +* //italic// item +# item about a [[certain page]] +# {{{ //this// is **not** [[processed]] }}} +------------------------------ +

bold item
italic item

item about a certain page
//this// is **not** [[processed]]

+------------------------------ diff -Nru trac-0.11.7/trac/wiki/tests/wikisyntax.py trac-0.12.1~ppa2/trac/wiki/tests/wikisyntax.py --- trac-0.11.7/trac/wiki/tests/wikisyntax.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/wiki/tests/wikisyntax.py 2010-04-24 21:47:49.000000000 +0100 @@ -7,11 +7,13 @@ from trac.wiki.model import WikiPage from trac.wiki.tests import formatter -TEST_CASES=u""" +TEST_CASES = u""" ============================== wiki: link resolver wiki:TestPage wiki:TestPage/ wiki:/TestPage +[wiki:/TestPage] +[wiki:/TestPage /TestPage] wiki:"Space 1 23" wiki:"C'est l'\xe9t\xe9" wiki:MissingPage @@ -22,6 +24,8 @@ wiki:TestPage wiki:TestPage/ wiki:/TestPage +TestPage +/TestPage wiki:"Space 1 23" wiki:"C'est l'\xe9t\xe9" wiki:MissingPage? @@ -181,9 +185,13 @@ [ሀሁሂሃሄህሆለሉሊላሌልሎሏሐሑሒሓሔሕሖመሙሚማሜምሞሟሠሡሢሣሤሥሦረሩሪራሬርሮሯሰሱሲሳሴስሶሷሸሹሺሻሼሽሾሿቀቁቂቃቄቅቆቈቊቋቌቍቐቑቒቓቔቕቖቘቚቛቜቝበቡቢባቤብቦቧቨቩቪቫቬቭቮቯተቱቲታቴትቶቷቸቹቺቻቼችቾቿኀኁኂኃኄኅኆኈኊኋኌኍነኑኒናኔንኖኗኘኙኚኛኜኝኞኟአኡኢኣኤእኦኧከኩኪካኬክኮኰኲኳኴኵኸኹኺኻኼኽኾወዉዊዋዌውዎዐዑዒዓዔዕዖዘዙዚዛዜዝዞዟዠዡዢዣዤዥዦዧየዩዪያዬይዮደዱዲዳዴድዶዷጀጁጂጃጄጅጆጇገጉጊጋጌግጎጐጒጓጔጕጠጡጢጣጤጥጦጧጨጩጪጫጬጭጮጯጰጱጲጳጴጵጶጷጸጹጺጻጼጽጾጿፀፁፂፃፄፅፆፈፉፊፋፌፍፎፏፐፑፒፓፔፕፖፗፘፙፚ፩፪፫፬፭፮፯፰፱፲፳፴፵፶፷፸፹፺፻] ============================== MoinMoin style forced links This is a ["Wiki"] page link. +This is a ["Wiki" wiki page] link with label. +This is a ["Wiki?param=1#fragment"] page link with query and fragment. ------------------------------

This is a Wiki? page link. +This is a wiki page? link with label. +This is a Wiki? page link with query and fragment.

------------------------------ ============================== Wiki links with @version @@ -278,58 +286,307 @@ NoLink?: ...

------------------------------ +============================== InterWiki links with parameters and fragment +See also MeatBall:InterMapTxt#there wiki page +and MeatBall:InterMapTxt?format=txt#there wiki page. + +complex link complex:a:test?go#there with positional arguments +------------------------------ +

+See also \xa0MeatBall:InterMapTxt#there wiki page +and \xa0MeatBall:InterMapTxt?format=txt#there wiki page. +

+complex link \xa0complex:a:test?go#there with positional arguments +

+------------------------------ """ #" Emacs likes it that way better -RELATIVE_LINKS_TESTS=u""" +RELATIVE_LINKS_TESTS = u""" ============================== Relative to the project url [//docs Documentation] +[//docs?param=1#fragment Documentation] +[//docs] +[//docs //docs] +[//docs?param=1#fragment] [// Home] +[//] +[//?param=1#fragment] ------------------------------

Documentation +Documentation +docs +//docs +docs Home +// +//

------------------------------ ============================== Relative to the base url -[/newticket?priority=high bug] +[/newticket?priority=high#fragment bug] +[/newticket?priority=high#fragment] +[/newticket] +[/newticket /newticket] [/ Project] +[/] +[/?param=1#fragment] ------------------------------

-bug +bug +newticket +newticket +/newticket Project +/ +/

------------------------------ ============================== Relative to the current page +[.] +[./] +[..] +[../] +[./../.] +[. this page] [./Detail see detail] +[./Detail] +[./Detail ./Detail] [.. see parent] [../Other see other] +[../Other] +[../Other ../Other] +[.././../Other] ------------------------------

+. +./ +..? +../? +./../.? +this page see detail? +Detail? +./Detail? see parent? see other? +Other? +../Other? +Other? +

+------------------------------ +============================== Relative to the current page, in wiki realm +[wiki:. this page] +[wiki:./Detail] +[wiki:"./Detail"] +[wiki:./Detail ./Detail] +[wiki:./Detail see detail] +[wiki:.. see parent] +[wiki:../Other see other] +[wiki:.././../Other] +["."] +[".?param=1#fragment"] +["./Detail"] +["./Detail?param=1#fragment"] +[".."] +["..?param=1#fragment"] +["../Other"] +["../Other?param=1#fragment"] +[".././../Other"] +------------------------------ +

+this page +Detail? +Detail? +./Detail? +see detail? +see parent? +see other? +Other? +. +. +Detail? +Detail? +..? +..? +Other? +Other? +Other?

------------------------------ -============================== Relative to the current page with anchors +============================== Relative to the current page with query strings and fragments [#topic see topic] +[?param=1#topic see topic] [.#topic see topic] +[.?param=1#topic see topic] [./#topic see topic] +[./?param=1#topic see topic] [./Detail#topic see detail] +[./Detail?param=1#topic see detail] +[./Detail?param=1#topic] [..#topic see parent] +[..?param=1#topic see parent] [../#topic see parent] +[../?param=1#topic see parent] [../Other#topic see other] +[../Other?param=1#topic see other] +[../Other?param=1#topic] [../Other/#topic see other] +[../Other/?param=1#topic see other] ------------------------------

see topic +see topic see topic +see topic see topic +see topic see detail? +see detail? +Detail? see parent? +see parent? see parent? +see parent? see other? +see other? +Other? see other? +see other? +

+------------------------------ +""" # " + + +SPLIT_PAGE_NAMES_TESTS = u""" +============================== Splitting relative links +[//WikiPage] +[/WikiPage] +[./WikiPage] +[../WikiPage] +[//WikiPage?param=1#fragment] +[/WikiPage?param=1#fragment] +[./WikiPage?param=1#fragment] +[../WikiPage?param=1#fragment] +But not [./wiki_page] +And not [../WikiPage WikiPage] +------------------------------ +

+Wiki Page +Wiki Page +Wiki Page? +Wiki Page? +Wiki Page +Wiki Page +Wiki Page? +Wiki Page? +But not wiki_page? +And not WikiPage? +

+------------------------------ +============================== Splitting scoped links +[wiki:WikiPage] +[wiki:./WikiPage] +[wiki:../WikiPage] +[wiki:./.././WikiPage] +[wiki:"./.././WikiPage"] +[wiki:WikiPage?param=1#fragment] +[wiki:./WikiPage?param=1#fragment] +[wiki:../WikiPage?param=1#fragment] +But not [wiki:./wiki_page] +And not [wiki:../WikiPage WikiPage] +------------------------------ +

+Wiki Page? +Wiki Page? +Wiki Page? +Wiki Page? +Wiki Page? +Wiki Page? +Wiki Page? +Wiki Page? +But not wiki_page? +And not WikiPage? +

+------------------------------ +============================== Splitting internal free links +["WikiPage"] +["./WikiPage"] +["../WikiPage"] +["./.././WikiPage"] +["WikiPage?param=1#fragment"] +["./WikiPage?param=1#fragment"] +["../WikiPage?param=1#fragment"] +But not ["./wiki_page"] +And not ["../WikiPage" WikiPage] +------------------------------ +

+Wiki Page? +Wiki Page? +Wiki Page? +Wiki Page? +Wiki Page? +Wiki Page? +Wiki Page? +But not wiki_page? +And not WikiPage? +

+------------------------------ +""" # " + + +SCOPED_LINKS_TESTS = u""" +============================== Scoped links for hierarchical pages +ThirdLevel +[wiki:ThirdLevel] +OtherThirdLevel +[wiki:OtherThirdLevel] +SecondLevel/OtherThirdLevel +[wiki:SecondLevel/OtherThirdLevel] +SecondLevel +[wiki:SecondLevel] +FirstLevel +[wiki:FirstLevel] +TestPage +[wiki:TestPage] +MissingPage +[wiki:MissingPage] +FirstLevel/MissingPage +[wiki:FirstLevel/MissingPage] +SecondLevel/MissingPage +[wiki:SecondLevel/MissingPage] +MissingFirstLevel/MissingPage +[wiki:MissingFirstLevel/MissingPage] +["/OtherThirdLevel"] +[wiki:/OtherThirdLevel] +[wiki:/OtherThirdLevel /OtherThirdLevel] +------------------------------ +

+ThirdLevel +ThirdLevel +OtherThirdLevel +OtherThirdLevel +SecondLevel/OtherThirdLevel +SecondLevel/OtherThirdLevel +SecondLevel +SecondLevel +FirstLevel +FirstLevel +TestPage +TestPage +MissingPage? +MissingPage? +FirstLevel/MissingPage? +FirstLevel/MissingPage? +SecondLevel/MissingPage? +SecondLevel/MissingPage? +MissingFirstLevel/MissingPage? +MissingFirstLevel/MissingPage? +OtherThirdLevel? +OtherThirdLevel? +/OtherThirdLevel?

------------------------------ """ # " @@ -374,11 +631,36 @@ """ imt.save('joe', 'test InterWiki links', '::1', now) + w = WikiPage(tc.env) + w.name = 'FirstLevel' + w.text = '--' + w.save('joe', 'first level of hierarchy', '::1', now) + + w = WikiPage(tc.env) + w.name = 'FirstLevel/SecondLevel' + w.text = '--' + w.save('joe', 'second level of hierarchy', '::1', now) + + w = WikiPage(tc.env) + w.name = 'FirstLevel/SecondLevel/ThirdLevel' + w.text = '--' + w.save('joe', 'third level of hierarchy', '::1', now) + + w = WikiPage(tc.env) + w.name = 'FirstLevel/SecondLevel/OtherThirdLevel' + w.text = '--' + w.save('joe', 'other third level of hierarchy', '::1', now) + def wiki_teardown(tc): tc.env.reset_db() +def wiki_setup_split(tc): + tc.env.config.set('wiki', 'split_page_names', 'true') + wiki_setup(tc) + + def suite(): suite = unittest.TestSuite() suite.addTest(formatter.suite(TEST_CASES, wiki_setup, __file__, @@ -386,6 +668,13 @@ suite.addTest(formatter.suite(RELATIVE_LINKS_TESTS, wiki_setup, __file__, wiki_teardown, context=('wiki', 'Main/Sub'))) + suite.addTest(formatter.suite(SPLIT_PAGE_NAMES_TESTS, wiki_setup_split, + __file__, wiki_teardown, + context=('wiki', 'Main/Sub'))) + suite.addTest(formatter.suite(SCOPED_LINKS_TESTS, wiki_setup, __file__, + wiki_teardown, + context=('wiki', + 'FirstLevel/SecondLevel/ThirdLevel'))) return suite if __name__ == '__main__': diff -Nru trac-0.11.7/trac/wiki/tests/wiki-tests.txt trac-0.12.1~ppa2/trac/wiki/tests/wiki-tests.txt --- trac-0.11.7/trac/wiki/tests/wiki-tests.txt 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/wiki/tests/wiki-tests.txt 2010-04-23 20:53:41.000000000 +0100 @@ -6,14 +6,32 @@ This should be '''''bold and italic''''' ------------------------------

-This should be bold and italic +This should be bold and italic +

+------------------------------ +============================== Multiline bold italic markup (WikiCreole) +**//bold +italic (//not italic//) +multiline//** +------------------------------ +

+bold +italic (not italic) +multiline +

+------------------------------ +============================== Problematic markup: comma-separated list with a time + bold markup +23:59,'''test''',123 +------------------------------ +

+23:59,test,123

------------------------------ ============================== Consecutive bold + italic markup '''''one''''', '''''two''''', '''''three''''', '''''four''''' ------------------------------

-one, two, three, four +one, two, three, four

------------------------------ ============================== Underline + overstrike markup @@ -41,21 +59,21 @@ '''''bolditalic''' # Open italic should be closed before paragraph end ------------------------------

-bolditalic # Open italic should be closed before paragraph end -

+bolditalic # Open italic should be closed before paragraph end +

------------------------------ ============================== Italic immediately followed by bold markup ''italic'''''bold''' ------------------------------

-italicbold +italicbold

------------------------------ ============================== Bold immediately followed by italic markup '''bold'''''italic'' ------------------------------

-bolditalic +bolditalic

------------------------------ ============================== Multiline bold italic markup @@ -64,11 +82,17 @@ multiline''''' ------------------------------

-bold +bold italic -multiline +multiline

------------------------------ +------------------------------ +

+bold
+italic
+multiline
+

============================== Problematic multiline bold italic markup '''''bold italic @@ -76,11 +100,11 @@ without endtags ------------------------------

-bold +bold italic multiline without endtags -

------------------------------ ============================== Super and subscript markup ^superscript^, ,,subscript,,, normal. @@ -152,6 +176,25 @@ Thing [link:1 number 1], CS[link:1], [link:bar]

------------------------------ +============================== Link resolvers, alternative short form + + +Thing +------------------------------ +

+<link:1> +

+Thing<link:2 and (3)> +

+------------------------------ +============================== Escaping links resolvers, alternative short form +! +------------------------------ +

+<link:1> +

+------------------------------ ============================== Link resolvers, long form with label [link:1 thing one], [http://www.edgewall.com/ edgewall] ------------------------------ @@ -240,7 +283,7 @@ '''link:1''', ''link:1'', ~~link:1~~, __link:1__ ------------------------------

-link:1, link:1, ~~link:1~~, link:1 +link:1, link:1, ~~link:1~~, link:1

------------------------------ ============================== Link resolver, quoting of target @@ -298,12 +341,57 @@ See documentation Our logo / -/?param=value#anchor +/ +new ticket +#title +see Title +

+------------------------------ +============================== Relative links (WikiCreole style) +Relative links are supported: +[[../parent|See above]] Note: see wikisyntax tests for other parent tests +[[./sibling|See next]] +[[...|nothing to see]] [[...]] +[[//docs|See documentation]] +[[//images/logo.png|Our logo]] +[[/]] +[[/?param=value#anchor]] +[[/newticket?component=test|new ticket]] +[[#title]] +[[#title|see Title]] +------------------------------ +

+Relative links are supported: +See above? Note: see wikisyntax tests for other parent tests +See next? +nothing to see? ...? +See documentation +Our logo +/ +/ new ticket #title see Title

------------------------------ +============================== Wiki anchors +This is the [=#init] initialization routine: ... +Look for [=#extra ''additional explanations''] here. +------------------------------ +

+This is the initialization routine: ... +Look for additional explanations here. +

+------------------------------ +============================== Wiki anchors (WikiCreole style) +This is the [[=#init]] initialization routine: ... +Look for [[=#extra|''additional explanations'']] here. +------------------------------ +

+This is the initialization routine: ... +Look for additional explanations here. +

+------------------------------ ============================== Image links are now regular external links http://example.com/img.png?foo=bar ------------------------------ @@ -316,7 +404,7 @@ ''RFCs von ftp://ftp.rfc-editor.org/in-notes/rfcXXXX.txt'' ------------------------------

-RFCs von ftp://ftp.rfc-editor.org/in-notes/rfcXXXX.txt +RFCs von ftp://ftp.rfc-editor.org/in-notes/rfcXXXX.txt

------------------------------ ============================== mailto: links and automatic e-mail detection @@ -345,7 +433,7 @@ ''RFCs von ftp://ftp.rfc-editor.org/in-notes/rfcXXXX.txt'' ------------------------------

-RFCs von ftp://ftp.rfc-editor.org/in-notes/rfcXXXX.txt +RFCs von ftp://ftp.rfc-editor.org/in-notes/rfcXXXX.txt

------------------------------ ============================== Generic InterTrac links @@ -353,12 +441,30 @@ th:roadmap: [th:] [th: Trac Hacks] +th:wiki:"my test spaced wiki1" +th:"wiki:my test spaced wiki2" +th:'wiki:"my test spaced wiki3"' +[th:wiki:"my test spaced wiki4"] +[th:'wiki:"my test spaced wiki5"'] +[th:"wiki:my test spaced wiki6"] +[th:wiki:"my test spaced wiki7" My Test Spaced Wiki 7] +[th:"wiki:my test spaced wiki8" My Test Spaced Wiki 8] +[th:'wiki:"my test spaced wiki9"' My Test Spaced Wiki 9] ------------------------------

th:roadmap th:roadmap: th Trac Hacks + th:wiki:"my test spaced wiki1" + th:"wiki:my test spaced wiki2" + th:'wiki:"my test spaced wiki3"' + th:wiki:"my test spaced wiki4" + th:wiki:"my test spaced wiki5" + th:wiki:my test spaced wiki6 + My Test Spaced Wiki 7 + My Test Spaced Wiki 8 + My Test Spaced Wiki 9

------------------------------ ============================== Another arbitrary protocol Link @@ -374,21 +480,109 @@ RFC 2396

+ Foo Edgewall +

+Foo Bar Foo Bar +

+Foo Bar? Fu Bar? Foo Bar? +

+*argv[] versus **argv +

+"test.txt", line 123 +

+%de +

+i.e. me +

+ th + Trac Hacks +

+ SVN link + RFC 2396 +

+------------------------------ +============================== More WikiCreole examples +[[coffeehouse setup|How to set up a coffee house]] + +[[link:Template]] +[[link:Template|]] + +[[trac:wiki:Pipe (computing)|]] +[[trac:wiki:Pipe (computing)|]] + +[[|b]] (might change to relative) +------------------------------ +

+How to set up a coffee house? +

+Template +Template +

+ trac:wiki:Pipe (computing) + trac:wiki:Pipe (computing) +

+b (might change to relative) +

+------------------------------ ============================== Link resolver counter examples -Test:[[BR]] There should be a line break +Test:[[BR]] There should be a +line break Other test:'''bold text''' should be bold ------------------------------

-Test:
There should be a line break +Test:
There should be a +line break

Other test:bold text should be bold

------------------------------ -Test: There should be a line break +Test: There should be a +line break Other test:bold text should be bold +------------------------------ +

+Test:
There should be a
+line break
+

+Other test:bold text should be bold
+

============================== Link resolver counter example '''Note:''' ------------------------------ @@ -511,6 +705,45 @@ ------------------------------ […] Paragraph +============================== Wiki processor, compact declaration +{{{#!default +Preformatted text. +}}} +Paragraph +{{{#!default}}} just normal inline code. +------------------------------ +

Preformatted text.
+

+Paragraph +#!default just normal inline code. +

+------------------------------ + […] +Paragraph +#!default just normal inline code. +============================== Wiki processor, prefix removal + {{{ + Here we keep the space prefix, as there's at least one line not having it. +Preformatted text. + }}} +Paragraph + {{{#!default + Here we remove the space prefix, as all lines have it. + Preformatted text. + }}} +Paragraph +------------------------------ +

  Here we keep the space prefix, as there's at least one line not having it.
+Preformatted text.
+

+Paragraph +

Here we remove the space prefix, as all lines have it.
+Preformatted text.
+

+Paragraph +

+------------------------------ ============================== Wiki processor counter example {{{ #!/bin/sh @@ -553,16 +786,90 @@

Click me

------------------------------ […] +============================== HTML comment wiki processor +Before +{{{ +#!htmlcomment +This is a comment with embedded tags & entities +}}} +After +------------------------------ +

+Before +

+ +

+After +

+------------------------------ +Before + […] +After +============================== HTML comment wiki processor, comment ends with "-" +Before +{{{ +#!htmlcomment +This comment ends with - +}}} +After +------------------------------ +

+Before +

+ +

+After +

+------------------------------ +Before + […] +After +============================== HTML comment wiki processor, comment contains "--" +Before +{{{ +#!htmlcomment +The character sequence -- is not allowed in comments +}}} +After +------------------------------ +

+Before +

Error: Forbidden character sequence "--" in htmlcomment wiki code block

+After +

+------------------------------ +Before + […] +After +============================== WikiProcessor default arguments +[[div(Div has 'wikipage' class.)]] +[[table()]] +Table must have 'wiki' class. +------------------------------ +

+Div has 'wikipage' class. +

+Table must have 'wiki' class. +

+------------------------------ ============================== div and span wiki processors And now it's [[span('''TIME FOR BED!,class=important)]]. Really. {{{ #!div ; class=important Go ahead, edit it freely. -{{{ -#!div; style="border: 2pt solid blue; margin: 1em; padding: .5em"; class=demo -And now it's [[span('''TIME FOR BED! ''',class=important)]]. Really. -}}} + {{{ + #!div; style="border: 2pt solid blue; margin: 1em; padding: .5em"; class=demo + And now it's [[span('''TIME FOR BED! ''',class=important)]]. Really. + }}} etc. }}} Done. @@ -594,7 +901,7 @@ Done. ------------------------------

-Go ahead, edit it freely. +Go ahead, edit it freely.

Done. @@ -602,6 +909,23 @@ ------------------------------ […] Done. +============================== span wiki processor +{{{ +#!span style="background: #ffd" +This is a multiline span + - only ''inline'' wiki formatting here, of course + - this is only a span after all! +}}} +TODO: should be expanded in inline mode +------------------------------ +This is a multiline span + - only inline wiki formatting here, of course + - this is only a span after all!

+TODO: should be expanded in inline mode +

+------------------------------ + […] +TODO: should be expanded in inline mode ============================== div and Span wiki processors {{{ #!div ; style="background: #aeaeae" @@ -624,6 +948,28 @@ Wiki Macros +============================== Macro help shortcut (with content) +[[HelloWorld?(hej hopp)]] +------------------------------ +

`[[HelloWorld]]`

+A dummy macro used by the unit test. +

+------------------------------ +[[HelloWorld?(...)]] +============================== Macro help shortcut (no content) +[[HelloWorld?]] +------------------------------ +

`[[HelloWorld]]`

+A dummy macro used by the unit test. +

+------------------------------ +[[HelloWorld?]] ============================== Macro with arguments (leading) [[HelloWorld(hej hopp)]] ------------------------------ @@ -640,14 +986,14 @@

------------------------------ Hello, [[HelloWorld(...)]] -============================== Bad macro call +============================== Bad macro call, but valid WikiCreole link [[HelloWorld(hej hopp) ]] # This shouldnt executed as macro since it contain whitespace between ) and ] ------------------------------

-[[HelloWorld?(hej hopp) ]] # This shouldnt executed as macro since it contain whitespace between ) and ] +HelloWorld(hej hopp) ? # This shouldnt executed as macro since it contain whitespace between ) and ]

------------------------------ -[[HelloWorld?(hej hopp) ]] # This shouldnt executed as macro since it contain whitespace between ) and ] +HelloWorld(hej hopp) ? # This shouldnt executed as macro since it contain whitespace between ) and ] ============================== Another bad macro call [[HelloWorld(hej hopp))]] # Extra right brace and still executed ------------------------------ @@ -714,6 +1060,21 @@

------------------------------ [[None(...)]] nada +============================== WikiProcessor defined as a macro +[[WikiProcessorSample(inlined content)]] +{{{#!WikiProcessorSample arg1=this arg2="the second argument" +multiline +content +}}} +------------------------------ +

+Called as a macro: inlined content +

+Called as a processor with params:

arg1: this
arg2: the second argument

multiline +content +------------------------------ +[[WikiProcessorSample(...)]] + […] ============================== Inlined HTML wiki processor Inline [[html( Test )]] text ------------------------------ @@ -730,6 +1091,14 @@

------------------------------ Line break another line last line +============================== WikiCreole line break +Line break \\ another line\\last line +------------------------------ +

+Line break
another line
last line +

+------------------------------ +Line break another line last line ============================== Comment wiki processor Test comment blocks {{{ @@ -787,7 +1156,7 @@ ============================== Formatted heading == ''Formatted'' ~~Heading~~ == ------------------------------ -

Formatted Heading

------------------------------ == ''Formatted'' ~~Heading~~ == ============================== Heading with link @@ -808,6 +1177,32 @@

10 tips

------------------------------ == 10 tips == +============================== Relaxed heading += Title +== Chapter +=== Section +==== Subsection +===== Subsubsection #h5 +====== h6 +======== but no h7 +------------------------------ +

Title

Chapter

Section

Subsection

Subsubsection

h6

+======== but no h7 +

+------------------------------ += Title +== Chapter +=== Section +==== Subsection +===== Subsubsection #h5 +====== h6 +======== but no h7 ============================================================ Lists @@ -887,7 +1282,7 @@

nested item 1
nested item 2 nested item 2 continued -

Subitem 1 continued +

Subitem 1 continued

Subitem 2 Subitem 2 continued

Subitem 3 @@ -953,6 +1348,100 @@ 1. But this line at the second level, which is also continued on the next line, does not. Paragraph +============================== List with explicit numerical start > 9 +'''First steps''' + + 1. Do this + 2. Do that + ... + 9. Then this + +'''Next steps''' + + 10. Now this must work + 11. This is ok again.. + ... + 19. More steps + +'''And more''' + + 20. This is ok + 21. This ok too + + ... +------------------------------ +

+First steps +

Do this +
Do that +... +
Then this +

+Next steps +

Now this must work +
This is ok again.. +... +
More steps +

+And more +

This is ok +
This ok too +

+
+... +
+

+------------------------------ +============================== List with explicit loweralpha start > 'a.' +'''First steps''' + + a. Do this + b. Do that + ... + e. Then this + +'''Next steps''' + + f. restarts at "f" + g. follows with "g" + ... + h. More steps + +'''And more''' + + i. Now this is wrong + j. (just never restart with "i." or "I.") + + ... +------------------------------ +

+First steps +

Do this +
Do that +... +
Then this +

+Next steps +

restarts at "f" +
follows with "g" +... +
More steps +

+And more +

Now this is wrong +
(just never restart with "i." or "I.") +

+
+... +
+

+------------------------------ ============================== Numbered lists counter-examples This will not start a new numbered list. There's more than one character @@ -1013,31 +1502,79 @@ Paragraph

------------------------------ +============================== Lists and partial inline markup (#3232) +This line ''does not close italic. + +No problems though as it resets. Lists won't though: + * '''Not closing bold... + * Bold Continues here... + +This will be bold too as will the rest of the page. +------------------------------ +

+This line does not close italic. +

+No problems though as it resets. Lists won't though: +

Not closing bold... +
Bold Continues here... +

+This will be bold too as will the rest of the page. +

+------------------------------ +This line does not close italic. + +No problems though as it resets. Lists won't though: + * Not closing bold... + * Bold Continues here... + +This will be bold too as will the rest of the page. +============================== Lists starting at beginning of line +- item 1 +- item 2 + - sub 2.1 + - sub 2.2 + +a. item A +b. item B +Paragraph +------------------------------ +

item 1 +
item 2 +
- sub 2.1 +
- sub 2.2 +

item A +
item B +

+Paragraph +

+------------------------------ ============================== Simple definition list term:: definition ------------------------------ -

term

definition +

term: definition

------------------------------ term:: definition ============================== Tricky definition list term:: definition:: text ------------------------------ -

term

definition:: text +

term: definition:: text

------------------------------ term:: definition:: text ============================== Verbatim term in definition list `term`:: definition ------------------------------ -

term

definition +

term: definition

------------------------------ term:: definition ============================== Another verbatim term in definition list {{{term}}}:: definition ------------------------------ -

term

definition +

term: definition

------------------------------ term:: definition @@ -1046,13 +1583,13 @@ ''formatted'' definition ------------------------------ -

complex topic

multiline -formatted +

complex topic: multiline +formatted definition

------------------------------ complex topic:: multiline - formatted + formatted definition ============================== Definition list counter example term::definition @@ -1078,7 +1615,7 @@ complex topic:: multiline `not:: a dl` ------------------------------ -

complex topic

multiline +

complex topic: multiline not:: a dl

------------------------------ @@ -1088,7 +1625,7 @@ complex topic:: multiline {{{not:: a dl}}} ------------------------------ -

complex topic

multiline +

complex topic: multiline not:: a dl

------------------------------ @@ -1135,6 +1672,49 @@ out: || RPC# || parameter len || ..... parameter ..... || ---- +============================== Simple Table with colspan +in: +|| name |||| parameter info || +|| RPC# || parameter len || ..... parameter ..... || +|||||| end || +|| !#8977 || this should also work |||| +---- +------------------------------ +

+in: +

+ +

name	parameter info +
RPC#	parameter len	..... parameter ..... +
end +
#8977	this should also work	+

+------------------------------ +in: +|| name |||| parameter info || +|| RPC# || parameter len || ..... parameter ..... || +|||||| end || +|| #8977 || this should also work |||| +---- +============================== Table headings (plus colspan) +||= this is a header =||||= another header =|| not a header || +||= also a header =|| some non- || header cells ||= header =|| +------------------------------ + +

this is a header	another header		not a header +
also a header	some non-	header cells	header +

+------------------------------ +============================== Table headings (plus alignment) +||=left align =||=default=||= default =||= right align=||= center =|| +||left align ||default|| default || right align|| center || +------------------------------ + +

left align	default	default	right align	center +
left align	default	default	right align	center +

+------------------------------ ============================== Indented tables, multiple columns || a || b || @@ -1162,6 +1742,333 @@ || a || b || || a || b || +============================== Table escaping +|| a !|| b || + +!|| a !|| b !|| +------------------------------ + +

a || b +

+|| a || b || +

+------------------------------ +|| a || b || + +|| a || b || +============================== Table with row continuation +|| a very long cell, with lots of content || \ +|| \ +|| a second cell, on the same row || +|| +|| Another row || \ +|| Another row || +|| normal || row || +|| a very long cell, with lots of content || \ +|| a second cell, on the same row || +|| normal || row || +|||| \ +|| this should also work || +------------------------------ + + +

a very long cell, with lots of content + +	a second cell, on the same row +
Another row +	Another row +
normal	row +
a very long cell, with lots of content +	a second cell, on the same row +
normal	row +
+	this should also work +

+------------------------------ +============================== Table with !#th and !#td wiki processors +{{{ +#!th style="text-align: left" + - some header +}}} +{{{ +#!th + - another header + - with more rows +}}} +|| +{{{ +#!td rowspan=2 + +Arbitrarily big content (even an embedded table of course): +|| A || B || + + {{{ + #!div class=important + or better, an embedded wiki paragraph, itself with a big table + ||= A =||= B =|| + {{{ + #!td colspan=2 + {{{ + def hello(): + print "A and B!" + }}} + }}} + }}} + +}}} +{{{ +#!td + +Second cell, first row +}}} +|| +{{{ +#!td + +Second cell, second row... +}}} +------------------------------ + + + +

some header +

another header +
with more rows +

+Arbitrarily big content (even an embedded table of course): +

+ +

B +

+or better, an embedded wiki paragraph, itself with a big table +

+ +

A	B +
def hello(): + print "A and B!" +

+Second cell, first row +

+Second cell, second row... +

+------------------------------ +============================== Table with wiki processors, unfinished block +{{{ +#!td style="vertical-align: top" + - some header +}}} +{{{ +#!td + - another header + - with more rows +|| +{{{ +#!td rowspan=2 +not another cell, but an embedded table... +------------------------------ + +

some header +

another header +
with more rows +

+ +

+not another cell, but an embedded table... +

+------------------------------ +============================== Table with wiki processors, wikimedia row sep +{{{#!th ........... 11 +Heading A +}}} +{{{#!th ........... 12 +Heading B +}}} +|--------------------------- style="background: grey" +{{{#!td ........... 21 +Content A +}}} +{{{#!td ........... 22 +Content B +}}} +------------------------------ + + +

+Heading A + +	+Heading B + +
+Content A + +	+Content B + +

+------------------------------ + […] + […][…] + […] +============================== Table with wiki processors (tr, th and td) +A very nice table: +{{{#!table style="border: none" +{{{#!tr ++++++++++++++++++++++++++++++++++++++++++++++ style="background: #ffd" + {{{#!th .......................................... style="background: #dfd" + + Header A + + }}} + {{{#!th .......................................... style="background: #dfd" + + Header B + + }}} +}}} +{{{#!tr ++++++++++++++++++++++++++++++++++++++++++++++ style="background: #fdf" + {{{#!td .......................................... + + Content A + + }}} + {{{#!td .......................................... + + Content B + + }}} +}}} +}}} +Paragraph +------------------------------ +

+A very nice table: +

+Header A + +	+Header B + +
+Content A + +	+Content B + +

+Paragraph +

+------------------------------ +A very nice table: + […] +Paragraph +============================== Table with wiki processors (table but no cells) +A very nice table: +{{{#!table style="border: none" + +This table processor doesn't contain any cell, this is an error. +}}} +Paragraph +------------------------------ +

+A very nice table: +

!#table must contain at least one table cell (and table cells only)

+Paragraph +

+------------------------------ +A very nice table: + […] +Paragraph +============================== Table with wiki processors (tr but no cells) +A very nice table: +{{{#!table style="border: none" + +{{{#!tr +This tr processor doesn't contain any cell, this is an error. +}}} + +}}} +Paragraph +------------------------------ +

+A very nice table: +

!#table must contain at least one table cell (and table cells only)

+Paragraph +

+------------------------------ +A very nice table: + […] +Paragraph +============================== Table with wiki processors (table + multiple embedded tables) +A very nice table: +{{{#!table style="border: none" + +|| only one table || + +|| extra table is an error|| +}}} +Paragraph +------------------------------ +

+A very nice table: +

!#table must contain at most one table

+Paragraph +

+------------------------------ +A very nice table: + […] +Paragraph +============================== Table with wiki processors within div +{{{#!div + {{{#!td rowspan=2 + A cell can now contain any markup: + - lists + - blocks + - etc. + }}} + {{{#!td + Another cell with rich content, + on the same row + }}} + |- + {{{#!td + Another cell with rich content, + on the next row + }}} +}}} +Paragraph +------------------------------ +

+ +

+A cell can now contain any markup: +

lists +
blocks +
etc. +

+Another cell with rich content, +on the same row +

+Another cell with rich content, +on the next row +

+Paragraph +

+------------------------------ ============================================================ Mixed examples @@ -1188,6 +2095,16 @@ * Item 1 * Item 2 Another paragraph +------------------------------ +

Heading 1

+Paragraph
+

Item 1 +
- Item 2 +

+Another paragraph
+

============================== Heading, lists and table Paragraph ---- @@ -1218,6 +2135,20 @@ ||Table||cell|| ||Foo||Bar||Baz|| http://www.edgewall.com/ +------------------------------ +

+Paragraph
+

Item 1 +
1. Item 2 +

Table	cell +
Foo	Bar	Baz +

+ http://www.edgewall.com/
+

============================== Lists, indents and table * Bar @@ -1298,20 +2229,21 @@ Paragraph.

------------------------------ -============================== Citations +============================== Citations (mail style, no consistent space) > This is the quoted text >> a nested quote A comment on the above >> start 2nd level +>> continue 2nd level > first level ------------------------------

- This is the quoted text +This is the quoted text

- a nested quote +a nested quote

@@ -1321,11 +2253,12 @@

- start 2nd level +start 2nd level +continue 2nd level

- first level +first level

------------------------------ @@ -1333,4 +2266,173 @@ >> a nested quote A comment on the above >> start 2nd level +>> continue 2nd level > first level +------------------------------ +

+
+This is the quoted text
+
+
+
+a nested quote
+
+
+

+A comment on the above
+

+
+
+start 2nd level
+continue 2nd level
+
+
+
+first level
+
+

+============================== Citations (reply to style, consistent space) + A quote +A paragraph + definition :: term + +> A quote +>A paragraph +> definition :: term + +> A quote +> A paragraph +> definition :: term +------------------------------ +

+
+A quote +
+

+A paragraph +

definition: term +
+

+
+
+A quote +
+
+
+A paragraph +
definition
term +
+
+

+------------------------------ +A quote +A paragraph + definition :: term + +> A quote +>A paragraph +> definition :: term + +> A quote +> A paragraph +> definition :: term +============================== Citations of arbitrary wiki content + - First level + - second level + > - This is the quoted list, in first level item + > - subitem + > + > > a nested paragraph with a block (outside of the quoted list above as there's a paragraph sep) + > > {{{ + > > block + > > }}} + > > > || nested || table || +Paragraph +------------------------------ +

First level +
- second level +
+
- This is the quoted list, in first level item +
  - subitem +
+
+a nested paragraph with a block (outside of the quoted list above as there's a paragraph sep) +
+
```
block
+
```
+ +
nested table +
+
+
+
+

+Paragraph +

+------------------------------ +- First level + - second level + > - This is the quoted list, in first level item + > - subitem + > + > > a nested paragraph with a block (outside of the quoted list above as there's a paragraph sep) + > > {{{ + > > block + > > }}} + > > > || nested || table || +Paragraph +============================== Citation and follow-up block +> a +{{{ +b +}}} +> c +------------------------------ +

+
+a +
+

b
+

+
+c +
+

+------------------------------ +> a + […] +> c +============================== Block and follow-up citation +{{{ +> a +b +}}} +> c +------------------------------ +

> a
+b
+

+
+c +
+

+------------------------------ + […] +> c diff -Nru trac-0.11.7/trac/wiki/web_api.py trac-0.12.1~ppa2/trac/wiki/web_api.py --- trac-0.11.7/trac/wiki/web_api.py 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/trac/wiki/web_api.py 2010-01-29 08:15:27.000000000 +0000 @@ -0,0 +1,57 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2009 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/. + +from trac.core import * +from trac.mimeview.api import Context +from trac.resource import Resource +from trac.web.api import IRequestHandler +from trac.wiki.formatter import format_to + + +class WikiRenderer(Component): + """Wiki text renderer.""" + + implements(IRequestHandler) + + # IRequestHandler methods + + def match_request(self, req): + return req.path_info == '/wiki_render' + + def process_request(self, req): + # Allow all POST requests (with a valid __FORM_TOKEN, ensuring that + # the client has at least some permission). Additionally, allow GET + # requests from TRAC_ADMIN for testing purposes. + if req.method != 'POST': + req.perm.require('TRAC_ADMIN') + realm = req.args.get('realm', 'wiki') + id = req.args.get('id') + version = req.args.get('version') + if version is not None: + try: + version = int(version) + except ValueError: + version = None + text = req.args.get('text', '') + flavor = req.args.get('flavor') + options = {} + if 'escape_newlines' in req.args: + options['escape_newlines'] = bool(int(req.args['escape_newlines'] + or 0)) + if 'shorten' in req.args: + options['shorten'] = bool(int(req.args['shorten'] or 0)) + + resource = Resource(realm, id=id, version=version) + context = Context.from_request(req, resource) + rendered = format_to(self.env, flavor, context, text, **options) + req.send(rendered.encode('utf-8')) diff -Nru trac-0.11.7/trac/wiki/web_ui.py trac-0.12.1~ppa2/trac/wiki/web_ui.py --- trac-0.11.7/trac/wiki/web_ui.py 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/trac/wiki/web_ui.py 2010-05-01 17:01:31.000000000 +0100 @@ -16,11 +16,9 @@ # Author: Jonas Borgström # Christopher Lenz -from datetime import datetime import pkg_resources import re -from genshi.core import Markup from genshi.builder import tag from trac.attachment import AttachmentModule @@ -32,16 +30,16 @@ from trac.search import ISearchSource, search_to_sql, shorten_result from trac.timeline.api import ITimelineEventProvider from trac.util import get_reporter_id -from trac.util.datefmt import to_timestamp, utc +from trac.util.datefmt import from_utimestamp, to_utimestamp from trac.util.text import shorten_line -from trac.util.translation import _ +from trac.util.translation import _, tag_ from trac.versioncontrol.diff import get_diff_options, diff_blocks from trac.web.chrome import add_ctxtnav, add_link, add_notice, add_script, \ add_stylesheet, add_warning, prevnext_nav, \ - INavigationContributor, ITemplateProvider -from trac.web import IRequestHandler + Chrome, INavigationContributor, ITemplateProvider +from trac.web.api import IRequestHandler from trac.wiki.api import IWikiPageManipulator, WikiSystem -from trac.wiki.formatter import format_to +from trac.wiki.formatter import format_to, OneLinerFormatter from trac.wiki.model import WikiPage class InvalidWikiPage(TracError): @@ -94,7 +92,8 @@ # IPermissionRequestor methods def get_permission_actions(self): - actions = ['WIKI_CREATE', 'WIKI_DELETE', 'WIKI_MODIFY', 'WIKI_VIEW'] + actions = ['WIKI_CREATE', 'WIKI_DELETE', 'WIKI_MODIFY', 'WIKI_RENAME', + 'WIKI_VIEW'] return actions + [('WIKI_ADMIN', actions)] # IRequestHandler methods @@ -121,10 +120,10 @@ req.perm(page.resource).require('WIKI_VIEW') req.perm(versioned_page.resource).require('WIKI_VIEW') - if version and versioned_page.version == 0 and \ - page.version != 0: - raise TracError(_('No version "%(num)s" for Wiki page "%(name)s"', - num=version, name=page.name)) + if version and versioned_page.version != int(version): + raise ResourceNotFound( + _('No version "%(num)s" for Wiki page "%(name)s"', + num=version, name=page.name)) add_stylesheet(req, 'common/css/wiki.css') @@ -138,6 +137,7 @@ if a in req.args: action = a break + versioned_page.text = req.args.get('text') valid = self._validate(req, versioned_page) if action == 'edit' and not has_collision and valid: return self._do_save(req, versioned_page) @@ -145,12 +145,19 @@ return self._render_editor(req, page, action, has_collision) elif action == 'delete': self._do_delete(req, versioned_page) + elif action == 'rename': + return self._do_rename(req, page) elif action == 'diff': - get_diff_options(req) + style, options, diff_data = get_diff_options(req) + contextall = diff_data['options']['contextall'] req.redirect(req.href.wiki(versioned_page.name, action='diff', - old_version=old_version)) + old_version=old_version, + version=version, + contextall=contextall or None)) elif action == 'delete': - return self._render_confirm(req, versioned_page) + return self._render_confirm_delete(req, versioned_page) + elif action == 'rename': + return self._render_confirm_rename(req, page) elif action == 'edit': return self._render_editor(req, versioned_page) elif action == 'diff': @@ -220,7 +227,8 @@ ignore_space_changes='-b' in diff_options) def version_info(v, last=0): return {'path': get_resource_name(self.env, page.resource), - 'rev': v or 'currently edited', + # TRANSLATOR: wiki page + 'rev': v or _('currently edited'), 'shortrev': v or last + 1, 'href': v and req.href.wiki(page.name, version=v) or None} changes = [{'diffs': diffs, 'props': [], @@ -243,15 +251,15 @@ version = int(req.args.get('version', 0)) or None old_version = int(req.args.get('old_version', 0)) or version - db = self.env.get_db_cnx() - if version and old_version and version > old_version: - # delete from `old_version` exclusive to `version` inclusive: - for v in range(old_version, version): - page.delete(v + 1, db) - else: - # only delete that `version`, or the whole page if `None` - page.delete(version, db) - db.commit() + @self.env.with_transaction() + def do_delete(db): + if version and old_version and version > old_version: + # delete from `old_version` exclusive to `version` inclusive: + for v in range(old_version, version): + page.delete(v + 1, db) + else: + # only delete that `version`, or the whole page if `None` + page.delete(version, db) if not page.exists: add_notice(req, _('The page %(name)s has been deleted.', @@ -268,6 +276,44 @@ version=version, name=page.name)) req.redirect(req.href.wiki(page.name)) + def _do_rename(self, req, page): + if page.readonly: + req.perm(page.resource).require('WIKI_ADMIN') + else: + req.perm(page.resource).require('WIKI_RENAME') + + if 'cancel' in req.args: + req.redirect(get_resource_url(self.env, page.resource, req.href)) + + old_name, old_version = page.name, page.version + new_name = req.args.get('new_name', '').rstrip('/') + redirect = req.args.get('redirect') + + # verify input parameters + warn = None + if not new_name: + warn = _('A new name is mandatory for a rename.') + elif new_name == old_name: + warn = _('The new name must be different from the old name.') + elif WikiPage(self.env, new_name).exists: + warn = _('The page %(name)s already exists.', name=new_name) + if warn: + add_warning(req, warn) + return self._render_confirm_rename(req, page, new_name) + + @self.env.with_transaction() + def do_rename(db): + page.rename(new_name) + if redirect: + redirection = WikiPage(self.env, old_name, db=db) + redirection.text = _('See [wiki:"%(name)s"].', name=new_name) + author = get_reporter_id(req) + comment = u'[wiki:"%s@%d" %s] \u2192 [wiki:"%s"].' % ( + new_name, old_version, old_name, new_name) + redirection.save(author, comment, req.remote_addr) + + req.redirect(req.href.wiki(redirect and old_name or new_name)) + def _do_save(self, req, page): if page.readonly: req.perm(page.resource).require('WIKI_ADMIN') @@ -276,24 +322,23 @@ else: req.perm(page.resource).require('WIKI_MODIFY') - page.text = req.args.get('text') if 'WIKI_ADMIN' in req.perm(page.resource): # Modify the read-only flag if it has been changed and the user is # WIKI_ADMIN page.readonly = int('readonly' in req.args) try: - page.save(get_reporter_id(req, 'author'), - req.args.get('comment'), - req.remote_addr) - add_notice(req, _('Your changes have been saved.')) + page.save(get_reporter_id(req, 'author'), req.args.get('comment'), + req.remote_addr) + add_notice(req, _('Your changes have been saved in version ' + '%(version)s.', version=page.version)) req.redirect(get_resource_url(self.env, page.resource, req.href, version=None)) except TracError: add_warning(req, _("Page not modified, showing latest version.")) return self._render_view(req, page) - def _render_confirm(self, req, page): + def _render_confirm_delete(self, req, page): if page.readonly: req.perm(page.resource).require('WIKI_ADMIN') else: @@ -309,8 +354,8 @@ 'num_versions': 0}) if version is not None: num_versions = 0 - for v,t,author,comment,ipnr in page.get_history(): - num_versions += 1; + for v, t, author, comment, ipnr in page.get_history(): + num_versions += 1 if num_versions > 1: break data.update({'new_version': version, 'old_version': old_version, @@ -318,6 +363,17 @@ self._wiki_ctxtnav(req, page) return 'wiki_delete.html', data, None + def _render_confirm_rename(self, req, page, new_name=None): + if page.readonly: + req.perm(page.resource).require('WIKI_ADMIN') + else: + req.perm(page.resource).require('WIKI_RENAME') + + data = self._page_data(req, page, 'rename') + data['new_name'] = new_name is None and page.name or new_name + self._wiki_ctxtnav(req, page) + return 'wiki_rename.html', data, None + def _render_diff(self, req, page): if not page.exists: raise TracError(_('Version %(num)s of page "%(name)s" does not ' @@ -340,7 +396,6 @@ date = author = comment = ipnr = None num_changes = 0 - old_page = None prev_version = next_version = None for version, t, a, c, i in latest_page.get_history(): if version == new_version: @@ -353,19 +408,18 @@ num_changes += 1 if not prev_version: prev_version = version - if (old_version and version == old_version) or \ - not old_version: + if old_version is None or version == old_version: old_version = version - old_page = WikiPage(self.env, page.name, old_version) - req.perm(old_page.resource).require('WIKI_VIEW') break else: next_version = version if not old_version: old_version = 0 + old_page = WikiPage(self.env, page.name, old_version) + req.perm(old_page.resource).require('WIKI_VIEW') # -- text diffs - old_text = old_page and old_page.text.splitlines() or [] + old_text = old_page.text.splitlines() new_text = page.text.splitlines() diff_data, changes = self._prepare_diff(req, page, old_text, new_text, old_version, new_version) @@ -393,7 +447,8 @@ 'changes': changes, 'diff': diff_data, }) - prevnext_nav(req, _('Change'), _('Wiki History')) + prevnext_nav(req, _('Previous Change'), _('Next Change'), + _('Wiki History')) return 'wiki_diff.html', data, None def _render_editor(self, req, page, action='edit', has_collision=False): @@ -417,25 +472,42 @@ if template_page and template_page.exists and \ 'WIKI_VIEW' in req.perm(template_page.resource): page.text = template_page.text - if action == 'preview': + if action in ('preview', 'diff'): page.readonly = 'readonly' in req.args author = get_reporter_id(req, 'author') comment = req.args.get('comment', '') - editrows = req.args.get('editrows') - - if editrows: - pref = req.session.get('wiki_editrows', '20') - if editrows != pref: - req.session['wiki_editrows'] = editrows + + defaults = {'editrows': 20} + prefs = dict((key, req.session.get('wiki_%s' % key, defaults.get(key))) + for key in ('editrows', 'sidebyside')) + + if 'from_editor' in req.args: + sidebyside = req.args.get('sidebyside') or None + if sidebyside != prefs['sidebyside']: + if sidebyside: + req.session['wiki_sidebyside'] = '1' + else: + del req.session['wiki_sidebyside'] else: - editrows = req.session.get('wiki_editrows', '20') + sidebyside = prefs['sidebyside'] + + if sidebyside: + editrows = max(int(prefs['editrows']), + len(page.text.splitlines()) + 1) + else: + editrows = req.args.get('editrows') + if editrows: + if editrows != prefs['editrows']: + req.session['wiki_editrows'] = editrows + else: + editrows = prefs['editrows'] data = self._page_data(req, page, action) data.update({ 'author': author, 'comment': comment, - 'edit_rows': editrows, + 'edit_rows': editrows, 'sidebyside': sidebyside, 'scroll_bar_pos': req.args.get('scroll_bar_pos', ''), 'diff': None, }) @@ -447,8 +519,12 @@ data.update({'diff': diff_data, 'changes': changes, 'action': 'preview', 'merge': action == 'merge', 'longcol': 'Version', 'shortcol': 'v'}) + elif sidebyside and action != 'collision': + data['action'] = 'preview' self._wiki_ctxtnav(req, page) + Chrome(self.env).add_wiki_toolbars(req) + Chrome(self.env).add_auto_preview(req) return 'wiki_edit.html', data, None def _render_history(self, req, page): @@ -472,7 +548,8 @@ 'ipnr': ipnr }) data.update({'history': history, 'resource': page.resource}) - add_ctxtnav(req, 'Back to '+page.name, req.href.wiki(page.name)) + add_ctxtnav(req, _("Back to %(wikipage)s", wikipage=page.name), + req.href.wiki(page.name)) return 'history_view.html', data, None def _render_view(self, req, page): @@ -494,10 +571,29 @@ if page.name == 'WikiStart': data['title'] = '' + ws = WikiSystem(self.env) + context = Context.from_request(req, page.resource) + higher, related = [], [] if not page.exists: if 'WIKI_CREATE' not in req.perm(page.resource): raise ResourceNotFound(_('Page %(name)s not found', name=page.name)) + formatter = OneLinerFormatter(self.env, context) + if '/' in page.name: + parts = page.name.split('/') + for i in range(len(parts) - 2, -1, -1): + name = '/'.join(parts[:i] + [parts[-1]]) + if not ws.has_page(name): + higher.append(ws._format_link(formatter, 'wiki', + '/' + name, name, False)) + else: + name = page.name + name = name.lower() + related = [each for each in ws.pages if name in each.lower()] + related.sort() + related = [ws._format_link(formatter, 'wiki', '/' + each, each, + False) + for each in related] latest_page = WikiPage(self.env, page.name, version=None) req.perm(latest_page.resource).require('WIKI_VIEW') @@ -519,9 +615,9 @@ version = None prefix = self.PAGE_TEMPLATES_PREFIX - templates = [template[len(prefix):] for template in - WikiSystem(self.env).get_pages(prefix) if - 'WIKI_VIEW' in req.perm('wiki', template)] + templates = [template[len(prefix):] + for template in ws.get_pages(prefix) + if 'WIKI_VIEW' in req.perm('wiki', template)] # -- prev/up/next links if prev_version: @@ -545,24 +641,31 @@ # Add ctxtnav entries if version: - prevnext_nav(req, _('Version'), _('View Latest Version')) - add_ctxtnav(req, _('Last Change'), - req.href.wiki(page.name, action='diff', - version=page.version)) + prevnext_nav(req, _('Previous Version'), _('Next Version'), + _('View Latest Version')) else: if parent: add_ctxtnav(req, _('Up'), req.href.wiki(parent)) self._wiki_ctxtnav(req, page) - context = Context.from_request(req, page.resource) + # Plugin content validation + fields = {'text': page.text} + for manipulator in self.page_manipulators: + manipulator.prepare_wiki_page(req, page, fields) + text = fields.get('text', '') + data.update({ 'context': context, + 'text': text, 'latest_version': latest_page.version, 'attachments': AttachmentModule(self.env).attachment_data(context), 'default_template': self.DEFAULT_PAGE_TEMPLATE, 'templates': templates, - 'version': version + 'version': version, + 'higher': higher, 'related': related, + 'resourcepath_template': 'wiki_page_path.html', }) + add_script(req, 'common/js/folding.js') return 'wiki_view.html', data, None def _wiki_ctxtnav(self, req, page): @@ -572,9 +675,6 @@ if page.exists: add_ctxtnav(req, _('History'), req.href.wiki(page.name, action='history')) - add_ctxtnav(req, _('Last Change'), - req.href.wiki(page.name, action='diff', - version=page.version)) # ITimelineEventProvider methods @@ -589,12 +689,12 @@ cursor = db.cursor() cursor.execute("SELECT time,name,comment,author,version " "FROM wiki WHERE time>=%s AND time<=%s", - (to_timestamp(start), to_timestamp(stop))) - for ts,name,comment,author,version in cursor: + (to_utimestamp(start), to_utimestamp(stop))) + for ts, name, comment, author, version in cursor: wiki_page = wiki_realm(id=name, version=version) if 'WIKI_VIEW' not in req.perm(wiki_page): continue - yield ('wiki', datetime.fromtimestamp(ts, utc), author, + yield ('wiki', from_utimestamp(ts), author, (wiki_page, comment)) # Attachments @@ -607,15 +707,19 @@ if field == 'url': return context.href.wiki(wiki_page.id, version=wiki_page.version) elif field == 'title': - return tag(tag.em(get_resource_name(self.env, wiki_page)), - wiki_page.version > 1 and ' edited' or ' created') + name = tag.em(get_resource_name(self.env, wiki_page)) + if wiki_page.version > 1: + return tag_('%(page)s edited', page=name) + else: + return tag_('%(page)s created', page=name) elif field == 'description': markup = format_to(self.env, None, context(resource=wiki_page), comment) if wiki_page.version > 1: diff_href = context.href.wiki( wiki_page.id, version=wiki_page.version, action='diff') - markup = tag(markup, ' ', tag.a('(diff)', href=diff_href)) + markup = tag(markup, + ' (', tag.a(_('diff'), href=diff_href), ')') return markup # ISearchSource methods @@ -644,7 +748,7 @@ if 'WIKI_VIEW' in req.perm(page): yield (get_resource_url(self.env, page, req.href), '%s: %s' % (name, shorten_line(text)), - datetime.fromtimestamp(ts, utc), author, + from_utimestamp(ts), author, shorten_result(text, terms)) # Attachments diff -Nru trac-0.11.7/Trac.egg-info/entry_points.txt trac-0.12.1~ppa2/Trac.egg-info/entry_points.txt --- trac-0.11.7/Trac.egg-info/entry_points.txt 2010-03-09 22:49:51.000000000 +0000 +++ trac-0.12.1~ppa2/Trac.egg-info/entry_points.txt 2010-05-05 03:28:06.000000000 +0100 @@ -11,9 +11,7 @@ trac.db.mysql = trac.db.mysql_backend trac.db.postgres = trac.db.postgres_backend trac.db.sqlite = trac.db.sqlite_backend - trac.mimeview.enscript = trac.mimeview.enscript trac.mimeview.patch = trac.mimeview.patch - trac.mimeview.php = trac.mimeview.php trac.mimeview.pygments = trac.mimeview.pygments[Pygments] trac.mimeview.rst = trac.mimeview.rst[reST] trac.mimeview.silvercity = trac.mimeview.silvercity[SilverCity] @@ -26,11 +24,22 @@ trac.ticket.roadmap = trac.ticket.roadmap trac.ticket.web_ui = trac.ticket.web_ui trac.timeline = trac.timeline.web_ui + trac.versioncontrol.admin = trac.versioncontrol.admin + trac.versioncontrol.svn_authz = trac.versioncontrol.svn_authz trac.versioncontrol.svn_fs = trac.versioncontrol.svn_fs trac.versioncontrol.svn_prop = trac.versioncontrol.svn_prop trac.versioncontrol.web_ui = trac.versioncontrol.web_ui trac.web.auth = trac.web.auth + trac.web.session = trac.web.session + trac.wiki.admin = trac.wiki.admin trac.wiki.interwiki = trac.wiki.interwiki trac.wiki.macros = trac.wiki.macros trac.wiki.web_ui = trac.wiki.web_ui + trac.wiki.web_api = trac.wiki.web_api + tracopt.mimeview.enscript = tracopt.mimeview.enscript + tracopt.mimeview.php = tracopt.mimeview.php + tracopt.perm.authz_policy = tracopt.perm.authz_policy + tracopt.perm.config_perm_provider = tracopt.perm.config_perm_provider + tracopt.ticket.commit_updater = tracopt.ticket.commit_updater + tracopt.ticket.deleter = tracopt.ticket.deleter \ No newline at end of file diff -Nru trac-0.11.7/Trac.egg-info/not-zip-safe trac-0.12.1~ppa2/Trac.egg-info/not-zip-safe --- trac-0.11.7/Trac.egg-info/not-zip-safe 2010-03-09 22:49:51.000000000 +0000 +++ trac-0.12.1~ppa2/Trac.egg-info/not-zip-safe 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ - diff -Nru trac-0.11.7/Trac.egg-info/PKG-INFO trac-0.12.1~ppa2/Trac.egg-info/PKG-INFO --- trac-0.11.7/Trac.egg-info/PKG-INFO 2010-03-09 22:49:51.000000000 +0000 +++ trac-0.12.1~ppa2/Trac.egg-info/PKG-INFO 2010-05-05 03:28:06.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: Trac -Version: 0.11.7 +Version: 0.12dev Summary: Integrated SCM, wiki, issue tracker and project environment Home-page: http://trac.edgewall.org/ Author: Edgewall Software diff -Nru trac-0.11.7/Trac.egg-info/requires.txt trac-0.12.1~ppa2/Trac.egg-info/requires.txt --- trac-0.11.7/Trac.egg-info/requires.txt 2010-03-09 22:49:51.000000000 +0000 +++ trac-0.12.1~ppa2/Trac.egg-info/requires.txt 2010-05-05 03:28:06.000000000 +0100 @@ -1,9 +1,12 @@ setuptools>=0.6b1 -Genshi>=0.5 +Genshi>=0.6 [SilverCity] SilverCity>=0.9.4 +[Babel] +Babel>=0.9.5 + [Textile] textile>=2.0 diff -Nru trac-0.11.7/Trac.egg-info/SOURCES.txt trac-0.12.1~ppa2/Trac.egg-info/SOURCES.txt --- trac-0.11.7/Trac.egg-info/SOURCES.txt 2010-03-09 22:49:51.000000000 +0000 +++ trac-0.12.1~ppa2/Trac.egg-info/SOURCES.txt 2010-05-05 03:28:06.000000000 +0100 @@ -1,66 +1,17 @@ -AUTHORS -COPYING -ChangeLog -INSTALL README -RELEASE -TESTING-README -THANKS -UPGRADE setup.cfg setup.py -setup_wininst.bmp Trac.egg-info/PKG-INFO Trac.egg-info/SOURCES.txt Trac.egg-info/dependency_links.txt Trac.egg-info/entry_points.txt -Trac.egg-info/not-zip-safe Trac.egg-info/requires.txt Trac.egg-info/top_level.txt -cgi-bin/trac.cgi -cgi-bin/trac.fcgi -contrib/README -contrib/bugzilla2trac.py -contrib/checkwiki.py -contrib/emailfilter.py -contrib/htdigest.py -contrib/htpasswd.py -contrib/migrateticketmodel.py -contrib/sourceforge2trac.py -contrib/trac-post-commit-hook -contrib/trac-post-commit-hook.cmd -contrib/trac-pre-commit-hook -contrib/rpm/installscript -contrib/rpm/makerpm -contrib/workflow/README -contrib/workflow/enterprise-workflow.ini -contrib/workflow/migrate_original_to_basic.py -contrib/workflow/opensource-workflow.ini -contrib/workflow/showworkflow -contrib/workflow/simple-workflow.ini -contrib/workflow/trivial-workflow.ini -contrib/workflow/workflow_parser.py -doc/README -doc/trac_icon_16x16.png -doc/trac_icon_32x32.png -doc/trac_logo.png -doc/trac_logo.svg -sample-plugins/HelloWorld.py -sample-plugins/Timestamp.py -sample-plugins/revision_links.py -sample-plugins/ticket_clone.py -sample-plugins/permissions/authz_policy.py -sample-plugins/permissions/extrapermissionsprovider.py -sample-plugins/permissions/public_wiki_policy.py -sample-plugins/permissions/vulnerability_tickets.py -sample-plugins/workflow/CodeReview.py -sample-plugins/workflow/DeleteTicket.py -sample-plugins/workflow/StatusFixer.py -sample-plugins/workflow/VoteOperation.py -sample-plugins/workflow/enterprise-review-workflow.ini +Trac.egg-info/zip-safe trac/__init__.py trac/about.py trac/attachment.py +trac/cache.py trac/config.py trac/core.py trac/db_default.py @@ -75,23 +26,6 @@ trac/admin/api.py trac/admin/console.py trac/admin/web_ui.py -trac/admin/templates/admin.html -trac/admin/templates/admin_basics.html -trac/admin/templates/admin_components.html -trac/admin/templates/admin_enums.html -trac/admin/templates/admin_legacy.html -trac/admin/templates/admin_logging.html -trac/admin/templates/admin_milestones.html -trac/admin/templates/admin_perms.html -trac/admin/templates/admin_plugins.html -trac/admin/templates/admin_versions.html -trac/admin/templates/deploy_trac.cgi -trac/admin/templates/deploy_trac.fcgi -trac/admin/templates/deploy_trac.wsgi -trac/admin/tests/__init__.py -trac/admin/tests/console-tests.txt -trac/admin/tests/console.py -trac/admin/tests/functional.py trac/db/__init__.py trac/db/api.py trac/db/mysql_backend.py @@ -100,136 +34,19 @@ trac/db/schema.py trac/db/sqlite_backend.py trac/db/util.py -trac/db/tests/__init__.py -trac/db/tests/api.py -trac/db/tests/functional.py -trac/db/tests/postgres_test.py -trac/htdocs/README -trac/htdocs/asc.png -trac/htdocs/attachment.png -trac/htdocs/changeset.png -trac/htdocs/closedticket.png -trac/htdocs/collapsed.png -trac/htdocs/desc.png -trac/htdocs/dots.gif -trac/htdocs/download.png -trac/htdocs/draft.png -trac/htdocs/edit_toolbar.png -trac/htdocs/editedticket.png -trac/htdocs/envelope.png -trac/htdocs/expanded.png -trac/htdocs/expander_normal.png -trac/htdocs/expander_normal_hover.png -trac/htdocs/expander_open.png -trac/htdocs/expander_open_hover.png -trac/htdocs/extlink.gif -trac/htdocs/feed.png -trac/htdocs/file.png -trac/htdocs/folder.png -trac/htdocs/ics.png -trac/htdocs/imggrid.png -trac/htdocs/loading.gif -trac/htdocs/lock-locked.png -trac/htdocs/milestone.png -trac/htdocs/newticket.png -trac/htdocs/parent.png -trac/htdocs/python.png -trac/htdocs/topbar_gradient.png -trac/htdocs/topbar_gradient2.png -trac/htdocs/trac.ico -trac/htdocs/trac_banner.png -trac/htdocs/trac_logo_mini.png -trac/htdocs/vgradient.png -trac/htdocs/wiki.png -trac/htdocs/css/about.css -trac/htdocs/css/admin.css -trac/htdocs/css/browser.css -trac/htdocs/css/changeset.css -trac/htdocs/css/code.css -trac/htdocs/css/diff.css -trac/htdocs/css/prefs.css -trac/htdocs/css/report.css -trac/htdocs/css/roadmap.css -trac/htdocs/css/search.css -trac/htdocs/css/ticket.css -trac/htdocs/css/timeline.css -trac/htdocs/css/trac.css -trac/htdocs/css/wiki.css -trac/htdocs/guide/basic-workflow.png -trac/htdocs/guide/original-workflow.png -trac/htdocs/js/blame.js -trac/htdocs/js/diff.js -trac/htdocs/js/expand_dir.js -trac/htdocs/js/folding.js -trac/htdocs/js/ie_pre7_hacks.js -trac/htdocs/js/jquery.js -trac/htdocs/js/keyboard_nav.js -trac/htdocs/js/noconflict.js -trac/htdocs/js/query.js -trac/htdocs/js/search.js -trac/htdocs/js/suggest.js -trac/htdocs/js/trac.js -trac/htdocs/js/wikitoolbar.js trac/mimeview/__init__.py trac/mimeview/api.py -trac/mimeview/enscript.py trac/mimeview/patch.py -trac/mimeview/php.py trac/mimeview/pygments.py trac/mimeview/rst.py trac/mimeview/silvercity.py trac/mimeview/txtl.py -trac/mimeview/tests/__init__.py -trac/mimeview/tests/api.py -trac/mimeview/tests/patch.html -trac/mimeview/tests/patch.py -trac/mimeview/tests/php.py -trac/mimeview/tests/pygments.html -trac/mimeview/tests/pygments.py trac/prefs/__init__.py trac/prefs/api.py trac/prefs/web_ui.py -trac/prefs/templates/prefs.html -trac/prefs/templates/prefs_advanced.html -trac/prefs/templates/prefs_datetime.html -trac/prefs/templates/prefs_general.html -trac/prefs/templates/prefs_keybindings.html -trac/prefs/templates/prefs_pygments.html -trac/prefs/tests/__init__.py -trac/prefs/tests/functional.py trac/search/__init__.py trac/search/api.py trac/search/web_ui.py -trac/search/templates/opensearch.xml -trac/search/templates/search.html -trac/templates/README -trac/templates/about.html -trac/templates/attachment.html -trac/templates/diff_div.html -trac/templates/diff_view.html -trac/templates/error.html -trac/templates/footer.cs -trac/templates/header.cs -trac/templates/history_view.html -trac/templates/index.html -trac/templates/layout.html -trac/templates/macros.cs -trac/templates/macros.html -trac/templates/macros.rss -trac/templates/page_index.html -trac/templates/theme.html -trac/tests/__init__.py -trac/tests/allwiki.py -trac/tests/attachment.py -trac/tests/config.py -trac/tests/contentgen.py -trac/tests/core.py -trac/tests/env.py -trac/tests/figleaf-exclude -trac/tests/notification.py -trac/tests/perm.py -trac/tests/resource.py -trac/tests/wikisyntax.py trac/tests/functional/__init__.py trac/tests/functional/better_twill.py trac/tests/functional/compat.py @@ -237,10 +54,6 @@ trac/tests/functional/testcases.py trac/tests/functional/testenv.py trac/tests/functional/tester.py -trac/tests/functional/xhtml-lat1.ent -trac/tests/functional/xhtml-special.ent -trac/tests/functional/xhtml-symbol.ent -trac/tests/functional/xhtml1-strict.dtd trac/ticket/__init__.py trac/ticket/admin.py trac/ticket/api.py @@ -251,39 +64,9 @@ trac/ticket/report.py trac/ticket/roadmap.py trac/ticket/web_ui.py -trac/ticket/templates/milestone_delete.html -trac/ticket/templates/milestone_edit.html -trac/ticket/templates/milestone_view.html -trac/ticket/templates/query.html -trac/ticket/templates/query.rss -trac/ticket/templates/query_results.html -trac/ticket/templates/report.rss -trac/ticket/templates/report_delete.html -trac/ticket/templates/report_edit.html -trac/ticket/templates/report_view.html -trac/ticket/templates/roadmap.html -trac/ticket/templates/ticket.html -trac/ticket/templates/ticket.rss -trac/ticket/templates/ticket_notify_email.txt -trac/ticket/tests/__init__.py -trac/ticket/tests/api.py -trac/ticket/tests/conversion.py -trac/ticket/tests/functional.py -trac/ticket/tests/model.py -trac/ticket/tests/notification.py -trac/ticket/tests/query.py -trac/ticket/tests/report.py -trac/ticket/tests/roadmap.py -trac/ticket/tests/wikisyntax.py -trac/ticket/workflows/basic-workflow.ini -trac/ticket/workflows/original-workflow.ini trac/timeline/__init__.py trac/timeline/api.py trac/timeline/web_ui.py -trac/timeline/templates/timeline.html -trac/timeline/templates/timeline.rss -trac/timeline/tests/__init__.py -trac/timeline/tests/functional.py trac/upgrades/__init__.py trac/upgrades/db10.py trac/upgrades/db11.py @@ -297,6 +80,11 @@ trac/upgrades/db19.py trac/upgrades/db20.py trac/upgrades/db21.py +trac/upgrades/db22.py +trac/upgrades/db23.py +trac/upgrades/db24.py +trac/upgrades/db25.py +trac/upgrades/db26.py trac/upgrades/db3.py trac/upgrades/db4.py trac/upgrades/db5.py @@ -313,40 +101,20 @@ trac/util/presentation.py trac/util/text.py trac/util/translation.py -trac/util/tests/__init__.py -trac/util/tests/datefmt.py -trac/util/tests/presentation.py -trac/util/tests/text.py trac/versioncontrol/__init__.py +trac/versioncontrol/admin.py trac/versioncontrol/api.py trac/versioncontrol/cache.py trac/versioncontrol/diff.py trac/versioncontrol/svn_authz.py trac/versioncontrol/svn_fs.py trac/versioncontrol/svn_prop.py -trac/versioncontrol/templates/browser.html -trac/versioncontrol/templates/changeset.html -trac/versioncontrol/templates/diff_form.html -trac/versioncontrol/templates/dir_entries.html -trac/versioncontrol/templates/revisionlog.html -trac/versioncontrol/templates/revisionlog.rss -trac/versioncontrol/templates/revisionlog.txt -trac/versioncontrol/tests/__init__.py -trac/versioncontrol/tests/api.py -trac/versioncontrol/tests/cache.py -trac/versioncontrol/tests/diff.py -trac/versioncontrol/tests/functional.py -trac/versioncontrol/tests/svn_authz.py -trac/versioncontrol/tests/svn_fs.py -trac/versioncontrol/tests/svnrepos.dump trac/versioncontrol/web_ui/__init__.py trac/versioncontrol/web_ui/browser.py trac/versioncontrol/web_ui/changeset.py trac/versioncontrol/web_ui/log.py trac/versioncontrol/web_ui/main.py trac/versioncontrol/web_ui/util.py -trac/versioncontrol/web_ui/tests/__init__.py -trac/versioncontrol/web_ui/tests/wikisyntax.py trac/web/__init__.py trac/web/_fcgi.py trac/web/api.py @@ -361,16 +129,8 @@ trac/web/session.py trac/web/standalone.py trac/web/wsgi.py -trac/web/tests/__init__.py -trac/web/tests/api.py -trac/web/tests/auth.py -trac/web/tests/cgi_frontend.py -trac/web/tests/chrome.py -trac/web/tests/clearsilver.py -trac/web/tests/href.py -trac/web/tests/session.py -trac/web/tests/wikisyntax.py trac/wiki/__init__.py +trac/wiki/admin.py trac/wiki/api.py trac/wiki/formatter.py trac/wiki/intertrac.py @@ -378,72 +138,15 @@ trac/wiki/macros.py trac/wiki/model.py trac/wiki/parser.py +trac/wiki/web_api.py trac/wiki/web_ui.py -trac/wiki/default-pages/CamelCase -trac/wiki/default-pages/InterMapTxt -trac/wiki/default-pages/InterTrac -trac/wiki/default-pages/InterWiki -trac/wiki/default-pages/PageTemplates -trac/wiki/default-pages/RecentChanges -trac/wiki/default-pages/SandBox -trac/wiki/default-pages/TitleIndex -trac/wiki/default-pages/TracAccessibility -trac/wiki/default-pages/TracAdmin -trac/wiki/default-pages/TracBackup -trac/wiki/default-pages/TracBrowser -trac/wiki/default-pages/TracCgi -trac/wiki/default-pages/TracChangeset -trac/wiki/default-pages/TracEnvironment -trac/wiki/default-pages/TracFastCgi -trac/wiki/default-pages/TracFineGrainedPermissions -trac/wiki/default-pages/TracGuide -trac/wiki/default-pages/TracImport -trac/wiki/default-pages/TracIni -trac/wiki/default-pages/TracInstall -trac/wiki/default-pages/TracInterfaceCustomization -trac/wiki/default-pages/TracLinks -trac/wiki/default-pages/TracLogging -trac/wiki/default-pages/TracModPython -trac/wiki/default-pages/TracModWSGI -trac/wiki/default-pages/TracNavigation -trac/wiki/default-pages/TracNotification -trac/wiki/default-pages/TracPermissions -trac/wiki/default-pages/TracPlugins -trac/wiki/default-pages/TracQuery -trac/wiki/default-pages/TracReports -trac/wiki/default-pages/TracRevisionLog -trac/wiki/default-pages/TracRoadmap -trac/wiki/default-pages/TracRss -trac/wiki/default-pages/TracSearch -trac/wiki/default-pages/TracStandalone -trac/wiki/default-pages/TracSupport -trac/wiki/default-pages/TracSyntaxColoring -trac/wiki/default-pages/TracTickets -trac/wiki/default-pages/TracTicketsCustomFields -trac/wiki/default-pages/TracTimeline -trac/wiki/default-pages/TracUnicode -trac/wiki/default-pages/TracUpgrade -trac/wiki/default-pages/TracWiki -trac/wiki/default-pages/TracWorkflow -trac/wiki/default-pages/WikiDeletePage -trac/wiki/default-pages/WikiFormatting -trac/wiki/default-pages/WikiHtml -trac/wiki/default-pages/WikiMacros -trac/wiki/default-pages/WikiNewPage -trac/wiki/default-pages/WikiPageNames -trac/wiki/default-pages/WikiProcessors -trac/wiki/default-pages/WikiRestructuredText -trac/wiki/default-pages/WikiRestructuredTextLinks -trac/wiki/default-pages/WikiStart -trac/wiki/templates/wiki_delete.html -trac/wiki/templates/wiki_diff.html -trac/wiki/templates/wiki_edit.html -trac/wiki/templates/wiki_view.html -trac/wiki/tests/__init__.py -trac/wiki/tests/formatter.py -trac/wiki/tests/functional.py -trac/wiki/tests/macros.py -trac/wiki/tests/model.py -trac/wiki/tests/wiki-tests.txt -trac/wiki/tests/wikisyntax.py -wiki-macros/README \ No newline at end of file +tracopt/__init__.py +tracopt/mimeview/__init__.py +tracopt/mimeview/enscript.py +tracopt/mimeview/php.py +tracopt/perm/__init__.py +tracopt/perm/authz_policy.py +tracopt/perm/config_perm_provider.py +tracopt/ticket/__init__.py +tracopt/ticket/commit_updater.py +tracopt/ticket/deleter.py \ No newline at end of file diff -Nru trac-0.11.7/Trac.egg-info/top_level.txt trac-0.12.1~ppa2/Trac.egg-info/top_level.txt --- trac-0.11.7/Trac.egg-info/top_level.txt 2010-03-09 22:49:51.000000000 +0000 +++ trac-0.12.1~ppa2/Trac.egg-info/top_level.txt 2010-05-05 03:28:06.000000000 +0100 @@ -1 +1,2 @@ +tracopt trac diff -Nru trac-0.11.7/Trac.egg-info/zip-safe trac-0.12.1~ppa2/Trac.egg-info/zip-safe --- trac-0.11.7/Trac.egg-info/zip-safe 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/Trac.egg-info/zip-safe 2010-05-05 03:21:23.000000000 +0100 @@ -0,0 +1 @@ + diff -Nru trac-0.11.7/tracopt/mimeview/enscript.py trac-0.12.1~ppa2/tracopt/mimeview/enscript.py --- trac-0.11.7/tracopt/mimeview/enscript.py 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/tracopt/mimeview/enscript.py 2009-12-11 10:41:08.000000000 +0000 @@ -0,0 +1,157 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2004-2009 Edgewall Software +# Copyright (C) 2004 Daniel Lundin +# Copyright (C) 2005 Christopher Lenz +# 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/. +# +# Author: Daniel Lundin + +from genshi.core import Markup + +from trac.config import Option, ListOption +from trac.core import * +from trac.mimeview.api import IHTMLPreviewRenderer, Mimeview +from trac.util import NaivePopen +from trac.util.html import Deuglifier + +__all__ = ['EnscriptRenderer'] + +types = { + 'application/xhtml+xml': ('html', 2), + 'application/postscript': ('postscript', 2), + 'application/x-csh': ('csh', 2), + 'application/x-javascript': ('javascript', 2), + 'application/x-troff': ('nroff', 2), + 'text/html': ('html', 2), + 'text/x-ada': ('ada', 2), + 'text/x-asm': ('asm', 2), + 'text/x-awk': ('awk', 2), + 'text/x-c++src': ('cpp', 2), + 'text/x-c++hdr': ('cpp', 2), + 'text/x-chdr': ('c', 2), + 'text/x-csh': ('csh', 2), + 'text/x-csrc': ('c', 2), + 'text/x-diff': ('diffu', 2), # Assume unified diff (works otherwise) + 'text/x-eiffel': ('eiffel', 2), + 'text/x-elisp': ('elisp', 2), + 'text/x-fortran': ('fortran', 2), + 'text/x-haskell': ('haskell', 2), + 'text/x-idl': ('idl', 2), + 'text/x-inf': ('inf', 2), + 'text/x-java': ('java', 2), + 'text/x-javascript': ('javascript', 2), + 'text/x-ksh': ('ksh', 2), + 'text/x-lua': ('lua', 2), + 'text/x-m4': ('m4', 2), + 'text/x-makefile': ('makefile', 2), + 'text/x-mail': ('mail', 2), + 'text/x-matlab': ('matlab', 2), + 'text/x-objc': ('objc', 2), + 'text/x-pascal': ('pascal', 2), + 'text/x-perl': ('perl', 2), + 'text/x-pyrex': ('pyrex', 2), + 'text/x-python': ('python', 2), + 'text/x-rfc': ('rfc', 2), + 'text/x-ruby': ('ruby', 2), + 'text/x-sh': ('sh', 2), + 'text/x-scheme': ('scheme', 2), + 'text/x-sql': ('sql', 2), + 'text/x-tcl': ('tcl', 2), + 'text/x-tex': ('tex', 2), + 'text/x-vba': ('vba', 2), + 'text/x-verilog': ('verilog', 2), + 'text/x-vhdl': ('vhdl', 2), + 'model/vrml': ('vrml', 2), + 'application/x-sh': ('sh', 2), + 'text/x-zsh': ('zsh', 2), + 'text/vnd.wap.wmlscript': ('wmlscript', 2), +} + + +class EnscriptDeuglifier(Deuglifier): + @classmethod + def rules(cls): + return [ + r'(?P)', + r'(?P)', + r'(?P)', + r'(?P)', + r'(?P)', + r'(?P)', + r'(?P)', + r'(?P)', + r'(?P)', + r'(?P)' + ] + + +class EnscriptRenderer(Component): + """Syntax highlighter using GNU Enscript.""" + + implements(IHTMLPreviewRenderer) + + expand_tabs = True + returns_source = True + + path = Option('mimeviewer', 'enscript_path', 'enscript', + """Path to the Enscript executable.""") + + enscript_modes = ListOption('mimeviewer', 'enscript_modes', + 'text/x-dylan:dylan:4', doc= + """List of additional MIME types known by Enscript. + For each, a tuple `mimetype:mode:quality` has to be + specified, where `mimetype` is the MIME type, + `mode` is the corresponding Enscript mode to be used + for the conversion and `quality` is the quality ratio + associated to this conversion. + That can also be used to override the default + quality ratio used by the Enscript render, which is 2 + (''since 0.10'').""") + + def __init__(self): + self._types = None + + # IHTMLPreviewRenderer methods + + def get_quality_ratio(self, mimetype): + # Extend default MIME type to mode mappings with configured ones + if not self._types: + self._types = {} + self._types.update(types) + self._types.update( + Mimeview(self.env).configured_modes_mapping('enscript')) + return self._types.get(mimetype, (None, 0))[1] + + def render(self, context, mimetype, content, filename=None, rev=None): + cmdline = self.path + mimetype = mimetype.split(';', 1)[0] # strip off charset + mode = self._types[mimetype][0] + cmdline += ' --color -h -q --language=html -p - -E%s' % mode + self.env.log.debug("Enscript command line: %s" % cmdline) + + np = NaivePopen(cmdline, content.encode('utf-8'), capturestderr=1) + if np.errorlevel or np.err: + self.env.disable_component(self) + err = "Running enscript failed with (%s, %s), disabling " \ + "EnscriptRenderer (command: '%s')" \ + % (np.errorlevel, np.err.strip(), cmdline) + raise Exception(err) + odata = np.out + + # Strip header and footer + i = odata.find('') + beg = i > 0 and i + 6 + i = odata.rfind('') + end = i > 0 and i or len(odata) + + odata = EnscriptDeuglifier().format(odata[beg:end].decode('utf-8')) + return [Markup(line) for line in odata.splitlines()] diff -Nru trac-0.11.7/tracopt/mimeview/php.py trac-0.12.1~ppa2/tracopt/mimeview/php.py --- trac-0.11.7/tracopt/mimeview/php.py 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/tracopt/mimeview/php.py 2009-12-11 10:41:08.000000000 +0000 @@ -0,0 +1,112 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2005-2009 Edgewall Software +# Copyright (C) 2005 Christian Boos +# Copyright (C) 2005 Christopher Lenz +# 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/. +# +# Author: Christian Boos +# Christopher Lenz + +import os +import re + +from genshi.core import Markup + +from trac.core import * +from trac.config import Option +from trac.mimeview.api import IHTMLPreviewRenderer, content_to_unicode +from trac.util import NaivePopen +from trac.util.html import Deuglifier + +__all__ = ['PHPRenderer'] + +php_types = ('text/x-php', 'application/x-httpd-php', + 'application/x-httpd-php4', 'application/x-httpd-php1') + + +class PhpDeuglifier(Deuglifier): + + def format(self, indata): + # The PHP highlighter produces the end-span tags on the next line + # instead of the line they actually apply to, which causes + # Trac to produce lots of (useless) open-and-immediately-close + # spans beginning each line. This tries to curtail by bubbling + # the first span after a set of 1+ " " to before them. + r_fixeol = re.compile(r"((?: )+)()") + indata = r_fixeol.sub(lambda m: m.group(2) + m.group(1), indata) + + # Now call superclass implementation that handles the dirty work + # of applying css classes. + return Deuglifier.format(self, indata) + + @classmethod + def rules(cls): + colors = dict(comment='FF8000', lang='0000BB', keyword='007700', + string='DD0000') + # rules check for for PHP 4 or for PHP 5 + color_rules = [ + r'(?P<%s><(?:font color="|span style="color: )#%s">)' % c + for c in colors.items() + ] + return color_rules + [ r'(?P)', r'(?P)' ] + + +class PHPRenderer(Component): + """Syntax highlighter using the PHP executable.""" + + implements(IHTMLPreviewRenderer) + + path = Option('mimeviewer', 'php_path', 'php', + """Path to the PHP executable (''since 0.9'').""") + + returns_source = True + + # IHTMLPreviewRenderer methods + + def get_quality_ratio(self, mimetype): + if mimetype in php_types: + return 5 + return 0 + + def render(self, context, mimetype, content, filename=None, rev=None): + # -n to ignore php.ini so we're using default colors + cmdline = '%s -sn' % self.path + self.env.log.debug("PHP command line: %s" % cmdline) + + content = content_to_unicode(self.env, content, mimetype) + content = content.encode('utf-8') + np = NaivePopen(cmdline, content, capturestderr=1) + if (os.name != 'nt' and np.errorlevel) or np.err: + msg = 'Running (%s) failed: %s, %s.' % (cmdline, + np.errorlevel, + np.err) + raise Exception(msg) + + odata = ''.join(np.out.splitlines()[1:-1]) + if odata.startswith('X-Powered-By:') or \ + odata.startswith('Content-type:'): + raise TracError(_('You appear to be using the PHP CGI ' + 'binary. Trac requires the CLI version ' + 'for syntax highlighting.')) + + epilogues = ["", ""] + for e in epilogues: + if odata.endswith(e): + odata = odata[:-len(e)] + break + + html = PhpDeuglifier().format(odata.decode('utf-8')) + + # PHP generates _way_ too many non-breaking spaces... + # We don't need them anyway, so replace them by normal spaces + return [Markup(line.replace(' ', ' ')) + for line in html.split(' ')] diff -Nru trac-0.11.7/tracopt/mimeview/tests/__init__.py trac-0.12.1~ppa2/tracopt/mimeview/tests/__init__.py --- trac-0.11.7/tracopt/mimeview/tests/__init__.py 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/tracopt/mimeview/tests/__init__.py 2009-11-13 12:25:10.000000000 +0000 @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2009 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 tracopt.mimeview.tests import php + + +def suite(): + suite = unittest.TestSuite() + suite.addTest(php.suite()) + return suite + + +if __name__ == '__main__': + unittest.main(defaultTest='suite') diff -Nru trac-0.11.7/tracopt/mimeview/tests/php.py trac-0.12.1~ppa2/tracopt/mimeview/tests/php.py --- trac-0.11.7/tracopt/mimeview/tests/php.py 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/tracopt/mimeview/tests/php.py 2009-11-13 12:25:10.000000000 +0000 @@ -0,0 +1,152 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C)2006-2009 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/. + +from StringIO import StringIO +import unittest + +from trac.mimeview.api import Mimeview +from trac.test import EnvironmentStub, locate +from tracopt.mimeview.php import PhpDeuglifier, PHPRenderer + + +class PhpDeuglifierTestCase(unittest.TestCase): + + def test_nomarkup(self): + self.assertEqual('asd', PhpDeuglifier().format('asd')) + + def test_rewrite_span(self): + self.assertEqual('asd', + PhpDeuglifier().format('asd')) + self.assertEqual('asd', + PhpDeuglifier().format('asd')) + self.assertEqual('asd', + PhpDeuglifier().format('asd')) + self.assertEqual('asd', + PhpDeuglifier().format('asd')) + + def test_rewrite_font(self): + self.assertEqual('asd', + PhpDeuglifier().format('asd')) + self.assertEqual('asd', + PhpDeuglifier().format('asd')) + self.assertEqual('asd', + PhpDeuglifier().format('asd')) + self.assertEqual('asd', + PhpDeuglifier().format('asd')) + + def test_reorder_br(self): + """ + Regression test for #3326 point 2 (close tags after line break) + """ + self.assertEqual(' ', + PhpDeuglifier().format( + ' ')) + self.assertEqual(' ', + PhpDeuglifier().format( + ' ')) + + +class PhpRendererTestCase(unittest.TestCase): + + def _test_render(self, stuff, type="string"): + env = EnvironmentStub(enable=[PHPRenderer]) + m = Mimeview(env) + r = m.renderers[0] + if type == "string": + s = stuff + elif type == "file": + s = StringIO(stuff) + else: + raise NotImplementedException( + "Pass either type=file or type=string") + result = list(r.render(None, None, s)) + return result + + def test_boring_string(self): + """ + Simple regression test for #3624 (php chops off the last line) + """ + result = self._test_render('asd') + self.assertEqual('asd', result[0]) + self.assertEqual(1, len(result)) + + def test_boring_filelike(self): + """ + Regression test for #3261 (treats content as string) # FIXME see #3332 + """ + result = self._test_render('asd', 'file') + self.assertEqual('asd', result[0]) + self.assertEqual(1, len(result)) + + def test_simple_string(self): + result = self._test_render('') + self.assertEqual('<?php', result[0]) + self.assertEqual('?>', result[1]) + self.assertEqual(2, len(result)) + + def test_simple_unicode(self): + result = self._test_render(u'') + self.assertEqual(u'<?php ' + u'echo ' + u'"é"' + u'; ' + u'?>', result[0]) + self.assertEqual(1, len(result)) + + def test_way_too_many_nbsp(self): + """ + Regression test for a tiny part of #1676 + """ + result = self._test_render('') + self.assertEqual('<?php', result[0]) + self.assertEqual(' ?>', result[1]) + self.assertEqual(2, len(result)) + + def test_deuglified_reorder_br(self): + """ + If the reordering of and the subsequent orphan + isn't working, the appears at the beginning of the third + line instead of the end of the second. + """ + result = self._test_render('') + self.assertEqual('<?php', result[0]) + self.assertEqual('$x=' + '"asd"' + ';', result[1]) + self.assertEqual('?>', result[2]) + self.assertEqual(3, len(result)) + + def test_keeps_last_line(self): + """ + More complex regression test for #3624 (php chops off the last line) + """ + result = self._test_render('\n ') + self.assertEqual('<p />', result[0]) + self.assertEqual('<p />', result[1]) + self.assertEqual(2, len(result)) + + +def suite(): + suite = unittest.TestSuite() + php = locate("php") + if php: + suite.addTest(unittest.makeSuite(PhpDeuglifierTestCase, 'test')) + suite.addTest(unittest.makeSuite(PhpRendererTestCase, 'test')) + else: + print("SKIP: tracopt/mimeview/tests/php.py (php cli binary, 'php', " + "not found)") + return suite + + +if __name__ == '__main__': + unittest.main(defaultTest='suite') diff -Nru trac-0.11.7/tracopt/perm/authz_policy.py trac-0.12.1~ppa2/tracopt/perm/authz_policy.py --- trac-0.11.7/tracopt/perm/authz_policy.py 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/tracopt/perm/authz_policy.py 2010-03-26 10:57:18.000000000 +0000 @@ -0,0 +1,245 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2007-2009 Edgewall Software +# Copyright (C) 2007 Alec Thomas +# 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/. +# +# Author: Alec Thomas + +from fnmatch import fnmatch +from itertools import groupby +import os + +from trac.core import * +from trac.config import Option +from trac.perm import PermissionSystem, IPermissionPolicy + +ConfigObj = None +try: + from configobj import ConfigObj +except ImportError: + pass + + +class AuthzPolicy(Component): + """Permission policy using an authz-like configuration file. + + Refer to SVN documentation for syntax of the authz file. Groups are + supported. + + As the fine-grained permissions brought by this permission policy are + often used in complement of the other pemission policies (like the + `DefaultPermissionPolicy`), there's no need to redefine all the + permissions here. Only additional rights or restrictions should be added. + + === Installation === + Note that this plugin requires the `configobj` package: + + http://www.voidspace.org.uk/python/configobj.html + + You should be able to install it by doing a simple `easy_install configobj` + + Enabling this policy requires listing it in `trac.ini: + {{{ + [trac] + permission_policies = AuthzPolicy, DefaultPermissionPolicy + + [authz_policy] + authz_file = conf/authzpolicy.conf + }}} + + This means that the `AuthzPolicy` permissions will be checked first, and + only if no rule is found will the `DefaultPermissionPolicy` be used. + + + === Configuration === + The `authzpolicy.conf` file is a `.ini` style configuration file. + + - Each section of the config is a glob pattern used to match against a + Trac resource descriptor. These descriptors are in the form: + {{{ + :@[/:@ ...] + }}} + Resources are ordered left to right, from parent to child. If any + component is inapplicable, `*` is substituted. If the version pattern is + not specified explicitely, all versions (`@*`) is added implicitly + + Example: Match the WikiStart page + {{{ + [wiki:*] + [wiki:WikiStart*] + [wiki:WikiStart@*] + [wiki:WikiStart] + }}} + + Example: Match the attachment `wiki:WikiStart@117/attachment/FOO.JPG@*` + on WikiStart + {{{ + [wiki:*] + [wiki:WikiStart*] + [wiki:WikiStart@*] + [wiki:WikiStart@*/attachment/*] + [wiki:WikiStart@117/attachment/FOO.JPG] + }}} + + - Sections are checked against the current Trac resource '''IN ORDER''' of + appearance in the configuration file. '''ORDER IS CRITICAL'''. + + - Once a section matches, the current username is matched, '''IN ORDER''', + against the keys of the section. If a key is prefixed with a `@`, it is + treated as a group. If a key is prefixed with a `!`, the permission is + denied rather than granted. The username will match any of 'anonymous', + 'authenticated', or '*', using normal Trac permission rules. + + Example configuration: + {{{ + [groups] + administrators = athomas + + [*/attachment:*] + * = WIKI_VIEW, TICKET_VIEW + + [wiki:WikiStart@*] + @administrators = WIKI_ADMIN + anonymous = WIKI_VIEW + * = WIKI_VIEW + + # Deny access to page templates + [wiki:PageTemplates/*] + * = + + # Match everything else + [*] + @administrators = TRAC_ADMIN + anonymous = BROWSER_VIEW, CHANGESET_VIEW, FILE_VIEW, LOG_VIEW, + MILESTONE_VIEW, POLL_VIEW, REPORT_SQL_VIEW, REPORT_VIEW, ROADMAP_VIEW, + SEARCH_VIEW, TICKET_CREATE, TICKET_MODIFY, TICKET_VIEW, TIMELINE_VIEW, + WIKI_CREATE, WIKI_MODIFY, WIKI_VIEW + # Give authenticated users some extra permissions + authenticated = REPO_SEARCH, XML_RPC + }}} + """ + implements(IPermissionPolicy) + + authz_file = Option('authz_policy', 'authz_file', None, + 'Location of authz policy configuration file.') + + authz = None + authz_mtime = None + + # IPermissionPolicy methods + + def check_permission(self, action, username, resource, perm): + if ConfigObj is None: + self.log.error('configobj package not found') + return None + + if self.authz_file and not self.authz_mtime or \ + os.path.getmtime(self.get_authz_file()) > self.authz_mtime: + self.parse_authz() + resource_key = self.normalise_resource(resource) + self.log.debug('Checking %s on %s', action, resource_key) + permissions = self.authz_permissions(resource_key, username) + if permissions is None: + return None # no match, can't decide + elif permissions == ['']: + return False # all actions are denied + + # FIXME: expand all permissions once for all + ps = PermissionSystem(self.env) + for deny, perms in groupby(permissions, + key=lambda p: p.startswith('!')): + if deny and action in ps.expand_actions([p[1:] for p in perms]): + return False # action is explicitly denied + elif action in ps.expand_actions(perms): + return True # action is explicitly granted + + return None # no match for action, can't decide + + # Internal methods + + def get_authz_file(self): + f = self.authz_file + return os.path.isabs(f) and f or os.path.join(self.env.path, f) + + def parse_authz(self): + self.env.log.debug('Parsing authz security policy %s' % + self.get_authz_file()) + self.authz = ConfigObj(self.get_authz_file()) + groups = {} + for group, users in self.authz.get('groups', {}).iteritems(): + if isinstance(users, basestring): + users = [users] + groups[group] = users + + self.groups_by_user = {} + + def add_items(group, items): + for item in items: + if item.startswith('@'): + add_items(group, groups[item[1:]]) + else: + self.groups_by_user.setdefault(item, set()).add(group) + + for group, users in groups.iteritems(): + add_items('@' + group, users) + + self.authz_mtime = os.path.getmtime(self.get_authz_file()) + + def normalise_resource(self, resource): + def flatten(resource): + if not resource: + return ['*:*@*'] + if not (resource.realm or resource.id): + return ['%s:%s@%s' % (resource.realm or '*', + resource.id or '*', + resource.version or '*')] + # XXX Due to the mixed functionality in resource we can end up with + # ticket, ticket:1, ticket:1@10. This code naively collapses all + # subsets of the parent resource into one. eg. ticket:1@10 + parent = resource.parent + while parent and (resource.realm == parent.realm or \ + (resource.realm == parent.realm and resource.id == parent.id)): + parent = parent.parent + if parent: + parent = flatten(parent) + else: + parent = [] + return parent + ['%s:%s@%s' % (resource.realm or '*', + resource.id or '*', + resource.version or '*')] + return '/'.join(flatten(resource)) + + def authz_permissions(self, resource_key, username): + # TODO: Handle permission negation in sections. eg. "if in this + # ticket, remove TICKET_MODIFY" + if username and username != 'anonymous': + valid_users = ['*', 'authenticated', username] + else: + valid_users = ['*', 'anonymous'] + for resource_section in [a for a in self.authz.sections + if a != 'groups']: + resource_glob = resource_section + if '@' not in resource_glob: + resource_glob += '@*' + + if fnmatch(resource_key, resource_glob): + section = self.authz[resource_section] + for who, permissions in section.iteritems(): + if who in valid_users or \ + who in self.groups_by_user.get(username, []): + self.env.log.debug('%s matched section %s for user %s' + % (resource_key, resource_glob, username)) + if isinstance(permissions, basestring): + return [permissions] + else: + return permissions + return None diff -Nru trac-0.11.7/tracopt/perm/config_perm_provider.py trac-0.12.1~ppa2/tracopt/perm/config_perm_provider.py --- trac-0.11.7/tracopt/perm/config_perm_provider.py 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/tracopt/perm/config_perm_provider.py 2009-12-11 10:41:08.000000000 +0000 @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2009 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/. + +from trac.core import * +from trac.perm import IPermissionRequestor + + +class ExtraPermissionsProvider(Component): + """Extra permission provider. + + This component provides a way to add arbitrary permissions to a Trac + environment. This can be useful for adding new permissions to use for + workflow actions, for example. + + To add new permissions, create a new section `[extra-permissions]` in + your `trac.ini`. Every entry in that section defines a meta-permission + and a comma-separated list of permissions. For example: + {{{ + [extra-permissions] + extra_admin = extra_view, extra_modify, extra_delete + }}} + This entry will define three new permissions `EXTRA_VIEW`, `EXTRA_MODIFY` + and `EXTRA_DELETE`, as well as a meta-permissions `EXTRA_ADMIN` that + grants all three permissions. + + If you don't want a meta-permission, start the meta-name with an + underscore (`_`): + {{{ + [extra-permissions] + _perms = extra_view, extra_modify + }}} + """ + implements(IPermissionRequestor) + + def get_permission_actions(self): + permissions = {} + for meta, perms in self.config.options('extra-permissions'): + perms = [each.strip().upper() for each in perms.split(',')] + for perm in perms: + permissions.setdefault(perm, []) + meta = meta.strip().upper() + if meta and not meta.startswith('_'): + permissions.setdefault(meta, []).extend(perms) + return [v and (k, v) or k for k, v in permissions.iteritems()] diff -Nru trac-0.11.7/tracopt/ticket/commit_updater.py trac-0.12.1~ppa2/tracopt/ticket/commit_updater.py --- trac-0.11.7/tracopt/ticket/commit_updater.py 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/tracopt/ticket/commit_updater.py 2010-04-05 20:19:13.000000000 +0100 @@ -0,0 +1,286 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2009 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/. + +# This plugin was based on the contrib/trac-post-commit-hook script, which +# had the following copyright notice: +# ---------------------------------------------------------------------------- +# Copyright (c) 2004 Stephen Hansen +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +# ---------------------------------------------------------------------------- + +from datetime import datetime +import re + +from genshi.builder import tag + +from trac.config import BoolOption, Option +from trac.core import Component, implements +from trac.perm import PermissionCache +from trac.ticket import Ticket +from trac.ticket.notification import TicketNotifyEmail +from trac.util.compat import any +from trac.util.datefmt import utc +from trac.util.text import exception_to_unicode +from trac.versioncontrol import IRepositoryChangeListener, RepositoryManager +from trac.versioncontrol.web_ui.changeset import ChangesetModule +from trac.wiki.formatter import format_to_html +from trac.wiki.macros import WikiMacroBase + + +class CommitTicketUpdater(Component): + """Update tickets based on commit messages. + + This component hooks into changeset notifications and searches commit + messages for text in the form of: + {{{ + command #1 + command #1, #2 + command #1 & #2 + command #1 and #2 + }}} + + Instead of the short-hand syntax "#1", "ticket:1" can be used as well, + e.g.: + {{{ + command ticket:1 + command ticket:1, ticket:2 + command ticket:1 & ticket:2 + command ticket:1 and ticket:2 + }}} + + In addition, the ':' character can be omitted and issue or bug can be used + instead of ticket. + + You can have more than one command in a message. The following commands + are supported. There is more than one spelling for each command, to make + this as user-friendly as possible. + + close, closed, closes, fix, fixed, fixes:: + The specified tickets are closed, and the commit message is added to + them as a comment. + + references, refs, addresses, re, see:: + The specified tickets are left in their current status, and the commit + message is added to them as a comment. + + A fairly complicated example of what you can do is with a commit message + of: + + Changed blah and foo to do this or that. Fixes #10 and #12, + and refs #12. + + This will close #10 and #12, and add a note to #12. + """ + + implements(IRepositoryChangeListener) + + envelope = Option('ticket', 'commit_ticket_update_envelope', '', + """Require commands to be enclosed in an envelope. + + Must be empty or contain two characters. For example, if set to "[]", + then commands must be in the form of [closes #4]. + """) + + commands_close = Option('ticket', 'commit_ticket_update_commands.close', + 'close closed closes fix fixed fixes', + """Commands that close tickets, as a space-separated list.""") + + commands_refs = Option('ticket', 'commit_ticket_update_commands.refs', + 'addresses re references refs see', + """Commands that add a reference, as a space-separated list. + + If set to the special value , all tickets referenced by the + message will get a reference to the changeset.""") + + notify = BoolOption('ticket', 'commit_ticket_update_notify', 'true', + """Send ticket change notification when updating a ticket.""") + + ticket_prefix = '(?:#|(?:ticket|issue|bug)[: ]?)' + ticket_reference = ticket_prefix + '[0-9]+' + ticket_command = ('(?P[A-Za-z]*).?' + '(?P%s(?:(?:[, &]*|[ ]?and[ ]?)%s)*)' % + (ticket_reference, ticket_reference)) + + @property + def command_re(self): + (begin, end) = (re.escape(self.envelope[0:1]), + re.escape(self.envelope[1:2])) + return re.compile(begin + self.ticket_command + end) + + ticket_re = re.compile(ticket_prefix + '([0-9]+)') + + _last_cset_id = None + + # IRepositoryChangeListener methods + + def changeset_added(self, repos, changeset): + if self._is_duplicate(changeset): + return + tickets = self._parse_message(changeset.message) + comment = self.make_ticket_comment(repos, changeset) + self._update_tickets(tickets, changeset, comment, + datetime.now(utc)) + + def changeset_modified(self, repos, changeset, old_changeset): + if self._is_duplicate(changeset): + return + tickets = self._parse_message(changeset.message) + old_tickets = {} + if old_changeset is not None: + old_tickets = self._parse_message(old_changeset.message) + tickets = dict(each for each in tickets.iteritems() + if each[0] not in old_tickets) + comment = self.make_ticket_comment(repos, changeset) + self._update_tickets(tickets, changeset, comment, + datetime.now(utc)) + + def _is_duplicate(self, changeset): + # Avoid duplicate changes with multiple scoped repositories + cset_id = (changeset.rev, changeset.message, changeset.author, + changeset.date) + if cset_id != self._last_cset_id: + self._last_cset_id = cset_id + return False + return True + + def _parse_message(self, message): + """Parse the commit message and return the ticket references.""" + cmd_groups = self.command_re.findall(message) + functions = self._get_functions() + tickets = {} + for cmd, tkts in cmd_groups: + func = functions.get(cmd.lower()) + if not func and self.commands_refs.strip() == '': + func = self.cmd_refs + if func: + for tkt_id in self.ticket_re.findall(tkts): + tickets.setdefault(int(tkt_id), []).append(func) + return tickets + + def make_ticket_comment(self, repos, changeset): + """Create the ticket comment from the changeset data.""" + revstring = str(changeset.rev) + if repos.reponame: + revstring += '/' + repos.reponame + return """\ +In [%s]: +{{{ +#!CommitTicketReference repository="%s" revision="%s" +%s +}}}""" % (revstring, repos.reponame, changeset.rev, changeset.message.strip()) + + def _update_tickets(self, tickets, changeset, comment, date): + """Update the tickets with the given comment.""" + perm = PermissionCache(self.env, changeset.author) + for tkt_id, cmds in tickets.iteritems(): + try: + self.log.debug("Updating ticket #%d", tkt_id) + ticket = [None] + @self.env.with_transaction() + def do_update(db): + ticket[0] = Ticket(self.env, tkt_id, db) + for cmd in cmds: + cmd(ticket[0], changeset, perm(ticket[0].resource)) + ticket[0].save_changes(changeset.author, comment, date, db) + self._notify(ticket[0], date) + except Exception, e: + self.log.error("Unexpected error while processing ticket " + "#%s: %s", tkt_id, exception_to_unicode(e)) + + def _notify(self, ticket, date): + """Send a ticket update notification.""" + if not self.notify: + return + try: + tn = TicketNotifyEmail(self.env) + tn.notify(ticket, newticket=False, modtime=date) + except Exception, e: + self.log.error("Failure sending notification on change to " + "ticket #%s: %s", ticket.id, + exception_to_unicode(e)) + + def _get_functions(self): + """Create a mapping from commands to command functions.""" + functions = {} + for each in dir(self): + if not each.startswith('cmd_'): + continue + func = getattr(self, each) + for cmd in getattr(self, 'commands_' + each[4:], '').split(): + functions[cmd] = func + return functions + + def cmd_close(self, ticket, changeset, perm): + if 'TICKET_MODIFY' in perm: + ticket['status'] = 'closed' + ticket['resolution'] = 'fixed' + if not ticket['owner']: + ticket['owner'] = changeset.author + + def cmd_refs(self, ticket, changeset, perm): + pass + + +class CommitTicketReferenceMacro(WikiMacroBase): + """Insert a changeset message into the output. + + This macro must be called using wiki processor syntax as follows: + {{{ + {{{ + #!CommitTicketReference repository="reponame" revision="rev" + }}} + }}} + where the arguments are the following: + - `repository`: the repository containing the changeset + - `revision`: the revision of the desired changeset + """ + + def expand_macro(self, formatter, name, content, args={}): + reponame = args.get('repository') + rev = args.get('revision') + repos = RepositoryManager(self.env).get_repository(reponame) + if repos: + changeset = repos.get_changeset(rev) + message = changeset.message + rev = changeset.rev + else: + message = content + if formatter.context.resource.realm == 'ticket': + ticket_re = CommitTicketUpdater.ticket_re + if not any(int(tkt_id) == formatter.context.resource.id + for tkt_id in ticket_re.findall(message)): + return tag.p("(The changeset message doesn't reference this " + "ticket)", class_='hint') + if ChangesetModule(self.env).wiki_format_messages: + return tag.div(format_to_html(self.env, + formatter.context('changeset', rev, parent=repos.resource), + message, escape_newlines=True), class_='message') + else: + return tag.pre(message, class_='message') diff -Nru trac-0.11.7/tracopt/ticket/deleter.py trac-0.12.1~ppa2/tracopt/ticket/deleter.py --- trac-0.11.7/tracopt/ticket/deleter.py 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/tracopt/ticket/deleter.py 2010-03-12 12:40:25.000000000 +0000 @@ -0,0 +1,159 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2010 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/. + +from genshi.builder import tag +from genshi.filters import Transformer +from genshi.filters.transform import StreamBuffer + +from trac.core import Component, implements +from trac.ticket.model import Ticket +from trac.ticket.web_ui import TicketModule +from trac.util import get_reporter_id +from trac.util.translation import _ +from trac.web.api import IRequestFilter, IRequestHandler, ITemplateStreamFilter +from trac.web.chrome import ITemplateProvider, add_notice, add_stylesheet + + +class TicketDeleter(Component): + """Ticket and ticket comment deleter. + + This component allows deleting ticket comments and complete tickets. For + users having `TICKET_ADMIN` permission, it adds a "Delete" button next to + each "Reply" button on the page. The button in the ticket description + requests deletion of the complete ticket, and the buttons in the change + history request deletion of a single comment. + + '''Comment and ticket deletion are irreversible (and therefore + ''dangerous'') operations.''' For that reason, a confirmation step is + requested. The confirmation page shows the ticket box (in the case of a + ticket deletion) or the ticket change (in the case of a comment deletion). + """ + + implements(ITemplateProvider, ITemplateStreamFilter, IRequestFilter, + IRequestHandler) + + # ITemplateProvider methods + + def get_htdocs_dirs(self): + return [] + + def get_templates_dirs(self): + from pkg_resources import resource_filename + return [resource_filename(__name__, 'templates')] + + # ITemplateStreamFilter methods + + def filter_stream(self, req, method, filename, stream, data): + if filename != 'ticket.html': + return stream + ticket = data.get('ticket') + if not (ticket and ticket.exists + and 'TICKET_ADMIN' in req.perm(ticket.resource)): + return stream + + # Insert "Delete" buttons for ticket description and each comment + def delete_ticket(): + return tag.form( + tag.div( + tag.input(type='hidden', name='action', value='delete'), + tag.input(type='submit', value=_('Delete'), + title=_('Delete ticket')), + class_='inlinebuttons'), + action='#', method='get') + + def delete_comment(): + for event in buffer: + cnum = event[1][1].get('id')[12:] + return tag.form( + tag.div( + tag.input(type='hidden', name='action', + value='delete-comment'), + tag.input(type='hidden', name='cnum', value=cnum), + tag.input(type='submit', value=_('Delete'), + title=_('Delete comment %(num)s', + num=cnum)), + class_='inlinebuttons'), + action='#', method='get') + + buffer = StreamBuffer() + return stream | Transformer('//div[@class="description"]' + '/h3[@id="comment:description"]') \ + .after(delete_ticket).end() \ + .select('//div[@class="change"]/@id') \ + .copy(buffer).end() \ + .select('//div[@class="change" and @id]/h3[@class="change"]') \ + .after(delete_comment) + + # IRequestFilter methods + + def pre_process_request(self, req, handler): + if handler is not TicketModule(self.env): + return handler + action = req.args.get('action') + if action in ('delete', 'delete-comment'): + return self + else: + return handler + + def post_process_request(self, req, template, data, content_type): + return template, data, content_type + + # IRequestHandler methods + + def match_request(self, req): + return False + + def process_request(self, req): + id = int(req.args.get('id')) + req.perm('ticket', id).require('TICKET_ADMIN') + ticket = Ticket(self.env, id) + action = req.args['action'] + if req.method == 'POST': + if 'cancel' in req.args: + href = req.href.ticket(id) + if action == 'delete-comment': + href += '#comment:%s' % req.args.get('cnum') + req.redirect(href) + + if action == 'delete': + ticket.delete() + add_notice(req, _('The ticket #%(id)s has been deleted.', + id=ticket.id)) + req.redirect(req.href()) + + elif action == 'delete-comment': + cnum = int(req.args.get('cnum')) + ticket.delete_change(cnum) + add_notice(req, _('The ticket comment %(num)s on ticket ' + '#%(id)s has been deleted.', + num=cnum, id=ticket.id)) + req.redirect(req.href.ticket(id)) + + tm = TicketModule(self.env) + data = tm._prepare_data(req, ticket) + tm._insert_ticket_data(req, ticket, data, + get_reporter_id(req, 'author'), {}) + data.update(action=action, del_cnum=None) + + if action == 'delete-comment': + cnum = int(req.args.get('cnum')) + data['del_cnum'] = cnum + for change in data['changes']: + if change.get('cnum') == cnum: + data['change'] = change + break + else: + raise TracError(_('Comment %(num)s not found', num=cnum)) + + add_stylesheet(req, 'common/css/ticket.css') + return 'ticket_delete.html', data, None diff -Nru trac-0.11.7/tracopt/ticket/templates/ticket_delete.html trac-0.12.1~ppa2/tracopt/ticket/templates/ticket_delete.html --- trac-0.11.7/tracopt/ticket/templates/ticket_delete.html 1970-01-01 01:00:00.000000000 +0100 +++ trac-0.12.1~ppa2/tracopt/ticket/templates/ticket_delete.html 2010-05-01 17:01:31.000000000 +0100 @@ -0,0 +1,79 @@ + + + + + + <py:when test="'delete'"><i18n:msg params="id">Delete Ticket #$ticket.id</i18n:msg></py:when> + <py:otherwise><i18n:msg params="num, id">Delete comment $del_cnum on Ticket #$ticket.id</i18n:msg></py:otherwise> + + + + + + + + Delete Ticket #$ticket.id + ($ticket.status $ticket.type: $ticket.resolution) + + + + + + + + + Are you sure you want to delete this ticket? + + (comments: ${sum(1 for change in changes if 'cnum' in change)}, + attachments: ${sum(1 for change in changes if 'cnum' not in change)}) + + This is an irreversible operation. + + + + + + + + + + + Delete comment $del_cnum on Ticket #$ticket.id + + + + + + comment:$change.cnum + + Changed ${dateinfo(change.date)} ago by ${authorinfo(change.author)} + + + + + + + + + + Are you sure you want to delete this ticket comment? + This is an irreversible operation. + + + + + + + + + + diff -Nru trac-0.11.7/UPGRADE trac-0.12.1~ppa2/UPGRADE --- trac-0.11.7/UPGRADE 2010-03-09 22:49:39.000000000 +0000 +++ trac-0.12.1~ppa2/UPGRADE 2010-04-30 23:09:10.000000000 +0100 @@ -69,6 +69,11 @@ The following sections discuss any extra actions that may need to be taken to upgrade to specific versions of Trac. +From 0.11.x to 0.12.x +--------------------- + +Really, go read trac/wiki/default-pages/TracUpgrade ... + From 0.10.x to 0.11.x ---------------------

Component	Enabled
+ + [+] + [–] + + Component +	Enabled
- ${component.name} ${component.module} +
+ + + [${show_doc and '–' or '+'}] + + ${module_name}.* + — ${module.summary} + + ${wiki_to_html(context, module.description)} +
+ + + [${show_doc and '–' or '+'}] + + ${component_name} + — ${component.summary} + + ${wiki_to_html(context, component.description)}	+ value="${module_name}.${component_name}" />

Manage $label_plural

Manage $label_plural

${plugin.name} ${plugin.version}

${plugin.name} ${plugin.version}

Found a bug in Trac?

Python Traceback

Code fragment:

Local variables:

System Information:

Enabled Plugins:

Change History for ${name_of(resource)}

Change History for ${name or name_of(resource)}

Attachments

Attachments

Attachments

Attachments

${project.name}

Context Navigation

$title ${num_matches(query.num_items)}

$title (${ngettext('%(num)s match', '%(num)s matches', query.num_items)})

Results (${paginator.displayed_items()})

${fields[query.group].label}: ${query.group in ['owner', 'reporter'] and authorinfo(groupname) or groupname} - ${num_matches(len(results))} + (${ngettext('%(num)s match', '%(num)s matches', len(results))})

${action == 'new' and 'New Report' or report.title}

${action == 'new' and _('New Report') or report.title}

Available Reports

$title - ($numrows matches) + (${ngettext('%(num)s match', '%(num)s matches', numrows)})

- Results (${paginator.displayed_items()}) -

+ Results (${paginator.displayed_items()}) +

$value_for_group - (${cnt or 'No'} match${cnt != 1 and 'es' or ''})

+ $value_for_group + + (${cnt and ngettext('%(num)s match', '%(num)s matches', cnt) or _('No matches found.')}) + +

$ticket.summary

+ Description + + (last modified by ${authorinfo(description_change.author)}) + (diff) + +

+ + Ticket #${ticket.id} (${ticket.status} ${ticket.type}: ${ticket.resolution}) - — at Initial Version + — at Initial Version - — at Version $version + — at Version $version - + + + Create New Ticket (${ticket.type}) +

- - in reply to: ${commentref('↓ ', change_preview.replyto)} - - Changed by ${authorinfo(change_preview.author)} -

$ticket.summary

- Description - - (last modified by ${authorinfo(description_change.author)}) - (diff) - -

Change History

Change History

- Add/Change #${ticket.id} ($ticket.summary)

+ Add a comment +

+ + in reply to: ${commentref('↑ ', change_preview.replyto)} + + Changed by ${authorinfo(change_preview.author)} +

Modify Ticket

Timeline

${day}: ${day == today and 'Today' or day == yesterday and 'Yesterday' or None}

${day}: ${day == today and _("Today") or day == yesterday and _("Yesterday") or None}

Manage Repositories

${browser_path_links(path_links, stickyrev)}

Default Repository

Repository Index

Editing ${name_of(page.resource)}

+ Review Changes + Preview + No changes +

Rename $page.name

Level 1 (largest)

Level 2

Level 3

Level 4

Level 5

Level 6

Also level 3

Also level 3

Also level 3

**not** //parsed//

Level 1 (largest)

Level 2

Level 3

Level 4

Level 5

Level 6

Also level 3

Also level 3 =

Also level 3 ==

not parsed

[[HelloWorld]]

[[HelloWorld]]

Formatted Heading

Formatted Heading

10 tips

Title

Chapter

Section

not //parsed//

`[[HelloWorld]]`

`[[HelloWorld]]`