Changeset 7261
- Timestamp:
- Jun 26, 2008, 6:24:34 PM (16 years ago)
- Location:
- sandbox/mercurial-plugin-0.12
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/mercurial-plugin-0.12/setup.py
r7245 r7261 9 9 description='Mercurial plugin for Trac 0.12', 10 10 keywords='trac scm plugin mercurial hg', 11 version='0.12.0. 2',11 version='0.12.0.3dev', 12 12 url=TracMercurial, 13 13 license='GPL', -
sandbox/mercurial-plugin-0.12/tracext/hg/backend.py
r7245 r7261 77 77 title=shorten_line(chgset.message), 78 78 href=context.href.changeset(rev, repos.reponame)) 79 if name == 'Parents' and len(revs) == 2: # merge 80 new = context.resource.id[1] 81 parent_links = [ 82 (link(rev), ' (', 83 tag.a('diff', title='Diff against this parent ' 84 '(show the changes merged from the other parents)', 85 href=context.href.changeset(new, repos.reponame, 86 old=rev)), ')') 87 for rev in revs] 88 return tag([(parent, ', ') for parent in parent_links[:-1]], 89 parent_links[-1], tag.br(), 90 tag.span('Note: this is a ', tag.strong('merge'), 91 ' changeset, the changes displayed below ' 92 ' correspond to the merge itself.', 93 class_='hint'), tag.br(), 94 # TODO: only keep chunks present in both parents 95 # (conflicts) or in none (extra changes) 96 # tag.span('No changes means the merge was clean.', 97 # class_='hint'), tag.br(), 98 tag.span('Use the ', tag.tt('(diff)'), 99 ' links above to see all the ' 100 'changes relative to each parent.', 101 class_='hint')) 79 102 return tag([tag(link(rev), ', ') for rev in revs[:-1]], 80 103 link(revs[-1]))
Note:
See TracChangeset
for help on using the changeset viewer.