comparison pylons_app/controllers/changeset.py @ 512:d945c95ba4ac

refactoring for new vcs implementation renamed all ._short and .raw_id into .short_id updated dependency for vcs to 0.1.6
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 28 Sep 2010 20:25:58 +0000
parents 9dd372c7166c
children a99e23e6c1e8
comparison
equal deleted inserted replaced
511:0fce1f9e4dce 512:d945c95ba4ac
63 else: 63 else:
64 f_udiff = differ.get_udiff(filenode_old, node) 64 f_udiff = differ.get_udiff(filenode_old, node)
65 diff = differ.DiffProcessor(f_udiff).as_html() 65 diff = differ.DiffProcessor(f_udiff).as_html()
66 66
67 cs1 = None 67 cs1 = None
68 cs2 = node.last_changeset.raw_id 68 cs2 = node.last_changeset.short_id
69 c.changes.append(('added', node, diff, cs1, cs2)) 69 c.changes.append(('added', node, diff, cs1, cs2))
70 70
71 for node in c.changeset.changed: 71 for node in c.changeset.changed:
72 filenode_old = c.changeset_old.get_node(node.path) 72 filenode_old = c.changeset_old.get_node(node.path)
73 if filenode_old.is_binary or node.is_binary: 73 if filenode_old.is_binary or node.is_binary:
74 diff = 'binary file' 74 diff = 'binary file'
75 else: 75 else:
76 f_udiff = differ.get_udiff(filenode_old, node) 76 f_udiff = differ.get_udiff(filenode_old, node)
77 diff = differ.DiffProcessor(f_udiff).as_html() 77 diff = differ.DiffProcessor(f_udiff).as_html()
78 78
79 cs1 = filenode_old.last_changeset.raw_id 79 cs1 = filenode_old.last_changeset.short_id
80 cs2 = node.last_changeset.raw_id 80 cs2 = node.last_changeset.short_id
81 c.changes.append(('changed', node, diff, cs1, cs2)) 81 c.changes.append(('changed', node, diff, cs1, cs2))
82 82
83 for node in c.changeset.removed: 83 for node in c.changeset.removed:
84 c.changes.append(('removed', node, None, None, None)) 84 c.changes.append(('removed', node, None, None, None))
85 85
108 else: 108 else:
109 f_udiff = differ.get_udiff(filenode_old, node) 109 f_udiff = differ.get_udiff(filenode_old, node)
110 diff = differ.DiffProcessor(f_udiff).raw_diff() 110 diff = differ.DiffProcessor(f_udiff).raw_diff()
111 111
112 cs1 = None 112 cs1 = None
113 cs2 = node.last_changeset.raw_id 113 cs2 = node.last_changeset.short_id
114 c.changes.append(('added', node, diff, cs1, cs2)) 114 c.changes.append(('added', node, diff, cs1, cs2))
115 115
116 for node in c.changeset.changed: 116 for node in c.changeset.changed:
117 filenode_old = c.changeset_old.get_node(node.path) 117 filenode_old = c.changeset_old.get_node(node.path)
118 if filenode_old.is_binary or node.is_binary: 118 if filenode_old.is_binary or node.is_binary:
119 diff = 'binary file' 119 diff = 'binary file'
120 else: 120 else:
121 f_udiff = differ.get_udiff(filenode_old, node) 121 f_udiff = differ.get_udiff(filenode_old, node)
122 diff = differ.DiffProcessor(f_udiff).raw_diff() 122 diff = differ.DiffProcessor(f_udiff).raw_diff()
123 123
124 cs1 = filenode_old.last_changeset.raw_id 124 cs1 = filenode_old.last_changeset.short_id
125 cs2 = node.last_changeset.raw_id 125 cs2 = node.last_changeset.short_id
126 c.changes.append(('changed', node, diff, cs1, cs2)) 126 c.changes.append(('changed', node, diff, cs1, cs2))
127 127
128 response.content_type = 'text/plain' 128 response.content_type = 'text/plain'
129 if method == 'download': 129 if method == 'download':
130 response.content_disposition = 'attachment; filename=%s.patch' % revision 130 response.content_disposition = 'attachment; filename=%s.patch' % revision