зеркало из https://github.com/microsoft/git.git
gitweb: Use href(-replay=>1,...) for formats links in "commitdiff"
Use href(-replay->1,...) in (sub)navigation links (like changing style of view, or going to parent commit) so that extra options are preserved. This is needed so clicking on such (sub)navigation link would preserve style of diff; for example when using "side-by-side" diff style then going to parent commit would now also use this style. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
1e706eccd4
Коммит
d0e6e29ee6
|
@ -7267,8 +7267,8 @@ sub git_commitdiff {
|
|||
}
|
||||
}
|
||||
$formats_nav .= ': ' .
|
||||
$cgi->a({-href => href(action=>"commitdiff",
|
||||
hash=>$hash_parent)},
|
||||
$cgi->a({-href => href(-replay=>1,
|
||||
hash=>$hash_parent, hash_base=>undef)},
|
||||
esc_html($hash_parent_short)) .
|
||||
')';
|
||||
} elsif (!$co{'parent'}) {
|
||||
|
@ -7278,28 +7278,28 @@ sub git_commitdiff {
|
|||
# single parent commit
|
||||
$formats_nav .=
|
||||
' (parent: ' .
|
||||
$cgi->a({-href => href(action=>"commitdiff",
|
||||
hash=>$co{'parent'})},
|
||||
$cgi->a({-href => href(-replay=>1,
|
||||
hash=>$co{'parent'}, hash_base=>undef)},
|
||||
esc_html(substr($co{'parent'}, 0, 7))) .
|
||||
')';
|
||||
} else {
|
||||
# merge commit
|
||||
if ($hash_parent eq '--cc') {
|
||||
$formats_nav .= ' | ' .
|
||||
$cgi->a({-href => href(action=>"commitdiff",
|
||||
$cgi->a({-href => href(-replay=>1,
|
||||
hash=>$hash, hash_parent=>'-c')},
|
||||
'combined');
|
||||
} else { # $hash_parent eq '-c'
|
||||
$formats_nav .= ' | ' .
|
||||
$cgi->a({-href => href(action=>"commitdiff",
|
||||
$cgi->a({-href => href(-replay=>1,
|
||||
hash=>$hash, hash_parent=>'--cc')},
|
||||
'compact');
|
||||
}
|
||||
$formats_nav .=
|
||||
' (merge: ' .
|
||||
join(' ', map {
|
||||
$cgi->a({-href => href(action=>"commitdiff",
|
||||
hash=>$_)},
|
||||
$cgi->a({-href => href(-replay=>1,
|
||||
hash=>$_, hash_base=>undef)},
|
||||
esc_html(substr($_, 0, 7)));
|
||||
} @{$co{'parents'}} ) .
|
||||
')';
|
||||
|
|
Загрузка…
Ссылка в новой задаче