Mercurial > kallithea
changeset 4375:04717653fe48
changeset: show and link to graft or transplant source
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 18 Jul 2014 19:22:01 +0200 |
| parents | 6eafa1e06d71 |
| children | 2ddd4fb23b4e |
| files | kallithea/lib/vcs/backends/git/changeset.py kallithea/lib/vcs/backends/hg/changeset.py kallithea/templates/changeset/changeset.html |
| diffstat | 3 files changed, 18 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/lib/vcs/backends/git/changeset.py Fri Jul 18 19:22:01 2014 +0200 +++ b/kallithea/lib/vcs/backends/git/changeset.py Fri Jul 18 19:22:01 2014 +0200 @@ -552,3 +552,5 @@ return [] return RemovedFileNodesGenerator([n for n in self._get_paths_for_status('deleted')], self) + + extra = {}
--- a/kallithea/lib/vcs/backends/hg/changeset.py Fri Jul 18 19:22:01 2014 +0200 +++ b/kallithea/lib/vcs/backends/hg/changeset.py Fri Jul 18 19:22:01 2014 +0200 @@ -384,3 +384,7 @@ Returns list of removed ``FileNode`` objects. """ return RemovedFileNodesGenerator([n for n in self.status[2]], self) + + @LazyProperty + def extra(self): + return self._ctx.extra()
--- a/kallithea/templates/changeset/changeset.html Fri Jul 18 19:22:01 2014 +0200 +++ b/kallithea/templates/changeset/changeset.html Fri Jul 18 19:22:01 2014 +0200 @@ -116,6 +116,18 @@ <span><b>${h.person(c.changeset.author,'username_and_name')}</b> - ${h.age(c.changeset.date,True)} ${h.fmt_date(c.changeset.date)}</span><br/> <span>${h.email_or_none(c.changeset.author)}</span><br/> </div> + <% rev = c.changeset.extra.get('source') %> + %if rev: + <div> + ${_('Grafted from:')} ${h.link_to(h.short_id(rev),h.url('changeset_home',repo_name=c.repo_name,revision=rev))} + </div> + %endif + <% rev = c.changeset.extra.get('transplant_source', '').encode('hex') %> + %if rev: + <div> + ${_('Transplanted from:')} ${h.link_to(h.short_id(rev),h.url('changeset_home',repo_name=c.repo_name,revision=rev))} + </div> + %endif <div class="message">${h.urlify_commit(c.changeset.message, c.repo_name)}</div> </div> </div>