Re: [RFCv3 2/2] gitweb: links to patch action in commitdiff and shortlog view

From: Jakub Narebski <jnareb@gmail.com>
Date: Dec 6, 2008, 00:53 UTC
Message-ID: <200812060153.52947.jnareb@gmail.com>
In-Reply-To: <1228345188-15125-3-git-send-email-giuseppe.bilotta@gmail.com>

On Wed, 3 Dec 2008, Giuseppe Bilotta wrote:

Show 36 quoted lines

> In shortlog view, a link to the patchset is only offered when the number
> of commits shown is less than the allowed maximum number of patches.
> 
> Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
> ---
>  gitweb/gitweb.perl |   18 ++++++++++++++++++
>  1 files changed, 18 insertions(+), 0 deletions(-)
> 
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index c9abfcf..ec8fc7d 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -5083,6 +5083,11 @@ sub git_commit {
>  			} @$parents ) .
>  			')';
>  	}
> +	if (gitweb_check_feature('patches')) {
> +		$formats_nav .= " | " .
> +			$cgi->a({-href => href(action=>"patch", -replay=>1)},
> +				"patch");
> +	}
>  
>  	if (!defined $parent) {
>  		$parent = "--root";
> @@ -5415,6 +5420,11 @@ sub git_commitdiff {
>  		$formats_nav =
>  			$cgi->a({-href => href(action=>"commitdiff_plain", -replay=>1)},
>  			        "raw");
> +		if ($patch_max) {
> +			$formats_nav .= " | " .
> +				$cgi->a({-href => href(action=>"patch", -replay=>1)},
> +					"patch");
> +		}
>  
>  		if (defined $hash_parent &&
>  		    $hash_parent ne '-c' && $hash_parent ne '--cc') {

In the above two hunks 'patch' view functions as "git show --pretty=email" text/plain equivalent, but this duplicates a bit 'commitdiff_plain' functionality. Well, 'commitdiff_plain' has currently some errors, but...

Show 12 quoted lines

> @@ -5949,6 +5959,14 @@ sub git_shortlog {
>  			$cgi->a({-href => href(-replay=>1, page=>$page+1),
>  			         -accesskey => "n", -title => "Alt-n"}, "next");
>  	}
> +	my $patch_max = gitweb_check_feature('patches');
> +	if ($patch_max) {
> +		if ($patch_max < 0 || @commitlist <= $patch_max) {
> +			$paging_nav .= " &sdot; " .
> +				$cgi->a({-href => href(action=>"patch", -replay=>1)},
> +					@commitlist > 1 ? "patchset" : "patch");
> +		}
> +	}

Here 'patch' view functions as "git format-patch", able to be downloaded and fed to git-am. Perhaps the action should also be named 'patches' here?; it could lead to the same function.

By the way, there is subtle bug in above link. If shortlog view is less than $patch_max commits long, but it is because the history for a given branch (or starting from given commit) is so short, and not because there is cutoff $hash_parent set, the 'patchset' view wouldn't display plain text equivalent view, but only patch for top commit.

I assume that the link is only for 'shortlog' view, and not also for 'log' and 'history' views because 'shortlog' is the only log-like view which support $hash_parent?

Show 7 quoted lines

>  
>  	git_header_html();
>  	git_print_page_nav('shortlog','', $hash,$hash,$hash, $paging_nav);
> -- 
> 1.5.6.5
> 
>

-- 
Jakub Narebski
Poland