+
+
+ Select Base and Target for Diff:
+
+
+
+| diff -ruN -x .svn trac-0.9b2/trac/__init__.py anydiff-branch/trac/__init__.py --- trac-0.9b2/trac/__init__.py 2005-09-25 16:48:00.000000000 +0200 +++ anydiff-branch/trac/__init__.py 2005-09-28 10:33:06.000000000 +0200 @@ -10,7 +10,7 @@ """ __docformat__ = 'epytext en' -__version__ = '0.9b2' +__version__ = '0.9b2-anydiff' __url__ = 'http://trac.edgewall.com/' __copyright__ = '(C) 2003-2005 Edgewall Software' __license__ = 'BSD' diff -ruN -x .svn trac-0.9b2/trac/versioncontrol/api.py anydiff-branch/trac/versioncontrol/api.py --- trac-0.9b2/trac/versioncontrol/api.py 2005-09-25 16:47:58.000000000 +0200 +++ anydiff-branch/trac/versioncontrol/api.py 2005-09-28 10:33:04.000000000 +0200 @@ -39,6 +39,12 @@ """ raise NotImplementedError + def has_node(self, path, rev): + """ + Tell if there's a node at the specified (path,rev) combination. + """ + raise NotImplementedError + def get_node(self, path, rev=None): """ Retrieve a Node (directory or file) from the repository at the @@ -111,7 +117,17 @@ 'None' is a valid revision value and represents the youngest revision. """ return NotImplementedError - + + def get_deltas(self, old_path, old_rev, new_path, new_rev, ignore_ancestry=1): + """ + Generator that yields change tuples (old_node, new_node, kind, change) + for each node change between the two arbitrary (path,rev) pairs. + + The old_node is assumed to be None when the change is an ADD, + the new_node is assumed to be None when the change is a DELETE. + """ + raise NotImplementedError + class Node(object): """ @@ -149,9 +165,22 @@ node (if the underlying version control system supports that), which will be indicated by the first element of the tuple (i.e. the path) changing. + Starts with an entry for the current revision. """ raise NotImplementedError + def get_previous(self): + """ + Return the (path, rev, chg) tuple corresponding to the previous + revision for that node. + """ + skip = True + for p in self.get_history(2): + if skip: + skip = False + else: + return p + def get_properties(self): """ Returns a dictionary containing the properties (meta-data) of the node. diff -ruN -x .svn trac-0.9b2/trac/versioncontrol/cache.py anydiff-branch/trac/versioncontrol/cache.py --- trac-0.9b2/trac/versioncontrol/cache.py 2005-09-25 16:47:58.000000000 +0200 +++ anydiff-branch/trac/versioncontrol/cache.py 2005-09-07 17:25:25.000000000 +0200 @@ -84,6 +84,9 @@ def get_node(self, path, rev=None): return self.repos.get_node(path, rev) + def has_node(self, path, rev): + return self.repos.has_node(path, rev) + def get_oldest_rev(self): return self.repos.oldest_rev @@ -108,6 +111,9 @@ def normalize_rev(self, rev): return self.repos.normalize_rev(rev) + def get_deltas(self, old_path, old_rev, new_path, new_rev, ignore_ancestry=1): + return self.repos.get_deltas(old_path, old_rev, new_path, new_rev, ignore_ancestry) + class CachedChangeset(Changeset): diff -ruN -x .svn trac-0.9b2/trac/versioncontrol/diff.py anydiff-branch/trac/versioncontrol/diff.py --- trac-0.9b2/trac/versioncontrol/diff.py 2005-09-25 16:47:58.000000000 +0200 +++ anydiff-branch/trac/versioncontrol/diff.py 2005-09-28 10:33:04.000000000 +0200 @@ -218,6 +218,8 @@ ignore_space_changes) for group in _group_opcodes(opcodes, context): i1, i2, j1, j2 = group[0][1], group[-1][2], group[0][3], group[-1][4] + if i1 == 0 and i2 == 0: + i1, i2 = -1, -1 # support for 'A'dd changes yield '@@ -%d,%d +%d,%d @@' % (i1 + 1, i2 - i1, j1 + 1, j2 - j1) for tag, i1, i2, j1, j2 in group: if tag == 'equal': diff -ruN -x .svn trac-0.9b2/trac/versioncontrol/svn_fs.py anydiff-branch/trac/versioncontrol/svn_fs.py --- trac-0.9b2/trac/versioncontrol/svn_fs.py 2005-09-25 16:47:58.000000000 +0200 +++ anydiff-branch/trac/versioncontrol/svn_fs.py 2005-09-28 10:33:04.000000000 +0200 @@ -207,6 +207,11 @@ def __del__(self): self.close() + def has_node(self, path, rev): + rev_root = fs.revision_root(self.fs_ptr, rev, self.pool()) + node_type = fs.check_path(rev_root, path, self.pool()) + return node_type in _kindmap + def normalize_path(self, path): return (not path or path == '/') and '/' or path.strip('/') @@ -298,9 +303,7 @@ subpool = Pool(self.pool) while rev: subpool.clear() - rev_root = fs.revision_root(self.fs_ptr, rev, subpool()) - node_type = fs.check_path(rev_root, path, subpool()) - if node_type in _kindmap: # then path exists at that rev + if self.has_node(path, rev): if expect_deletion: # it was missing, now it's there again: # rev+1 must be a delete @@ -330,6 +333,64 @@ expect_deletion = True rev = self.previous_rev(rev) + def get_deltas(self, old_path, old_rev, new_path, new_rev, + ignore_ancestry=0): + old_node = new_node = None + old_rev = self.normalize_rev(old_rev) + new_rev = self.normalize_rev(new_rev) + if self.has_node(old_path, old_rev): + old_node = self.get_node(old_path, old_rev) + else: + raise TracError, ('The Base for Diff is invalid: path %s' + ' doesn\'t exist in revision %s' \ + % (old_path, old_rev)) + if self.has_node(new_path, new_rev): + new_node = self.get_node(new_path, new_rev) + else: + raise TracError, ('The Target for Diff is invalid: path %s' + ' doesn\'t exist in revision %s' \ + % (new_path, new_rev)) + if new_node.kind != old_node.kind: + raise TracError, ('Diff mismatch: Base is a %s (%s in revision %s) ' + 'and Target is a %s (%s in revision %s).' \ + % (old_node.kind, old_path, old_rev, + new_node.kind, new_path, new_rev)) + subpool = Pool(self.pool) + if new_node.isdir: + editor = DiffChangeEditor() + 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 + 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, old_path, '', + new_root, new_path, + e_ptr, e_baton, authz_cb, + text_deltas, + 1, # directory + entry_props, + ignore_ancestry, + subpool()) + for path, kind, change in editor.deltas: + old_node = new_node = None + if change != Changeset.ADD: + old_node = self.get_node(posixpath.join(old_path, path), + old_rev) + if change != Changeset.DELETE: + new_node = self.get_node(posixpath.join(new_path, path), + new_rev) + else: + kind = _kindmap[fs.check_path(old_root, old_node.path, + subpool())] + yield (old_node, new_node, kind, change) + else: + old_root = fs.revision_root(self.fs_ptr, old_rev, subpool()) + new_root = fs.revision_root(self.fs_ptr, new_rev, subpool()) + if fs.contents_changed(old_root, old_path, new_root, new_path, + subpool()): + yield (old_node, new_node, Node.FILE, Changeset.EDIT) + class SubversionNode(Node): @@ -352,8 +413,12 @@ self.pool()) self.created_path = fs.node_created_path(self.root, self.scoped_path, self.pool()) - # 'created_path' differs from 'path' if the last operation is a copy, - # and furthermore, 'path' might not exist at 'create_rev' + # Note: 'created_path' differs from 'path' if the last change was a copy, + # and furthermore, 'path' might not exist at 'create_rev'. + # The only guarantees are: + # * this node exists at (path,rev) + # * the node existed at (created_path,created_rev) + # TODO: check node id self.rev = self.created_rev Node.__init__(self, path, self.rev, _kindmap[node_type]) @@ -393,6 +458,9 @@ if newer: yield newer +# def get_previous(self): +# # FIXME: redo it with fs.node_history + def get_properties(self): props = fs.node_proplist(self.root, self.scoped_path, self.pool()) for name,value in props.items(): @@ -487,3 +555,47 @@ def _get_prop(self, name): return fs.revision_prop(self.fs_ptr, self.rev, name, self.pool()) + + +# +# Delta editor for diffs between arbitrary nodes +# +# Note 1: the 'copyfrom_path' and 'copyfrom_rev' information is not used +# because 'repos.svn_repos_dir_delta' *doesn't* provide it. +# +# Note 2: the 'dir_baton' is the path of the parent directory +# + +class DiffChangeEditor(delta.Editor): + + def __init__(self): + self.deltas = [] + + # -- svn.delta.Editor callbacks + + def open_root(self, base_revision, dir_pool): + return ('/', Changeset.EDIT) + + def add_directory(self, path, dir_baton, copyfrom_path, copyfrom_rev, + dir_pool): + self.deltas.append((path, Node.DIRECTORY, Changeset.ADD)) + return (path, Changeset.ADD) + + def open_directory(self, path, dir_baton, base_revision, dir_pool): + return (path, dir_baton[1]) + + def change_dir_prop(self, dir_baton, name, value, pool): + path, change = dir_baton + if change != Changeset.ADD: + self.deltas.append((path, Node.DIRECTORY, change)) + + def delete_entry(self, path, revision, dir_baton, pool): + self.deltas.append((path, None, Changeset.DELETE)) + + def add_file(self, path, dir_baton, copyfrom_path, copyfrom_revision, + dir_pool): + self.deltas.append((path, Node.FILE, Changeset.ADD)) + + def open_file(self, path, dir_baton, dummy_rev, file_pool): + self.deltas.append((path, Node.FILE, Changeset.EDIT)) + diff -ruN -x .svn trac-0.9b2/trac/versioncontrol/tests/svn_fs.py anydiff-branch/trac/versioncontrol/tests/svn_fs.py --- trac-0.9b2/trac/versioncontrol/tests/svn_fs.py 2005-09-25 16:47:58.000000000 +0200 +++ anydiff-branch/trac/versioncontrol/tests/svn_fs.py 2005-09-28 10:33:03.000000000 +0200 @@ -215,6 +215,72 @@ self.assertEqual(('tags/v1', 7, 'unknown'), history.next()) self.assertRaises(StopIteration, history.next) + # Diffs + + def _cmp_diff(self, expected, got): + if expected[0]: + old = self.repos.get_node(*expected[0]) + self.assertEqual((old.path, old.rev), (got[0].path, got[0].rev)) + if expected[1]: + new = self.repos.get_node(*expected[1]) + self.assertEqual((new.path, new.rev), (got[1].path, got[1].rev)) + self.assertEqual(expected[2], (got[2], got[3])) + + def test_diff_file_different_revs(self): + diffs = self.repos.get_deltas('trunk/README.txt', 2, 'trunk/README.txt', 3) + self._cmp_diff((('trunk/README.txt', 2), + ('trunk/README.txt', 3), + (Node.FILE, Changeset.EDIT)), diffs.next()) + self.assertRaises(StopIteration, diffs.next) + + def test_diff_file_different_files(self): + diffs = self.repos.get_deltas('branches/v1x/README.txt', 12, + 'branches/v1x/README2.txt', 12) + self._cmp_diff((('branches/v1x/README.txt', 12), + ('branches/v1x/README2.txt', 12), + (Node.FILE, Changeset.EDIT)), diffs.next()) + self.assertRaises(StopIteration, diffs.next) + + def test_diff_file_no_change(self): + diffs = self.repos.get_deltas('trunk/README.txt', 7, + 'tags/v1/README.txt', 7) + self.assertRaises(StopIteration, diffs.next) + + def test_diff_dir_different_revs(self): + diffs = self.repos.get_deltas('trunk', 4, 'trunk', 8) + self._cmp_diff((None, ('trunk/dir1/dir2', 8), + (Node.DIRECTORY, Changeset.ADD)), diffs.next()) + self._cmp_diff((None, ('trunk/dir1/dir3', 8), + (Node.DIRECTORY, Changeset.ADD)), diffs.next()) + self._cmp_diff((None, ('trunk/README2.txt', 6), + (Node.FILE, Changeset.ADD)), diffs.next()) + self._cmp_diff((('trunk/dir2', 4), None, + (Node.DIRECTORY, Changeset.DELETE)), diffs.next()) + self._cmp_diff((('trunk/dir3', 4), None, + (Node.DIRECTORY, Changeset.DELETE)), diffs.next()) + self.assertRaises(StopIteration, diffs.next) + + def test_diff_dir_different_dirs(self): + diffs = self.repos.get_deltas('trunk', 1, 'branches/v1x', 12) + self._cmp_diff((None, ('branches/v1x/dir1', 12), + (Node.DIRECTORY, Changeset.ADD)), diffs.next()) + self._cmp_diff((None, ('branches/v1x/dir1/dir2', 12), + (Node.DIRECTORY, Changeset.ADD)), diffs.next()) + self._cmp_diff((None, ('branches/v1x/dir1/dir3', 12), + (Node.DIRECTORY, Changeset.ADD)), diffs.next()) + self._cmp_diff((None, ('branches/v1x/README.txt', 12), + (Node.FILE, Changeset.ADD)), diffs.next()) + self._cmp_diff((None, ('branches/v1x/README2.txt', 12), + (Node.FILE, Changeset.ADD)), diffs.next()) + self.assertRaises(StopIteration, diffs.next) + + def test_diff_dir_no_change(self): + diffs = self.repos.get_deltas('trunk', 7, + 'tags/v1', 7) + self.assertRaises(StopIteration, diffs.next) + + # Changesets + def test_changeset_repos_creation(self): chgset = self.repos.get_changeset(0) self.assertEqual(0, chgset.rev) diff -ruN -x .svn trac-0.9b2/trac/versioncontrol/web_ui/browser.py anydiff-branch/trac/versioncontrol/web_ui/browser.py --- trac-0.9b2/trac/versioncontrol/web_ui/browser.py 2005-09-25 16:47:58.000000000 +0200 +++ anydiff-branch/trac/versioncontrol/web_ui/browser.py 2005-09-28 10:33:04.000000000 +0200 @@ -88,21 +88,29 @@ repos = self.env.get_repository(req.authname) node = repos.get_node(path, rev) + rev = repos.normalize_rev(rev) hidden_properties = [p.strip() for p in self.config.get('browser', 'hide_properties', 'svk:merge').split(',')] + req.hdf['title'] = path - req.hdf['browser'] = { + browser_hdf = { 'path': path, - 'revision': rev or repos.youngest_rev, + 'revision': rev, 'props': dict([(util.escape(name), util.escape(value)) for name, value in node.get_properties().items() - if not name in hidden_properties]), - 'href': util.escape(self.env.href.browser(path, rev=rev or - repos.youngest_rev)), - 'log_href': util.escape(self.env.href.log(path)) - } + if not name in hidden_properties]) + } + browser_hrefs = { + 'href': self.env.href.browser(path,rev=rev), + 'restr_changeset_href': self.env.href.changeset(node.rev, path), + 'anydiff_href': self.env.href.anydiff(), + 'log_href': self.env.href.log(path) + } + browser_hdf.update(dict([(key, util.escape(href)) for key, href in + browser_hrefs.items()])) + req.hdf['browser'] = browser_hdf path_links = get_path_links(self.env.href, path, rev) if len(path_links) > 1: @@ -162,7 +170,14 @@ req.hdf['browser.items'] = info req.hdf['browser.changes'] = changes - + if node.path != '': + zip_href = self.env.href.diff(node.path, new=rev, old=rev, + old_path='/', # special case (#238) + format='zip') + add_link(req, 'alternate', zip_href, 'Zip Archive', + 'application/zip', 'zip') + + def _render_file(self, req, repos, node, rev=None): req.perm.assert_permission('FILE_VIEW') diff -ruN -x .svn trac-0.9b2/trac/versioncontrol/web_ui/changeset.py anydiff-branch/trac/versioncontrol/web_ui/changeset.py --- trac-0.9b2/trac/versioncontrol/web_ui/changeset.py 2005-09-25 16:47:58.000000000 +0200 +++ anydiff-branch/trac/versioncontrol/web_ui/changeset.py 2005-09-28 10:33:03.000000000 +0200 @@ -22,20 +22,18 @@ from trac import mimeview, util from trac.core import * -from trac.perm import IPermissionRequestor from trac.Search import ISearchSource, query_to_sql, shorten_result from trac.Timeline import ITimelineEventProvider from trac.versioncontrol import Changeset, Node from trac.versioncontrol.svn_authz import SubversionAuthorizer -from trac.versioncontrol.diff import get_diff_options, hdf_diff, unified_diff from trac.web import IRequestHandler -from trac.web.chrome import add_link, add_stylesheet, INavigationContributor +from trac.web.chrome import INavigationContributor from trac.wiki import wiki_to_html, wiki_to_oneliner, IWikiSyntaxProvider +from trac.versioncontrol.web_ui.diff import AbstractDiffModule +class ChangesetModule(AbstractDiffModule): -class ChangesetModule(Component): - - implements(INavigationContributor, IPermissionRequestor, IRequestHandler, + implements(INavigationContributor, ITimelineEventProvider, IWikiSyntaxProvider, ISearchSource) # INavigationContributor methods @@ -46,53 +44,17 @@ def get_navigation_items(self, req): return [] - # IPermissionRequestor methods - - def get_permission_actions(self): - return ['CHANGESET_VIEW'] - - # IRequestHandler methods + # (reimplemented) IRequestHandler methods def match_request(self, req): - match = re.match(r'/changeset/([0-9]+)$', req.path_info) + match = re.match(r'/changeset/([0-9]+)(/.*)?$', req.path_info) if match: req.args['rev'] = match.group(1) + path = match.group(2) + if path: + req.args['path'] = path return 1 - def process_request(self, req): - req.perm.assert_permission('CHANGESET_VIEW') - - rev = req.args.get('rev') - repos = self.env.get_repository(req.authname) - authzperm = SubversionAuthorizer(self.env, req.authname) - authzperm.assert_permission_for_changeset(rev) - - diff_options = get_diff_options(req) - if req.args.has_key('update'): - req.redirect(self.env.href.changeset(rev)) - - chgset = repos.get_changeset(rev) - req.check_modified(chgset.date, - diff_options[0] + ''.join(diff_options[1])) - - format = req.args.get('format') - if format == 'diff': - self._render_diff(req, repos, chgset, diff_options) - return - elif format == 'zip': - self._render_zip(req, repos, chgset) - return - - self._render_html(req, repos, chgset, diff_options) - add_link(req, 'alternate', '?format=diff', 'Unified Diff', - 'text/plain', 'diff') - add_link(req, 'alternate', '?format=zip', 'Zip Archive', - 'application/zip', 'zip') - add_stylesheet(req, 'common/css/changeset.css') - add_stylesheet(req, 'common/css/diff.css') - add_stylesheet(req, 'common/css/code.css') - return 'changeset.cs', None - # ITimelineEventProvider methods def get_timeline_filters(self, req): @@ -143,229 +105,35 @@ message rev = repos.previous_rev(rev) - # Internal methods - - def _render_html(self, req, repos, chgset, diff_options): - """HTML version""" - req.hdf['title'] = '[%s]' % chgset.rev - req.hdf['changeset'] = { - 'revision': chgset.rev, - 'time': util.format_datetime(chgset.date), - 'author': util.escape(chgset.author or 'anonymous'), - 'message': wiki_to_html(chgset.message or '--', self.env, req, - escape_newlines=True) - } - - oldest_rev = repos.oldest_rev - if chgset.rev != oldest_rev: - add_link(req, 'first', self.env.href.changeset(oldest_rev), - 'Changeset %s' % oldest_rev) - previous_rev = repos.previous_rev(chgset.rev) - add_link(req, 'prev', self.env.href.changeset(previous_rev), - 'Changeset %s' % previous_rev) - youngest_rev = repos.youngest_rev - if str(chgset.rev) != str(youngest_rev): - next_rev = repos.next_rev(chgset.rev) - add_link(req, 'next', self.env.href.changeset(next_rev), - 'Changeset %s' % next_rev) - add_link(req, 'last', self.env.href.changeset(youngest_rev), - 'Changeset %s' % youngest_rev) - - edits = [] - idx = 0 - for path, kind, change, base_path, base_rev in chgset.get_changes(): - info = {'change': change} - if base_path: - info['path.old'] = base_path - info['rev.old'] = base_rev - info['browser_href.old'] = self.env.href.browser(base_path, - rev=base_rev) - if path: - info['path.new'] = path - info['rev.new'] = chgset.rev - info['browser_href.new'] = self.env.href.browser(path, - rev=chgset.rev) - if change in (Changeset.COPY, Changeset.EDIT, Changeset.MOVE): - edits.append((idx, path, kind, base_path, base_rev)) - req.hdf['changeset.changes.%d' % idx] = info - idx += 1 - - hidden_properties = [p.strip() for p - in self.config.get('browser', 'hide_properties', - 'svk:merge').split(',')] - - for idx, path, kind, base_path, base_rev in edits: - old_node = repos.get_node(base_path or path, base_rev) - new_node = repos.get_node(path, chgset.rev) - - # Property changes - old_props = old_node.get_properties() - new_props = new_node.get_properties() - changed_props = {} - if old_props != new_props: - for k,v in old_props.items(): - if not k in new_props: - changed_props[k] = {'old': v} - elif v != new_props[k]: - changed_props[k] = {'old': v, 'new': new_props[k]} - for k,v in new_props.items(): - if not k in old_props: - changed_props[k] = {'new': v} - for k in hidden_properties: - if k in changed_props: - del changed_props[k] - req.hdf['changeset.changes.%d.props' % idx] = changed_props - - if kind == Node.DIRECTORY: - continue - - # Content changes - default_charset = self.config.get('trac', 'default_charset') - old_content = old_node.get_content().read() - if mimeview.is_binary(old_content): - continue - charset = mimeview.get_charset(old_node.content_type) or \ - default_charset - old_content = util.to_utf8(old_content, charset) - - new_content = new_node.get_content().read() - if mimeview.is_binary(new_content): - continue - charset = mimeview.get_charset(new_node.content_type) or \ - default_charset - new_content = util.to_utf8(new_content, charset) - - if old_content != new_content: - context = 3 - for option in diff_options[1]: - if option.startswith('-U'): - context = int(option[2:]) - break - tabwidth = int(self.config.get('diff', 'tab_width', - self.config.get('mimeviewer', - 'tab_width'))) - changes = hdf_diff(old_content.splitlines(), - new_content.splitlines(), - context, tabwidth, - ignore_blank_lines='-B' in diff_options[1], - ignore_case='-i' in diff_options[1], - ignore_space_changes='-b' in diff_options[1]) - req.hdf['changeset.changes.%d.diff' % idx] = changes - - def _render_diff(self, req, repos, chgset, diff_options): - """Raw Unified Diff version""" - req.send_response(200) - req.send_header('Content-Type', 'text/plain;charset=utf-8') - req.send_header('Content-Disposition', - 'filename=Changeset%s.diff' % req.args.get('rev')) - req.end_headers() - - for path, kind, change, base_path, base_rev in chgset.get_changes(): - if change == Changeset.ADD: - old_node = None - else: - old_node = repos.get_node(base_path or path, base_rev) - if change == Changeset.DELETE: - new_node = None - else: - new_node = repos.get_node(path, chgset.rev) - - # TODO: Property changes - - # Content changes - if kind == 'dir': - continue - - default_charset = self.config.get('trac', 'default_charset') - new_content = old_content = '' - new_node_info = old_node_info = ('','') - - if old_node: - charset = mimeview.get_charset(old_node.content_type) or \ - default_charset - old_content = util.to_utf8(old_node.get_content().read(), - charset) - old_node_info = (old_node.path, old_node.rev) - if mimeview.is_binary(old_content): - continue - - if new_node: - charset = mimeview.get_charset(new_node.content_type) or \ - default_charset - new_content = util.to_utf8(new_node.get_content().read(), - charset) - new_node_info = (new_node.path, new_node.rev) - if mimeview.is_binary(new_content): - continue - - if old_content != new_content: - context = 3 - for option in diff_options[1]: - if option.startswith('-U'): - context = int(option[2:]) - break - req.write('Index: ' + path + util.CRLF) - req.write('=' * 67 + util.CRLF) - req.write('--- %s (revision %s)' % old_node_info + - util.CRLF) - req.write('+++ %s (revision %s)' % new_node_info + - util.CRLF) - for line in unified_diff(old_content.splitlines(), - new_content.splitlines(), context, - ignore_blank_lines='-B' in diff_options[1], - ignore_case='-i' in diff_options[1], - ignore_space_changes='-b' in diff_options[1]): - req.write(line + util.CRLF) - - def _render_zip(self, req, repos, chgset): - """ZIP archive with all the added and/or modified files.""" - req.send_response(200) - req.send_header('Content-Type', 'application/zip') - req.send_header('Content-Disposition', - 'filename=Changeset%s.zip' % chgset.rev) - req.end_headers() - - try: - from cStringIO import StringIO - except ImportError: - from StringIO import StringIO - from zipfile import ZipFile, ZipInfo, ZIP_DEFLATED - - buf = StringIO() - zipfile = ZipFile(buf, 'w', ZIP_DEFLATED) - for path, kind, change, base_path, base_rev in chgset.get_changes(): - if kind == Node.FILE and change != Changeset.DELETE: - node = repos.get_node(path, chgset.rev) - zipinfo = ZipInfo() - zipinfo.filename = node.path - zipinfo.date_time = time.gmtime(node.last_modified)[:6] - zipinfo.compress_type = ZIP_DEFLATED - zipfile.writestr(zipinfo, node.get_content().read()) - zipfile.close() - req.write(buf.getvalue()) # IWikiSyntaxProvider methods def get_wiki_syntax(self): - yield (r"!?\[\d+\]|(?:\b|!)r\d+\b(?!:\d)", + yield (r"!?\[\d+(?:/[^\]]*)?\]|(?:\b|!)r\d+\b(?!:\d)", lambda x, y, z: self._format_link(x, 'changeset', y[0] == 'r' and y[1:] - or y[1:-1], y)) + or y[1:-1], y, z)) def get_link_resolvers(self): yield ('changeset', self._format_link) - def _format_link(self, formatter, ns, rev, label): + def _format_link(self, formatter, ns, chgset, label, fullmatch=None): + sep = chgset.find('/') + if sep > 0: + rev, path = chgset[:sep], chgset[sep:] + else: + rev, path = chgset, None cursor = formatter.db.cursor() cursor.execute('SELECT message FROM revision WHERE rev=%s', (rev,)) row = cursor.fetchone() if row: return '%s' \ % (util.escape(util.shorten_line(row[0])), - formatter.href.changeset(rev), label) + formatter.href.changeset(rev, path), label) else: - return '%s' \ - % (formatter.href.changeset(rev), label) + return '%s' \ + % (formatter.href.changeset(rev, path), label) # ISearchProvider methods diff -ruN -x .svn trac-0.9b2/trac/versioncontrol/web_ui/diff.py anydiff-branch/trac/versioncontrol/web_ui/diff.py --- trac-0.9b2/trac/versioncontrol/web_ui/diff.py 1970-01-01 01:00:00.000000000 +0100 +++ anydiff-branch/trac/versioncontrol/web_ui/diff.py 2005-09-28 10:33:03.000000000 +0200 @@ -0,0 +1,597 @@ +# -*- coding: iso8859-1 -*- +# +# Copyright (C) 2003-2005 Edgewall Software +# Copyright (C) 2003-2005 Jonas Borgström |
|---|