[svk-devel] Review log message when push'ing to mirror

[Jesse Vincent]

On Oct 15, 2007, at 7:03 PM, John Peacock wrote:

> Jesse Vincent wrote:
>> This is basically non -m '' for push right? Another line of doc  
>> would be great, then I'll apply it ;)
>
> Is the attached enough documentation?  I was trying to figure out  
> how to add this to 'svk smerge' as well (since push is just a  
> wrapper), but it was slightly messier.  If you want, I can take  
> another stab at it (and write better docs)...
>

"combined log" doesn't make a whole lot of sense there. (Given that  
the question I proxied was from clkao based on the patch, I suspect a  
slightly more descriptive help string would be good.

> John
> === lib/SVK/Command/Merge.pm
> ==================================================================
> --- lib/SVK/Command/Merge.pm	(revision 2544)
> +++ lib/SVK/Command/Merge.pm	(local)
> @@ -238,6 +238,10 @@
>  	}
>      }
>      else {
> +	if ( $self->{review_message} ) {
> +	    $self->{template} = 1;
> +	    $self->get_commit_message('');
> +	}
>  	$merge->run ($self->get_editor ($dst, undef, $self->{auto} ?  
> $src : undef));
>  	delete $self->{save_message};
>      }
> === lib/SVK/Command/Push.pm
> ==================================================================
> --- lib/SVK/Command/Push.pm	(revision 2544)
> +++ lib/SVK/Command/Push.pm	(local)
> @@ -63,6 +63,7 @@
>       'S|sign'	        => 'sign',
>       'P|patch=s'        => 'patch',
>       'verbatim'		=> 'verbatim',
> +     'review-message'	=> 'review_message',
>      );
>  }
>
> @@ -78,7 +79,7 @@
>
>      # "svk push -P" has the same effect as "svk push -l",
>      # because incremental patches is not yet implemented.
> -    if ($self->{lump} or $self->{patch}) {
> +    if ($self->{review_message} or $self->{lump} or $self->{patch}) {
>          $self->{log}++;
>          $self->{message} = '';
>          delete $self->{incremental};
> @@ -110,6 +111,7 @@
>   -P [--patch] NAME      : instead of commit, save this change as a  
> patch
>   -S [--sign]            : sign this change
>   --verbatim             : verbatim merge log without indents and  
> header
> + --review-message       : edit the combined log before committing
>
>  =head1 DESCRIPTION
>
> _______________________________________________
> svk-devel mailing list
> svk-devel at bestpractical.com
> http://lists.bestpractical.com/cgi-bin/mailman/listinfo/svk-devel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 186 bytes
Desc: This is a digitally signed message part
Url : http://lists.bestpractical.com/pipermail/svk-devel/attachments/20071016/4ed86eb2/PGP-0001.pgp