Mercurial > hg
changeset 36195:513d268eddfe
hgweb: show users recorded in obsolescence markers
It's useful to see who obsoleted a commit, because it's not always done by its
author (hg-committed is a good example, because people rebase stacks of commits
made by various people).
Usernames are obfuscated, but look correct (e.g. "test" is
"test").
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 14 Feb 2018 20:32:32 +0800 |
| parents | 39b3aab6231e |
| children | 1abf089a1d70 |
| files | mercurial/templates/gitweb/map mercurial/templates/monoblue/map mercurial/templates/paper/map mercurial/templates/spartan/map tests/test-obsolete.t |
| diffstat | 5 files changed, 14 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/templates/gitweb/map Wed Feb 14 14:12:05 2018 +0100 +++ b/mercurial/templates/gitweb/map Wed Feb 14 20:32:32 2018 +0800 @@ -275,7 +275,8 @@ obsfatesuccessors = '{if(successors, ' as ')}{successors%successorlink}' obsfateverb = '{obsfateverb(successors, markers)}' obsfateoperations = '{if(obsfateoperations(markers), ' using {join(obsfateoperations(markers), ', ')}')}' -obsfateentry = '{obsfateverb}{obsfateoperations}{obsfatesuccessors}' +obsfateusers = '{if(obsfateusers(markers), ' by {join(obsfateusers(markers)%'{user|obfuscate}', ', ')}')}' +obsfateentry = '{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}' shortlogentry = ' <tr class="parity{parity}"> <td class="age"><i class="age">{date|rfc822date}</i></td>
--- a/mercurial/templates/monoblue/map Wed Feb 14 14:12:05 2018 +0100 +++ b/mercurial/templates/monoblue/map Wed Feb 14 20:32:32 2018 +0800 @@ -233,7 +233,8 @@ obsfatesuccessors = '{if(successors, ' as ')}{successors%successorlink}' obsfateverb = '{obsfateverb(successors, markers)}' obsfateoperations = '{if(obsfateoperations(markers), ' using {join(obsfateoperations(markers), ', ')}')}' -obsfateentry = '{obsfateverb}{obsfateoperations}{obsfatesuccessors}' +obsfateusers = '{if(obsfateusers(markers), ' by {join(obsfateusers(markers)%'{user|obfuscate}', ', ')}')}' +obsfateentry = '{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}' shortlogentry = ' <tr class="parity{parity}"> <td class="nowrap age">{date|rfc822date}</td>
--- a/mercurial/templates/paper/map Wed Feb 14 14:12:05 2018 +0100 +++ b/mercurial/templates/paper/map Wed Feb 14 20:32:32 2018 +0800 @@ -213,7 +213,8 @@ obsfatesuccessors = '{if(successors, ' as ')}{successors%successorlink}' obsfateverb = '{obsfateverb(successors, markers)}' obsfateoperations = '{if(obsfateoperations(markers), ' using {join(obsfateoperations(markers), ', ')}')}' -obsfateentry = '{obsfateverb}{obsfateoperations}{obsfatesuccessors}' +obsfateusers = '{if(obsfateusers(markers), ' by {join(obsfateusers(markers)%'{user|obfuscate}', ', ')}')}' +obsfateentry = '{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}' filediffparent = ' <tr>
--- a/mercurial/templates/spartan/map Wed Feb 14 14:12:05 2018 +0100 +++ b/mercurial/templates/spartan/map Wed Feb 14 20:32:32 2018 +0800 @@ -170,7 +170,8 @@ obsfatesuccessors = '{if(successors, ' as ')}{successors%successorlink}' obsfateverb = '{obsfateverb(successors, markers)}' obsfateoperations = '{if(obsfateoperations(markers), ' using {join(obsfateoperations(markers), ', ')}')}' -obsfateentry = '{obsfateverb}{obsfateoperations}{obsfatesuccessors}' +obsfateusers = '{if(obsfateusers(markers), ' by {join(obsfateusers(markers)%'{user|obfuscate}', ', ')}')}' +obsfateentry = '{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}' filediffparent = ' <tr> <th class="parent">parent {rev}:</th>
--- a/tests/test-obsolete.t Wed Feb 14 14:12:05 2018 +0100 +++ b/tests/test-obsolete.t Wed Feb 14 20:32:32 2018 +0800 @@ -1050,19 +1050,19 @@ <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span> $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=spartan' | grep 'class="obsolete"' <th class="obsolete">obsolete:</th> - <td class="obsolete">pruned</td> + <td class="obsolete">pruned by test</td> check an obsolete changeset that has been rewritten $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=paper' | grep rewritten - <td>rewritten as <a href="/rev/3de5eca88c00?style=paper">3de5eca88c00</a> </td> + <td>rewritten as <a href="/rev/3de5eca88c00?style=paper">3de5eca88c00</a> by test <test@example.net></td> $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=coal' | grep rewritten - <td>rewritten as <a href="/rev/3de5eca88c00?style=coal">3de5eca88c00</a> </td> + <td>rewritten as <a href="/rev/3de5eca88c00?style=coal">3de5eca88c00</a> by test <test@example.net></td> $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=gitweb' | grep rewritten - <tr><td>obsolete</td><td>rewritten as <a class="list" href="/rev/3de5eca88c00?style=gitweb">3de5eca88c00</a> </td></tr> + <tr><td>obsolete</td><td>rewritten as <a class="list" href="/rev/3de5eca88c00?style=gitweb">3de5eca88c00</a> by test <test@example.net></td></tr> $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=monoblue' | grep rewritten - <dt>obsolete</dt><dd>rewritten as <a href="/rev/3de5eca88c00?style=monoblue">3de5eca88c00</a> </dd> + <dt>obsolete</dt><dd>rewritten as <a href="/rev/3de5eca88c00?style=monoblue">3de5eca88c00</a> by test <test@example.net></dd> $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=spartan' | grep rewritten - <td class="obsolete">rewritten as <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a> </td> + <td class="obsolete">rewritten as <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a> by test <test@example.net></td> check changeset with instabilities