Author: rjollos Date: Sat Nov 15 01:14:46 2014 New Revision: 1639823 URL: http://svn.apache.org/r1639823 Log: Merged Trac 1.0.2 and resolved merge conflicts. Many tests are failing.
Added: bloodhound/branches/trac-1.0.2-integration/trac/.travis.yml - copied unchanged from r1639805, bloodhound/vendor/trac/1.0.2/.travis.yml bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/compat.py - copied unchanged from r1639805, bloodhound/vendor/trac/1.0.2/trac/tests/compat.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/admin_components.html - copied unchanged from r1639805, bloodhound/vendor/trac/1.0.2/trac/ticket/templates/admin_components.html bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/admin_enums.html - copied unchanged from r1639805, bloodhound/vendor/trac/1.0.2/trac/ticket/templates/admin_enums.html bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/admin_milestones.html - copied unchanged from r1639805, bloodhound/vendor/trac/1.0.2/trac/ticket/templates/admin_milestones.html bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/admin_versions.html - copied unchanged from r1639805, bloodhound/vendor/trac/1.0.2/trac/ticket/templates/admin_versions.html bloodhound/branches/trac-1.0.2-integration/trac/trac/timeline/tests/web_ui.py - copied unchanged from r1639805, bloodhound/vendor/trac/1.0.2/trac/timeline/tests/web_ui.py bloodhound/branches/trac-1.0.2-integration/trac/trac/timeline/tests/wikisyntax.py - copied unchanged from r1639805, bloodhound/vendor/trac/1.0.2/trac/timeline/tests/wikisyntax.py bloodhound/branches/trac-1.0.2-integration/trac/trac/util/tests/translation.py - copied unchanged from r1639805, bloodhound/vendor/trac/1.0.2/trac/util/tests/translation.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/web_ui/tests/browser.py - copied unchanged from r1639805, bloodhound/vendor/trac/1.0.2/trac/versioncontrol/web_ui/tests/browser.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/web_ui/tests/changeset.py - copied unchanged from r1639805, bloodhound/vendor/trac/1.0.2/trac/versioncontrol/web_ui/tests/changeset.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/web_ui/tests/log.py - copied unchanged from r1639805, bloodhound/vendor/trac/1.0.2/trac/versioncontrol/web_ui/tests/log.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/ticket/tests/ - copied from r1639805, bloodhound/vendor/trac/1.0.2/tracopt/ticket/tests/ bloodhound/branches/trac-1.0.2-integration/trac/tracopt/versioncontrol/git/tests/git_fs.py - copied unchanged from r1639805, bloodhound/vendor/trac/1.0.2/tracopt/versioncontrol/git/tests/git_fs.py Removed: bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_components.html bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_enums.html bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_milestones.html bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_versions.html Modified: bloodhound/branches/trac-1.0.2-integration/trac/ (props changed) bloodhound/branches/trac-1.0.2-integration/trac/.gitignore bloodhound/branches/trac-1.0.2-integration/trac/.hgignore bloodhound/branches/trac-1.0.2-integration/trac/AUTHORS bloodhound/branches/trac-1.0.2-integration/trac/ChangeLog bloodhound/branches/trac-1.0.2-integration/trac/Makefile bloodhound/branches/trac-1.0.2-integration/trac/Makefile.cfg.sample bloodhound/branches/trac-1.0.2-integration/trac/THANKS bloodhound/branches/trac-1.0.2-integration/trac/contrib/bugzilla2trac.py bloodhound/branches/trac-1.0.2-integration/trac/contrib/cgi-bin/trac.cgi bloodhound/branches/trac-1.0.2-integration/trac/contrib/cgi-bin/trac.fcgi bloodhound/branches/trac-1.0.2-integration/trac/contrib/checkwiki.py bloodhound/branches/trac-1.0.2-integration/trac/contrib/emailfilter.py bloodhound/branches/trac-1.0.2-integration/trac/contrib/htdigest.py bloodhound/branches/trac-1.0.2-integration/trac/contrib/htpasswd.py bloodhound/branches/trac-1.0.2-integration/trac/contrib/l10n_diff_index.py bloodhound/branches/trac-1.0.2-integration/trac/contrib/l10n_reset_en_GB.py bloodhound/branches/trac-1.0.2-integration/trac/contrib/l10n_revert_lineno_conflicts.py bloodhound/branches/trac-1.0.2-integration/trac/contrib/migrateticketmodel.py bloodhound/branches/trac-1.0.2-integration/trac/contrib/sourceforge2trac.py bloodhound/branches/trac-1.0.2-integration/trac/contrib/trac-pre-commit-hook bloodhound/branches/trac-1.0.2-integration/trac/contrib/trac-svn-hook bloodhound/branches/trac-1.0.2-integration/trac/contrib/trac-svn-post-commit-hook.cmd bloodhound/branches/trac-1.0.2-integration/trac/contrib/workflow/migrate_original_to_basic.py bloodhound/branches/trac-1.0.2-integration/trac/contrib/workflow/showworkflow bloodhound/branches/trac-1.0.2-integration/trac/contrib/workflow/workflow_parser.py bloodhound/branches/trac-1.0.2-integration/trac/doc/conf.py bloodhound/branches/trac-1.0.2-integration/trac/doc/dev/testing-intro.rst bloodhound/branches/trac-1.0.2-integration/trac/doc/utils/checkapidoc.py bloodhound/branches/trac-1.0.2-integration/trac/doc/utils/runepydoc.py bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/HelloWorld.py bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/Timestamp.py bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/milestone_to_version.py bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/permissions/debug_perm.py bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/permissions/public_wiki_policy.py bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/permissions/vulnerability_tickets.py bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/revision_links.py bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/CodeReview.py bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/DeleteTicket.py bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/MilestoneOperation.py bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/StatusFixer.py bloodhound/branches/trac-1.0.2-integration/trac/sample-plugins/workflow/VoteOperation.py bloodhound/branches/trac-1.0.2-integration/trac/setup.cfg bloodhound/branches/trac-1.0.2-integration/trac/setup.py bloodhound/branches/trac-1.0.2-integration/trac/trac/TRAC_VERSION bloodhound/branches/trac-1.0.2-integration/trac/trac/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/about.py bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/api.py bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/console.py bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin.html bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_basics.html bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_legacy.html bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_logging.html bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_perms.html bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/templates/admin_plugins.html bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/tests/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/tests/console-tests.txt bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/tests/console.py bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/tests/functional.py bloodhound/branches/trac-1.0.2-integration/trac/trac/admin/web_ui.py bloodhound/branches/trac-1.0.2-integration/trac/trac/attachment.py bloodhound/branches/trac-1.0.2-integration/trac/trac/cache.py bloodhound/branches/trac-1.0.2-integration/trac/trac/config.py bloodhound/branches/trac-1.0.2-integration/trac/trac/core.py bloodhound/branches/trac-1.0.2-integration/trac/trac/db/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/db/api.py bloodhound/branches/trac-1.0.2-integration/trac/trac/db/mysql_backend.py bloodhound/branches/trac-1.0.2-integration/trac/trac/db/pool.py bloodhound/branches/trac-1.0.2-integration/trac/trac/db/postgres_backend.py bloodhound/branches/trac-1.0.2-integration/trac/trac/db/sqlite_backend.py bloodhound/branches/trac-1.0.2-integration/trac/trac/db/tests/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/db/tests/api.py bloodhound/branches/trac-1.0.2-integration/trac/trac/db/tests/functional.py bloodhound/branches/trac-1.0.2-integration/trac/trac/db/tests/mysql_test.py bloodhound/branches/trac-1.0.2-integration/trac/trac/db/tests/postgres_test.py bloodhound/branches/trac-1.0.2-integration/trac/trac/db/tests/util.py bloodhound/branches/trac-1.0.2-integration/trac/trac/db/util.py bloodhound/branches/trac-1.0.2-integration/trac/trac/db_default.py bloodhound/branches/trac-1.0.2-integration/trac/trac/dist.py bloodhound/branches/trac-1.0.2-integration/trac/trac/env.py bloodhound/branches/trac-1.0.2-integration/trac/trac/htdocs/css/admin.css bloodhound/branches/trac-1.0.2-integration/trac/trac/htdocs/css/browser.css bloodhound/branches/trac-1.0.2-integration/trac/trac/htdocs/css/changeset.css bloodhound/branches/trac-1.0.2-integration/trac/trac/htdocs/css/code.css bloodhound/branches/trac-1.0.2-integration/trac/trac/htdocs/css/diff.css bloodhound/branches/trac-1.0.2-integration/trac/trac/htdocs/css/jquery-ui/jquery-ui.css bloodhound/branches/trac-1.0.2-integration/trac/trac/htdocs/css/report.css bloodhound/branches/trac-1.0.2-integration/trac/trac/htdocs/css/roadmap.css bloodhound/branches/trac-1.0.2-integration/trac/trac/htdocs/css/ticket.css bloodhound/branches/trac-1.0.2-integration/trac/trac/htdocs/css/trac.css bloodhound/branches/trac-1.0.2-integration/trac/trac/htdocs/css/wiki.css bloodhound/branches/trac-1.0.2-integration/trac/trac/htdocs/js/auto_preview.js bloodhound/branches/trac-1.0.2-integration/trac/trac/htdocs/js/jquery-ui-i18n.js bloodhound/branches/trac-1.0.2-integration/trac/trac/htdocs/js/query.js bloodhound/branches/trac-1.0.2-integration/trac/trac/htdocs/js/threaded_comments.js bloodhound/branches/trac-1.0.2-integration/trac/trac/htdocs/js/trac.js bloodhound/branches/trac-1.0.2-integration/trac/trac/htdocs/js/wikitoolbar.js bloodhound/branches/trac-1.0.2-integration/trac/trac/loader.py bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/ca/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/ca/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/cs/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/da/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/da/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/de/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/de/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/el/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/en_GB/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/eo/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/eo/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/es/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/es/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/es_AR/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/es_AR/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/es_MX/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/es_MX/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/et/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/et/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/fi/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/fr/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/fr/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/fr/LC_MESSAGES/tracini.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/gl/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/he/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/he/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/hu/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/hu/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/hy/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/hy/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/it/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/it/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/ja/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/ja/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/ja/LC_MESSAGES/tracini.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/ko/LC_MESSAGES/tracini.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/messages-js.pot bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/messages.pot bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/nb/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/nb/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/nl/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/pl/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/pt/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/pt_BR/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/pt_BR/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/ro/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/ru/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/ru/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/sl/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/sl/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/sv/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/tr/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/tr/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/tracini.pot bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/vi/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/zh_CN/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/zh_CN/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/zh_TW/LC_MESSAGES/messages-js.po bloodhound/branches/trac-1.0.2-integration/trac/trac/locale/zh_TW/LC_MESSAGES/messages.po bloodhound/branches/trac-1.0.2-integration/trac/trac/mimeview/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/mimeview/api.py bloodhound/branches/trac-1.0.2-integration/trac/trac/mimeview/rst.py bloodhound/branches/trac-1.0.2-integration/trac/trac/mimeview/tests/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/mimeview/tests/api.py bloodhound/branches/trac-1.0.2-integration/trac/trac/mimeview/tests/patch.html bloodhound/branches/trac-1.0.2-integration/trac/trac/mimeview/tests/patch.py bloodhound/branches/trac-1.0.2-integration/trac/trac/mimeview/tests/pygments.py bloodhound/branches/trac-1.0.2-integration/trac/trac/notification.py bloodhound/branches/trac-1.0.2-integration/trac/trac/perm.py bloodhound/branches/trac-1.0.2-integration/trac/trac/prefs/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/prefs/api.py bloodhound/branches/trac-1.0.2-integration/trac/trac/prefs/templates/prefs.html bloodhound/branches/trac-1.0.2-integration/trac/trac/prefs/templates/prefs_advanced.html bloodhound/branches/trac-1.0.2-integration/trac/trac/prefs/templates/prefs_datetime.html bloodhound/branches/trac-1.0.2-integration/trac/trac/prefs/templates/prefs_general.html bloodhound/branches/trac-1.0.2-integration/trac/trac/prefs/templates/prefs_keybindings.html bloodhound/branches/trac-1.0.2-integration/trac/trac/prefs/templates/prefs_language.html bloodhound/branches/trac-1.0.2-integration/trac/trac/prefs/templates/prefs_pygments.html bloodhound/branches/trac-1.0.2-integration/trac/trac/prefs/templates/prefs_userinterface.html bloodhound/branches/trac-1.0.2-integration/trac/trac/prefs/tests/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/prefs/tests/functional.py bloodhound/branches/trac-1.0.2-integration/trac/trac/prefs/web_ui.py bloodhound/branches/trac-1.0.2-integration/trac/trac/search/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/search/templates/search.html bloodhound/branches/trac-1.0.2-integration/trac/trac/search/web_ui.py bloodhound/branches/trac-1.0.2-integration/trac/trac/templates/about.html bloodhound/branches/trac-1.0.2-integration/trac/trac/templates/attach_file_form.html bloodhound/branches/trac-1.0.2-integration/trac/trac/templates/attachment.html bloodhound/branches/trac-1.0.2-integration/trac/trac/templates/diff_div.html bloodhound/branches/trac-1.0.2-integration/trac/trac/templates/diff_options.html bloodhound/branches/trac-1.0.2-integration/trac/trac/templates/diff_view.html bloodhound/branches/trac-1.0.2-integration/trac/trac/templates/error.html bloodhound/branches/trac-1.0.2-integration/trac/trac/templates/history_view.html bloodhound/branches/trac-1.0.2-integration/trac/trac/templates/index.html bloodhound/branches/trac-1.0.2-integration/trac/trac/templates/layout.html bloodhound/branches/trac-1.0.2-integration/trac/trac/templates/list_of_attachments.html bloodhound/branches/trac-1.0.2-integration/trac/trac/templates/macros.html bloodhound/branches/trac-1.0.2-integration/trac/trac/templates/page_index.html bloodhound/branches/trac-1.0.2-integration/trac/trac/templates/preview_file.html bloodhound/branches/trac-1.0.2-integration/trac/trac/templates/progress_bar.html bloodhound/branches/trac-1.0.2-integration/trac/trac/templates/progress_bar_grouped.html bloodhound/branches/trac-1.0.2-integration/trac/trac/templates/theme.html bloodhound/branches/trac-1.0.2-integration/trac/trac/test.py bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/allwiki.py bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/attachment.py bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/config.py bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/contentgen.py bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/core.py bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/env.py bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/functional/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/functional/better_twill.py bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/functional/compat.py bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/functional/svntestenv.py bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/functional/testcases.py bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/functional/testenv.py bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/functional/tester.py bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/notification.py bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/perm.py bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/resource.py bloodhound/branches/trac-1.0.2-integration/trac/trac/tests/wikisyntax.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/admin.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/api.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/batch.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/default_workflow.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/model.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/notification.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/query.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/report.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/roadmap.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/batch_modify.html bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/milestone_delete.html bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/milestone_edit.html bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/milestone_view.html bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/query.html bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/query_results.html bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/report_delete.html bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/report_edit.html bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/report_list.html bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/report_view.html bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/roadmap.html bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/ticket.html bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/ticket_box.html bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/ticket_change.html bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/templates/ticket_preview.html bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/tests/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/tests/api.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/tests/batch.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/tests/conversion.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/tests/functional.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/tests/model.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/tests/notification.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/tests/query.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/tests/report.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/tests/roadmap.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/tests/wikisyntax.py bloodhound/branches/trac-1.0.2-integration/trac/trac/ticket/web_ui.py bloodhound/branches/trac-1.0.2-integration/trac/trac/timeline/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/timeline/api.py bloodhound/branches/trac-1.0.2-integration/trac/trac/timeline/templates/timeline.html bloodhound/branches/trac-1.0.2-integration/trac/trac/timeline/templates/timeline.rss bloodhound/branches/trac-1.0.2-integration/trac/trac/timeline/tests/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/timeline/tests/functional.py bloodhound/branches/trac-1.0.2-integration/trac/trac/timeline/web_ui.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db10.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db11.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db12.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db13.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db14.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db15.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db16.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db17.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db18.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db19.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db20.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db21.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db22.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db23.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db24.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db25.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db26.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db27.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db28.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db29.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db3.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db4.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db5.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db6.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db7.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db8.py bloodhound/branches/trac-1.0.2-integration/trac/trac/upgrades/db9.py bloodhound/branches/trac-1.0.2-integration/trac/trac/util/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/util/compat.py bloodhound/branches/trac-1.0.2-integration/trac/trac/util/daemon.py bloodhound/branches/trac-1.0.2-integration/trac/trac/util/datefmt.py bloodhound/branches/trac-1.0.2-integration/trac/trac/util/dist.py bloodhound/branches/trac-1.0.2-integration/trac/trac/util/html.py bloodhound/branches/trac-1.0.2-integration/trac/trac/util/tests/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/util/tests/concurrency.py bloodhound/branches/trac-1.0.2-integration/trac/trac/util/tests/datefmt.py bloodhound/branches/trac-1.0.2-integration/trac/trac/util/tests/html.py bloodhound/branches/trac-1.0.2-integration/trac/trac/util/tests/presentation.py bloodhound/branches/trac-1.0.2-integration/trac/trac/util/tests/text.py bloodhound/branches/trac-1.0.2-integration/trac/trac/util/text.py bloodhound/branches/trac-1.0.2-integration/trac/trac/util/translation.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/admin.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/api.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/cache.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/templates/admin_repositories.html bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/templates/browser.html bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/templates/changeset.html bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/templates/diff_form.html bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/templates/dir_entries.html bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/templates/dirlist_thead.html bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/templates/path_links.html bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/templates/repository_index.html bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/templates/revisionlog.html bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/templates/sortable_th.html bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/tests/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/tests/api.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/tests/cache.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/tests/diff.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/tests/functional.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/tests/svn_authz.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/web_ui/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/web_ui/browser.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/web_ui/changeset.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/web_ui/log.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/web_ui/tests/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/web_ui/tests/wikisyntax.py bloodhound/branches/trac-1.0.2-integration/trac/trac/versioncontrol/web_ui/util.py bloodhound/branches/trac-1.0.2-integration/trac/trac/web/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/web/_fcgi.py bloodhound/branches/trac-1.0.2-integration/trac/trac/web/api.py bloodhound/branches/trac-1.0.2-integration/trac/trac/web/auth.py bloodhound/branches/trac-1.0.2-integration/trac/trac/web/chrome.py bloodhound/branches/trac-1.0.2-integration/trac/trac/web/main.py bloodhound/branches/trac-1.0.2-integration/trac/trac/web/session.py bloodhound/branches/trac-1.0.2-integration/trac/trac/web/tests/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/web/tests/api.py bloodhound/branches/trac-1.0.2-integration/trac/trac/web/tests/auth.py bloodhound/branches/trac-1.0.2-integration/trac/trac/web/tests/cgi_frontend.py bloodhound/branches/trac-1.0.2-integration/trac/trac/web/tests/chrome.py bloodhound/branches/trac-1.0.2-integration/trac/trac/web/tests/href.py bloodhound/branches/trac-1.0.2-integration/trac/trac/web/tests/main.py bloodhound/branches/trac-1.0.2-integration/trac/trac/web/tests/session.py bloodhound/branches/trac-1.0.2-integration/trac/trac/web/tests/wikisyntax.py bloodhound/branches/trac-1.0.2-integration/trac/trac/web/wsgi.py bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/InterMapTxt bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/InterTrac bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/PageTemplates bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracAccessibility bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracAdmin bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracBackup bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracBatchModify bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracBrowser bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracCgi bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracEnvironment bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracFastCgi bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracFineGrainedPermissions bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracGuide bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracImport bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracIni bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracInstall bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracInterfaceCustomization bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracLinks bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracModWSGI bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracNotification bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracPermissions bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracPlugins bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracQuery bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracReports bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracRepositoryAdmin bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracSearch bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracStandalone bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracSyntaxColoring bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracTickets bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracTicketsCustomFields bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracUpgrade bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracWiki bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/TracWorkflow bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/WikiFormatting bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/WikiMacros bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/WikiNewPage bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/WikiProcessors bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/default-pages/WikiStart bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/formatter.py bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/intertrac.py bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/interwiki.py bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/macros.py bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/model.py bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/parser.py bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/templates/wiki_delete.html bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/templates/wiki_diff.html bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/templates/wiki_edit.html bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/templates/wiki_edit_form.html bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/templates/wiki_page_path.html bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/templates/wiki_rename.html bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/templates/wiki_view.html bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/tests/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/tests/formatter.py bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/tests/functional.py bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/tests/macros.py bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/tests/model.py bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/tests/wiki-tests.txt bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/tests/wikisyntax.py bloodhound/branches/trac-1.0.2-integration/trac/trac/wiki/web_ui.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/mimeview/enscript.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/mimeview/php.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/mimeview/silvercity.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/mimeview/tests/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/mimeview/tests/php.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/perm/authz_policy.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/perm/config_perm_provider.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/perm/tests/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/perm/tests/authz_policy.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/ticket/commit_updater.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/ticket/templates/ticket_delete.html bloodhound/branches/trac-1.0.2-integration/trac/tracopt/versioncontrol/git/PyGIT.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/versioncontrol/git/git_fs.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/versioncontrol/git/tests/PyGIT.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/versioncontrol/git/tests/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/versioncontrol/svn/svn_fs.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/versioncontrol/svn/svn_prop.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/versioncontrol/svn/tests/__init__.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/versioncontrol/svn/tests/svn_fs.py bloodhound/branches/trac-1.0.2-integration/trac/tracopt/versioncontrol/svn/tests/svnrepos.dump Propchange: bloodhound/branches/trac-1.0.2-integration/trac/ ------------------------------------------------------------------------------ Merged /incubator/bloodhound/vendor/trac/current:r1444739-1461359 Merged /bloodhound/vendor/trac/1.0.2:r1639619-1639805 Merged /bloodhound/vendor/trac/current:r1461360-1639618 Modified: bloodhound/branches/trac-1.0.2-integration/trac/.gitignore URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/.gitignore?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/.gitignore (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/.gitignore Sat Nov 15 01:14:46 2014 @@ -19,6 +19,7 @@ Makefile.cfg doc/.build *.mo trac/htdocs/js/messages/*.js +.idea .project .pydevproject .settings Modified: bloodhound/branches/trac-1.0.2-integration/trac/.hgignore URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/.hgignore?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/.hgignore (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/.hgignore Sat Nov 15 01:14:46 2014 @@ -20,3 +20,7 @@ Makefile.cfg doc/.build *.mo trac/htdocs/js/messages/*.js +.idea +.project +.pydevproject +.settings Modified: bloodhound/branches/trac-1.0.2-integration/trac/AUTHORS URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/AUTHORS?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/AUTHORS (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/AUTHORS Sat Nov 15 01:14:46 2014 @@ -16,5 +16,6 @@ * Remy Blank <remy.bl...@pobox.com> * Jun Omae <jun6...@gmail.com> * Peter Suter <petsu...@gmail.com> + * Ryan Ollos <ryan.j.ol...@gmail.com> See also THANKS for people who have contributed to the project. Modified: bloodhound/branches/trac-1.0.2-integration/trac/ChangeLog URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/ChangeLog?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/ChangeLog (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/ChangeLog Sat Nov 15 01:14:46 2014 @@ -1,3 +1,34 @@ +Trac 1.0.2 (TBD) + +Trac 1.0.2 is a maintenance release containing numerous fixes and minor +enhancements. The following are a few of the highlights: + + - Subversion keywords are expanded and EOL substitutions made when viewing + a file in the repository browser and when downloading a file (#717). + - Notification email is sent to the old owner when a ticket is reassigned + (#2311). + - Ticket change history is updated when renaming and deleting a milestone, + and when retargeting tickets to another milestone (#4582, #5658). + - Numerous fixes for the Authz permissions policy in the browser/repository + (#10961, #11646), wiki (#8976, #11067), admin (#11069) and report (#11176) + realms. + - Multiple forms submits are disallowed (#10138). + - `ConfigurationError` is raised if any of the `permission_policies` can't + be loaded, preventing possible information leakage due to internal and + installation errors (#10285). + - Wiki toolbars can be disabled through a configuration setting (#10837) + - The number of entries in a table is shown next to heading on applicable + admin pages (#11027). + - //Cancel// buttons are consistently located on all pages (#11076). + - Focus is placed on a text element when an edit page is loaded (#11084). + - The //Edit conflict// and //Merge// warning messages are always visible + in side-by-side edit mode (#11102). + - Improvements to the layout of the Report (#11106, #11664) and Ticket pages + (#11471). + - Genshi 0.7 compatibility (#11218). + - Numerous minor fixes for Git repository support. + - ⦠and more than a hundred more fixes! + Trac 1.0.1 (February 1, 2013) http://svn.edgewall.org/repos/trac/tags/trac-1.0.1 @@ -57,6 +88,27 @@ http://svn.edgewall.org/repos/trac/tags/ ----------------------------------------------------------------------------- +Trac 0.12.6 (TBD) + +Trac 0.12.6 is a maintenance release that contains fixes for a few issues: + - Subversion blame would fail for a path with URL-encoded characters (#10386), + a lower-case drive letter on Windows (#10514), or a non-ascii filename with + Subversion 1.7 (#11167). + - Improved performance rendering `svn:mergeinfo` properties in browser view + (#8459) and changeset view (#11219). + - Query with many custom fields would fail (#11140). + - Zip archive had a timestamp with no timezone information (#11162). + - Failure or incorrect ranges rendering log TracLinks (#11308, #11346). + - Textareas in ticket view did not wrap correctly in IE 11 (#11376). + - Emails were not being obfuscated in owner field on CSV export from ticket + and query pages (#11594). + - Locale data was not being included in egg in Distribute 0.6.29 and later + (#11640). + - Deleting a milestone would not delete its attachments (#11672). + - Added support for Babel 1.0 and later (#11258, #11345). + - Added support for `ConfigObj` 5.0 and later (#11498). + - ⦠and dozens more fixes! + Trac 0.12.5 (January 15, 2013) http://svn.edgewall.org/repos/trac/tags/trac-0.12.5 Modified: bloodhound/branches/trac-1.0.2-integration/trac/Makefile URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/Makefile?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/Makefile (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/Makefile Sat Nov 15 01:14:46 2014 @@ -42,7 +42,7 @@ define HELP ---------------- Standalone test server - server start tracd + [start-]server start tracd [port=...] variable for selecting the port [auth=...] variable for specifying authentication @@ -95,10 +95,17 @@ define HELP [epydocopts=...] variable containing extra options for Epydoc [dotpath=/.../dot] path to Graphviz dot program (not used yet) + ---------------- Miscellaneous + + start-admin start trac-admin (on `env') + start-python start the Python interpreter + + [adminopts=...] variable containing extra options for trac-admin + endef export HELP -# ` (keep emacs font-lock happy) +# ' (keep emacs font-lock happy) define HELP_CFG It looks like you don't have a Makefile.cfg file yet. @@ -154,6 +161,11 @@ Makefile: ; # ---------------------------------------------------------------------------- # +# Copy Makefile.cfg.sample to Makefile.cfg and adapt to your local +# environment, no customizations to the present Makefile should be +# necessary. +# +# -include Makefile.cfg # # ---------------------------------------------------------------------------- @@ -220,7 +232,7 @@ compile: $(addprefix compile-,$(locale)) else compile: python setup.py $(foreach catalog,$(catalogs), \ - compile_catalog$(_catalog)) + compile_catalog$(_catalog)) generate_messages_js endif @@ -450,9 +462,11 @@ define server-options $(if $(wildcard $(env)/VERSION),$(env),-e $(env)) endef -.PHONY: server +.PHONY: server start-server tracd start-tracd + +server tracd start-tracd: start-server -server: Trac.egg-info +start-server: Trac.egg-info ifdef env python trac/web/standalone.py $(server-options) else @@ -460,6 +474,26 @@ else endif +.PHONY: trac-admin start-admin + +trac-admin: start-admin + +start-admin: +ifneq "$(wildcard $(env)/VERSION)" "" + @python trac/admin/console.py $(env) $(adminopts) +else + @echo "\`env' variable was not specified or doesn't point to one env." +endif + + +.PHONY: start-python + +start-python: + @python +# (this doesn't seem to be much, but we're taking benefit of the +# environment setup we're doing below) + + # ---------------------------------------------------------------------------- # # Documentation related tasks Modified: bloodhound/branches/trac-1.0.2-integration/trac/Makefile.cfg.sample URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/Makefile.cfg.sample?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/Makefile.cfg.sample (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/Makefile.cfg.sample Sat Nov 15 01:14:46 2014 @@ -1,10 +1,13 @@ # -*- Makefile -*- configuration file sample # -# Adapt to your local setting and copy to Makefile.cfg +# Copy to Makefile.cfg and adapt to your local environment. # # ---------------------------------------------------------------------------- -# Python Installations (select with `python=` on the `make` command line) +# Switching between different Python installations +# +# (one of them can be selected with `make python=<key>`) +# python.<key> = <path to Python installation> python.23 = python.24 = python.25 = C:/Dev/Python254 @@ -12,23 +15,48 @@ python.ap25 = C:/Dev/ActivePython254 python.26 = C:/Dev/Python261 python.27 = -# default Python version (if not defined, pick the one from the path) -.python = +# And also: + +# pythonpath.<key> = <extension to the PYTHONPATH for that installation> +# path.<key> = <extension to the PATH for that installation> + +# (both very convenient for specifying non-default Subversion bindings, +# for example) + # ---------------------------------------------------------------------------- -# Database Backends (select with `db=` on the `make` command line) +# Switching between different database backends +# +# (one of them can be selected with `make db=<backend>`) # db URIs +# <backend>.uri = <db:params> sqlite.uri = sqlite:test.db mysql.uri = mysql://tracuser:tracpassword@localhost/trac postgres.uri = postgres://tracuser:tracpassword@localhost:5432/trac?schema=tractest -# default db backend (if not defined, use in-memory sqlite) +# db backend to use if when `db=<backend>` parameter was given to `make` .uri = +# (if left undefined, use in-memory sqlite) -# default Python versions to use when `db` is specified +# Python installation to use when `db=<backend>` is specified but `python=<key>` +# is not. +# +# <backend>.python = <key> where <key> corresponds to the python.<key> vars mysql.python = 25 postgres.python = 26 +.python = +# (if db is left empty, .python will get used to select the Python +# installation; if left undefined, the 'python' command will be used +# instead of a fully qualified pathname) + +# For example, if you only have the MySqlDB Python bindings available +# for your Python 2.7.4 installation, specify something like: +# mysql.python = 27 +# +# given that you also have: +# python.27 = <path to my 2.7.4 install containing the MySqlDB bindings...> + # ---------------------------------------------------------------------------- # Settings for the test server @@ -42,7 +70,7 @@ auth = *,~/tracenvs/htdigest.realm,realm dotpath = /usr/local/bin/dot # ---------------------------------------------------------------------------- -# Custom rules +# Custom rules - let your imagination go wild ;-) .PHONY: bigtest Modified: bloodhound/branches/trac-1.0.2-integration/trac/THANKS URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/THANKS?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/THANKS (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/THANKS Sat Nov 15 01:14:46 2014 @@ -88,7 +88,7 @@ wouldn't be what it is now without their * Jennifer Murtell j...@jmurtell.com * Jacob Norda jacobno...@gmail.com * Dirkjan Ochtman dirk...@ochtman.nl - * Ryan J Ollos ry...@physiosonics.com + * Ryan J Ollos ryan.j.ol...@gmail.com * Jun Omae jun6...@gmail.com * Itamar Ostricher itamar...@gmail.com * Bas van Oostveen v.oostv...@gmail.com Modified: bloodhound/branches/trac-1.0.2-integration/trac/contrib/bugzilla2trac.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/contrib/bugzilla2trac.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/contrib/bugzilla2trac.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/contrib/bugzilla2trac.py Sat Nov 15 01:14:46 2014 @@ -1,4 +1,23 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# Copyright (C) 2004-2013 Edgewall Software +# Copyright (C) 2004 Dmitry Yusupov <dmitry_...@yahoo.com> +# Copyright (C) 2004 Mark Rowe <mr...@bluewire.net.nz> +# Copyright (C) 2005 Bill Soudan <b...@soudan.net> +# Copyright (C) 2005 Florent Guillaume <f...@nuxeo.com> +# Copyright (C) 2005 Jeroen Ruigrok van der Werven <asmo...@in-nomine.org> +# Copyright (C) 2010 Jeff Moreland <ho...@hotmail.com> +# +# 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 a Bugzilla items into a Trac database. @@ -9,17 +28,7 @@ Requires: Trac 0.9b1 from http://trac.e or PostGreSQL 8.4 from http://www.postgresql.org/ or SQLite 3 from http://www.sqlite.org/ -Thanks: Mark Rowe <mr...@bluewire.net.nz> - for original TracDatabase class - -Copyright 2004, Dmitry Yusupov <dmitry_...@yahoo.com> - -Many enhancements, Bill Soudan <b...@soudan.net> -Other enhancements, Florent Guillaume <f...@nuxeo.com> -Reworked, Jeroen Ruigrok van der Werven <asmo...@in-nomine.org> -Jeff Moreland <ho...@hotmail.com> - -$Id: bugzilla2trac.py 11490 2013-01-13 15:18:06Z rblank $ +$Id: bugzilla2trac.py 12500 2014-02-12 20:54:59Z rjollos $ """ from __future__ import with_statement @@ -230,7 +239,7 @@ sys.setdefaultencoding('latin1') # mapping, just return string, otherwise return value class FieldTranslator(dict): def __getitem__(self, item): - if not dict.has_key(self, item): + if item not in self: return item return dict.__getitem__(self, item) @@ -243,8 +252,8 @@ class TracDatabase(object): self.loginNameCache = {} self.fieldNameCache = {} from trac.db.api import DatabaseManager - self.using_postgres = \ - DatabaseManager(self.env).connection_uri.startswith("postgres:") + self.using_postgres = \ + DatabaseManager(self.env).connection_uri.startswith("postgres:") def hasTickets(self): return int(self.env.db_query("SELECT count(*) FROM ticket")[0][0] > 0) @@ -335,7 +344,7 @@ class TracDatabase(object): if BUG_NO_RE.search(desc): desc = re.sub(BUG_NO_RE, BUG_NO_REPL, desc) - if PRIORITIES_MAP.has_key(priority): + if priority in PRIORITIES_MAP: priority = PRIORITIES_MAP[priority] print " inserting ticket %s -- %s" % (id, summary) @@ -377,7 +386,7 @@ class TracDatabase(object): comment = value if PREFORMAT_COMMENTS: - comment = '{{{\n%s\n}}}' % comment + comment = '{{{\n%s\n}}}' % comment if REPLACE_BUG_NO: if BUG_NO_RE.search(comment): @@ -393,15 +402,15 @@ class TracDatabase(object): def addTicketChange(self, ticket, time, author, field, oldvalue, newvalue): if field == "owner": - if LOGIN_MAP.has_key(oldvalue): + if oldvalue in LOGIN_MAP: oldvalue = LOGIN_MAP[oldvalue] - if LOGIN_MAP.has_key(newvalue): + if newvalue in LOGIN_MAP: newvalue = LOGIN_MAP[newvalue] if field == "priority": - if PRIORITIES_MAP.has_key(oldvalue.lower()): + if oldvalue.lower() in PRIORITIES_MAP: oldvalue = PRIORITIES_MAP[oldvalue.lower()] - if PRIORITIES_MAP.has_key(newvalue.lower()): + if newvalue.lower() in PRIORITIES_MAP: newvalue = PRIORITIES_MAP[newvalue.lower()] # Doesn't make sense if we go from highest -> highest, for example. @@ -720,7 +729,7 @@ def convert(_db, _host, _user, _password ignore = True if ignore: - continue + continue trac.addTicketComment(ticket=bugid, time = desc['bug_when'], @@ -824,19 +833,19 @@ def convert(_db, _host, _user, _password # Bugzilla splits large summary changes into two records. for oldChange in ticketChanges: - if (field_name == "summary" - and oldChange['field'] == ticketChange['field'] - and oldChange['time'] == ticketChange['time'] - and oldChange['author'] == ticketChange['author']): - oldChange['oldvalue'] += " " + ticketChange['oldvalue'] - oldChange['newvalue'] += " " + ticketChange['newvalue'] - break - # cc and attachments.isobsolete sometime appear - # in different activities with same time - if ((field_name == "cc" or field_name == "attachments.isobsolete") \ - and oldChange['time'] == ticketChange['time']): - oldChange['newvalue'] += ", " + ticketChange['newvalue'] - break + if (field_name == "summary" + and oldChange['field'] == ticketChange['field'] + and oldChange['time'] == ticketChange['time'] + and oldChange['author'] == ticketChange['author']): + oldChange['oldvalue'] += " " + ticketChange['oldvalue'] + oldChange['newvalue'] += " " + ticketChange['newvalue'] + break + # cc and attachments.isobsolete sometime appear + # in different activities with same time + if ((field_name == "cc" or field_name == "attachments.isobsolete") \ + and oldChange['time'] == ticketChange['time']): + oldChange['newvalue'] += ", " + ticketChange['newvalue'] + break else: ticketChanges.append (ticketChange) @@ -895,7 +904,7 @@ def convert(_db, _host, _user, _password users = () htpasswd = file("htpasswd", 'w') for user in users: - if LOGIN_MAP.has_key(user['login_name']): + if user['login_name'] in LOGIN_MAP: login = LOGIN_MAP[user['login_name']] else: login = user['login_name'] @@ -939,36 +948,36 @@ def main(): global BZ_DB, BZ_HOST, BZ_USER, BZ_PASSWORD, TRAC_ENV, TRAC_CLEAN global SEVERITIES, PRIORITIES, PRIORITIES_MAP if len (sys.argv) > 1: - if sys.argv[1] in ['--help','help'] or len(sys.argv) < 4: - usage() - iter = 1 - while iter < len(sys.argv): - if sys.argv[iter] in ['--db'] and iter+1 < len(sys.argv): - BZ_DB = sys.argv[iter+1] - iter = iter + 1 - elif sys.argv[iter] in ['-h', '--host'] and iter+1 < len(sys.argv): - BZ_HOST = sys.argv[iter+1] - iter = iter + 1 - elif sys.argv[iter] in ['-u', '--user'] and iter+1 < len(sys.argv): - BZ_USER = sys.argv[iter+1] - iter = iter + 1 - elif sys.argv[iter] in ['-p', '--passwd'] and iter+1 < len(sys.argv): - BZ_PASSWORD = sys.argv[iter+1] - iter = iter + 1 - elif sys.argv[iter] in ['--tracenv'] and iter+1 < len(sys.argv): - TRAC_ENV = sys.argv[iter+1] - iter = iter + 1 - elif sys.argv[iter] in ['-c', '--clean']: - TRAC_CLEAN = 1 + if sys.argv[1] in ['--help','help'] or len(sys.argv) < 4: + usage() + iter = 1 + while iter < len(sys.argv): + if sys.argv[iter] in ['--db'] and iter+1 < len(sys.argv): + BZ_DB = sys.argv[iter+1] + iter = iter + 1 + elif sys.argv[iter] in ['-h', '--host'] and iter+1 < len(sys.argv): + BZ_HOST = sys.argv[iter+1] + iter = iter + 1 + elif sys.argv[iter] in ['-u', '--user'] and iter+1 < len(sys.argv): + BZ_USER = sys.argv[iter+1] + iter = iter + 1 + elif sys.argv[iter] in ['-p', '--passwd'] and iter+1 < len(sys.argv): + BZ_PASSWORD = sys.argv[iter+1] + iter = iter + 1 + elif sys.argv[iter] in ['--tracenv'] and iter+1 < len(sys.argv): + TRAC_ENV = sys.argv[iter+1] + iter = iter + 1 + elif sys.argv[iter] in ['-c', '--clean']: + TRAC_CLEAN = 1 elif sys.argv[iter] in ['-n', '--noseverities']: # treat Bugzilla severites as Trac priorities PRIORITIES = SEVERITIES SEVERITIES = [] PRIORITIES_MAP = {} - else: - print "Error: unknown parameter: " + sys.argv[iter] - sys.exit(0) - iter = iter + 1 + else: + print "Error: unknown parameter: " + sys.argv[iter] + sys.exit(0) + iter = iter + 1 convert(BZ_DB, BZ_HOST, BZ_USER, BZ_PASSWORD, TRAC_ENV, TRAC_CLEAN) Modified: bloodhound/branches/trac-1.0.2-integration/trac/contrib/cgi-bin/trac.cgi URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/contrib/cgi-bin/trac.cgi?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/contrib/cgi-bin/trac.cgi (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/contrib/cgi-bin/trac.cgi Sat Nov 15 01:14:46 2014 @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# Copyright (C) 2003-2009 Edgewall Software +# Copyright (C) 2003-2013 Edgewall Software # Copyright (C) 2003-2004 Jonas Borgström <jo...@edgewall.com> # All rights reserved. # Modified: bloodhound/branches/trac-1.0.2-integration/trac/contrib/cgi-bin/trac.fcgi URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/contrib/cgi-bin/trac.fcgi?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/contrib/cgi-bin/trac.fcgi (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/contrib/cgi-bin/trac.fcgi Sat Nov 15 01:14:46 2014 @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# Copyright (C) 2003-2009 Edgewall Software +# Copyright (C) 2003-2013 Edgewall Software # Copyright (C) 2003-2004 Jonas Borgström <jo...@edgewall.com> # All rights reserved. # Modified: bloodhound/branches/trac-1.0.2-integration/trac/contrib/checkwiki.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/contrib/checkwiki.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/contrib/checkwiki.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/contrib/checkwiki.py Sat Nov 15 01:14:46 2014 @@ -1,4 +1,17 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Copyright (C) 2004-2013 Edgewall Software +# Copyright (C) 2004 Daniel Lundin <dan...@edgewall.com> +# 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/. # # Check/update default wiki pages from the Trac project website. # @@ -145,4 +158,3 @@ if __name__ == '__main__': data[p] = get_page(prefix, p) if check: check_links(data) - Modified: bloodhound/branches/trac-1.0.2-integration/trac/contrib/emailfilter.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/contrib/emailfilter.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/contrib/emailfilter.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/contrib/emailfilter.py Sat Nov 15 01:14:46 2014 @@ -1,4 +1,18 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Copyright (C) 2005-2013 Edgewall Software +# Copyright (C) 2005 Daniel Lundin <dan...@edgewall.com> +# 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/. + """ emailfilter.py -- Email tickets to Trac. Modified: bloodhound/branches/trac-1.0.2-integration/trac/contrib/htdigest.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/contrib/htdigest.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/contrib/htdigest.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/contrib/htdigest.py Sat Nov 15 01:14:46 2014 @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# Copyright (C)2006-2009 Edgewall Software +# Copyright (C) 2006-2013 Edgewall Software # Copyright (C) 2006 Matthew Good <m...@matt-good.net> # All rights reserved. # Modified: bloodhound/branches/trac-1.0.2-integration/trac/contrib/htpasswd.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/contrib/htpasswd.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/contrib/htpasswd.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/contrib/htpasswd.py Sat Nov 15 01:14:46 2014 @@ -1,12 +1,27 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Copyright (C) 2008-2013 Edgewall Software +# Copyright (C) 2008 Eli Carter +# 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/. + """Replacement for htpasswd""" -# Original author: Eli Carter import os import sys import random from optparse import OptionParser +from trac.util.compat import wait_for_file_mtime_change + # We need a crypt module, but Windows doesn't have one by default. Try to find # one, and tell the user if we can't. try: @@ -51,6 +66,7 @@ class HtpasswdFile: def save(self): """Write the htpasswd file to disk""" + wait_for_file_mtime_change(self.filename) open(self.filename, 'w').writelines(["%s:%s\n" % (entry[0], entry[1]) for entry in self.entries]) @@ -71,8 +87,9 @@ class HtpasswdFile: def main(): - """%prog [-c] -b filename username password - Create or update an htpasswd file""" + """ + %prog -b[c] filename username password + %prog -D filename username""" # For now, we only care about the use cases that affect tests/functional.py parser = OptionParser(usage=main.__doc__) parser.add_option('-b', action='store_true', dest='batch', default=False, @@ -93,8 +110,8 @@ def main(): sys.stderr.write(parser.get_usage()) sys.exit(1) - if not options.batch: - syntax_error("Only batch mode is supported\n") + if not (options.batch or options.delete_user): + syntax_error("Only batch and delete modes are supported\n") # Non-option arguments if len(args) < 2: Modified: bloodhound/branches/trac-1.0.2-integration/trac/contrib/l10n_diff_index.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/contrib/l10n_diff_index.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/contrib/l10n_diff_index.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/contrib/l10n_diff_index.py Sat Nov 15 01:14:46 2014 @@ -1,5 +1,16 @@ +# -*- coding: utf-8 -*- +# # Copyright (C) 2013 Edgewall Software -# This file is distributed under the same license as the Trac project. +# Copyright (C) 2013 Christian Boos <cb...@edgewall.org> +# 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/. """ Modified: bloodhound/branches/trac-1.0.2-integration/trac/contrib/l10n_reset_en_GB.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/contrib/l10n_reset_en_GB.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/contrib/l10n_reset_en_GB.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/contrib/l10n_reset_en_GB.py Sat Nov 15 01:14:46 2014 @@ -1,5 +1,16 @@ +# -*- coding: utf-8 -*- +# # Copyright (C) 2013 Edgewall Software -# This file is distributed under the same license as the Trac project. +# Copyright (C) 2013 Christian Boos <cb...@edgewall.org> +# 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/. """ Modified: bloodhound/branches/trac-1.0.2-integration/trac/contrib/l10n_revert_lineno_conflicts.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/contrib/l10n_revert_lineno_conflicts.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/contrib/l10n_revert_lineno_conflicts.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/contrib/l10n_revert_lineno_conflicts.py Sat Nov 15 01:14:46 2014 @@ -1,5 +1,16 @@ +# -*- coding: utf-8 -*- +# # Copyright (C) 2013 Edgewall Software -# This file is distributed under the same license as the Trac project. +# Copyright (C) 2013 Christian Boos <cb...@edgewall.org> +# 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/. """ @@ -17,15 +28,32 @@ import re ignore_lineno_re = re.compile(r''' <<<< .* \n - ( (?: [^=] .* \n )+) # \1 == "working copy" + ( (?: [^=] .* \n )+ ) # \1 == "working copy" ==== .* \n - ( (?: \# .* \n )+) # \2 == comment only for "theirs" + ( (?: \# .* \n )+ ) # \2 == comment only for "theirs" >>>> .* \n ''', re.MULTILINE | re.VERBOSE) +HEADERS = ''' +Project-Id-Version Report-Msgid-Bugs-To POT-Creation-Date PO-Revision-Date +Last-Translator Language-Team Plural-Forms MIME-Version Content-Type +Content-Transfer-Encoding Generated-By +'''.split() + +po_headers_re = re.compile(r''' + <<<< .* \n + ( (?: "(?:%(header)s): \s [^"]+" \n )+ ) # \1 == "working copy" + ==== .* \n + ( (?: "(?:%(header)s): \s [^"]+" \n )+ ) # \2 == another date for "theirs" + >>>> .* \n + ''' % dict(header='|'.join(HEADERS)), re. MULTILINE | re.VERBOSE) + + def sanitize_file(path): - with file(path, 'rb+') as f: + with file(path, 'r+') as f: sanitized, nsub = ignore_lineno_re.subn(r'\1', f.read()) + sanitized, nsub2 = po_headers_re.subn(r'\1', sanitized) + nsub += nsub2 if nsub: print("reverted %d ignorable changes in %s" % (nsub, path)) f.seek(0) Modified: bloodhound/branches/trac-1.0.2-integration/trac/contrib/migrateticketmodel.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/contrib/migrateticketmodel.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/contrib/migrateticketmodel.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/contrib/migrateticketmodel.py Sat Nov 15 01:14:46 2014 @@ -1,5 +1,18 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # +# Copyright (C) 2005-2013 Edgewall Software +# Copyright (C) 2005 Christopher Lenz <cml...@gmx.de> +# 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/. + # This script completely migrates a <= 0.8.x Trac environment to use the new # default ticket model introduced in Trac 0.9. # Modified: bloodhound/branches/trac-1.0.2-integration/trac/contrib/sourceforge2trac.py URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/contrib/sourceforge2trac.py?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/contrib/sourceforge2trac.py (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/contrib/sourceforge2trac.py Sat Nov 15 01:14:46 2014 @@ -1,3 +1,19 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2004-2013 Edgewall Software +# Copyright (C) 2004 Dmitry Yusupov <dmitry_...@yahoo.com> +# Copyright (C) 2004 Mark Rowe <mr...@bluewire.net.nz> +# Copyright (C) 2010 Anatoly Techtonik <techto...@php.net> +# 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 a Sourceforge project's tracker items into a Trac database. @@ -11,15 +27,6 @@ The Sourceforge tracker items can be exp of the project admin section. Substitute XXXXX with project id: https://sourceforge.net/export/xml_export2.php?group_id=XXXXX - -Initial version for Trac 0.7 and old artiface SF export format is -Copyright 2004, Mark Rowe <mr...@bluewire.net.nz> - -Version for Trac 0.11 and SF XML2 export format, completely rewritten -except TracDatabase class is -Copyright 2010, anatoly techtonik <techto...@php.net> -HGID: 92fd15e8398c - $Id$ @@ -123,9 +130,9 @@ class FlatXML(object): for c in el: if len(c.getchildren()) == 0: if c.text != None and len(c.text.strip()) != 0: - self.__setattr__(c.tag, c.text) + self.__setattr__(c.tag, c.text) else: - self.__setattr__(c.tag, []) + self.__setattr__(c.tag, []) else: #if c.getchildren()[0].tag == c.tag[:-1]: # c is a set of elements self.__setattr__(c.tag, [FlatXML(x) for x in c.getchildren()]) @@ -552,137 +559,137 @@ def importData(f, env, opt): trac.setMilestoneList([]) for tracker in project.trackers: - # id 100 means no component selected - component_lookup = dict(project.get_categories(noowner=True) + - [("100", None)]) - for t in tracker.tracker_items: - i = trac.addTicket(type=tracker.name, - time=int(t.submit_date), - changetime=int(t.submit_date), - component=component_lookup[t.category_id], - priority=t.priority, - owner=t.assignee \ - if t.assignee not in user_map \ - else user_map[t.assignee], - reporter=t.submitter \ - if t.submitter not in user_map \ - else user_map[t.submitter], - cc=None, - # 100 means no group selected - version=dict(project.groups + - [("100", None)])[t.group_id], - milestone=None, - status=dict(project.statuses)[t.status_id], - resolution=dict(resolutions)[t.resolution_id] \ - if hasattr(t, "resolution_id") else None, - summary=t.summary, - description=t.details, - keywords='sf' + t.id) - - print 'Imported %s as #%d' % (t.id, i) - - if len(t.attachments): - attmsg = "SourceForge attachments:\n" - for a in t.attachments: - attmsg = attmsg + " * [%s %s] (%s) - added by '%s' %s [[BR]] "\ - % (a.url+t.id, a.filename, a.filesize+" bytes", - user_map.get(a.submitter, a.submitter), - time.strftime("%Y-%m-%d %H:%M:%S", - time.localtime(int(a.date)))) - attmsg = attmsg + "''%s ''\n" % (a.description or '') - # empty description is as empty list - trac.addTicketComment(ticket=i, - time=time.strftime("%Y-%m-%d %H:%M:%S", - time.localtime(int(t.submit_date))), - author=None, value=attmsg) - print ' added information about %d attachments for #%d' % \ - (len(t.attachments), i) + # id 100 means no component selected + component_lookup = dict(project.get_categories(noowner=True) + + [("100", None)]) + for t in tracker.tracker_items: + i = trac.addTicket(type=tracker.name, + time=int(t.submit_date), + changetime=int(t.submit_date), + component=component_lookup[t.category_id], + priority=t.priority, + owner=t.assignee \ + if t.assignee not in user_map \ + else user_map[t.assignee], + reporter=t.submitter \ + if t.submitter not in user_map \ + else user_map[t.submitter], + cc=None, + # 100 means no group selected + version=dict(project.groups + + [("100", None)])[t.group_id], + milestone=None, + status=dict(project.statuses)[t.status_id], + resolution=dict(resolutions)[t.resolution_id] \ + if hasattr(t, "resolution_id") else None, + summary=t.summary, + description=t.details, + keywords='sf' + t.id) + + print 'Imported %s as #%d' % (t.id, i) + + if len(t.attachments): + attmsg = "SourceForge attachments:\n" + for a in t.attachments: + attmsg = attmsg + " * [%s %s] (%s) - added by '%s' %s [[BR]] "\ + % (a.url+t.id, a.filename, a.filesize+" bytes", + user_map.get(a.submitter, a.submitter), + time.strftime("%Y-%m-%d %H:%M:%S", + time.localtime(int(a.date)))) + attmsg = attmsg + "''%s ''\n" % (a.description or '') + # empty description is as empty list + trac.addTicketComment(ticket=i, + time=time.strftime("%Y-%m-%d %H:%M:%S", + time.localtime(int(t.submit_date))), + author=None, value=attmsg) + print ' added information about %d attachments for #%d' % \ + (len(t.attachments), i) + + for msg in t.followups: + """ + <followup> + <id>3280792</id> + <submitter>goblinhack</submitter> + <date>1231087739</date> + <details>done</details> + </followup> + """ + trac.addTicketComment(ticket=i, + time=msg.date, + author=msg.submitter, + value=msg.details) + if t.followups: + print ' imported %d messages for #%d' % (len(t.followups), i) - for msg in t.followups: + # Import history """ - <followup> - <id>3280792</id> - <submitter>goblinhack</submitter> - <date>1231087739</date> - <details>done</details> - </followup> + <history_entry> + <id>4452195</id> + <field_name>resolution_id</field_name> + <old_value>100</old_value> + <date>1176043865</date> + <updator>goblinhack</updator> + </history_entry> """ - trac.addTicketComment(ticket=i, - time=msg.date, - author=msg.submitter, - value=msg.details) - if t.followups: - print ' imported %d messages for #%d' % (len(t.followups), i) - - # Import history - """ - <history_entry> - <id>4452195</id> - <field_name>resolution_id</field_name> - <old_value>100</old_value> - <date>1176043865</date> - <updator>goblinhack</updator> - </history_entry> - """ - revision = t.__dict__.copy() + revision = t.__dict__.copy() - # iterate the history in reverse order and update ticket revision from - # current (last) to initial - changes = 0 - for h in sorted(t.history_entries, reverse=True): - """ - Processed fields (field - notes): - IP - no target field, just skip - summary - priority - close_date - assigned_to - - Fields not processed (field: explanation): - File Added - TODO - resolution_id - need to update used_resolutions - status_id - artifact_group_id - category_id - group_id - """ - f = None - if h.field_name in ("IP",): - changes += 1 - continue - elif h.field_name in ("summary", "priority"): - f = h.field_name - oldvalue = h.old_value - newvalue = revision.get(h.field_name, None) - elif h.field_name == 'assigned_to': - f = "owner" - newvalue = revision['assignee'] - if h.old_value == '100': # was not assigned - revision['assignee'] = None - oldvalue = None - else: - username = project.users[h.old_value] - if username in user_map: username = user_map[username] - revision['assignee'] = oldvalue = username - elif h.field_name == 'close_date' and revision['close_date'] != 0: - f = 'status' - oldvalue = 'assigned' - newvalue = 'closed' - - if f: - changes += 1 - trac.addTicketChange(ticket=i, - time=h.date, - author=h.updator, - field=f, - oldvalue=oldvalue, - newvalue=newvalue) - - if h.field_name != 'assigned_to': - revision[h.field_name] = h.old_value - if changes: - print ' processed %d out of %d history items for #%d' % \ - (changes, len(t.history_entries), i) + # iterate the history in reverse order and update ticket revision from + # current (last) to initial + changes = 0 + for h in sorted(t.history_entries, reverse=True): + """ + Processed fields (field - notes): + IP - no target field, just skip + summary + priority + close_date + assigned_to + + Fields not processed (field: explanation): + File Added - TODO + resolution_id - need to update used_resolutions + status_id + artifact_group_id + category_id + group_id + """ + f = None + if h.field_name in ("IP",): + changes += 1 + continue + elif h.field_name in ("summary", "priority"): + f = h.field_name + oldvalue = h.old_value + newvalue = revision.get(h.field_name, None) + elif h.field_name == 'assigned_to': + f = "owner" + newvalue = revision['assignee'] + if h.old_value == '100': # was not assigned + revision['assignee'] = None + oldvalue = None + else: + username = project.users[h.old_value] + if username in user_map: username = user_map[username] + revision['assignee'] = oldvalue = username + elif h.field_name == 'close_date' and revision['close_date'] != 0: + f = 'status' + oldvalue = 'assigned' + newvalue = 'closed' + + if f: + changes += 1 + trac.addTicketChange(ticket=i, + time=h.date, + author=h.updator, + field=f, + oldvalue=oldvalue, + newvalue=newvalue) + + if h.field_name != 'assigned_to': + revision[h.field_name] = h.old_value + if changes: + print ' processed %d out of %d history items for #%d' % \ + (changes, len(t.history_entries), i) def main(): Modified: bloodhound/branches/trac-1.0.2-integration/trac/contrib/trac-pre-commit-hook URL: http://svn.apache.org/viewvc/bloodhound/branches/trac-1.0.2-integration/trac/contrib/trac-pre-commit-hook?rev=1639823&r1=1639822&r2=1639823&view=diff ============================================================================== --- bloodhound/branches/trac-1.0.2-integration/trac/contrib/trac-pre-commit-hook (original) +++ bloodhound/branches/trac-1.0.2-integration/trac/contrib/trac-pre-commit-hook Sat Nov 15 01:14:46 2014 @@ -1,7 +1,17 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# Author: Jonas Borgström <jo...@edgewall.com> +# Copyright (C) 2004-2013 Edgewall Software +# Copyright (C) 2004 Jonas Borgström <jo...@edgewall.com> +# 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/. # # This script will enforce the following policy: #