1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510
|
package SVK::Command::Commit;
use strict;
use SVK::Version; our $VERSION = $SVK::VERSION;
use base qw( SVK::Command );
use constant opt_recursive => 1;
use SVK::XD;
use SVK::I18N;
use SVK::Editor::Status;
use SVK::Editor::Sign;
use SVK::Command::Sync;
use SVK::Util qw( HAS_SVN_MIRROR get_buffer_from_editor slurp_fh read_file
find_svm_source tmpfile abs2rel find_prev_copy from_native to_native
get_encoder );
use Class::Autouse qw( SVK::Editor::Rename SVK::Editor::Merge );
sub options {
('m|message=s' => 'message',
'F|file=s' => 'message_file',
'C|check-only' => 'check_only',
'S|sign' => 'sign',
'P|patch=s' => 'patch',
'import' => 'import',
'direct' => 'direct',
'template' => 'template',
);
}
sub parse_arg {
my ($self, @arg) = @_;
@arg = ('') if $#arg < 0;
return $self->arg_condensed (@arg);
}
sub lock { $_[0]->lock_coroot($_[1]) }
sub target_prompt {
loc('=== Targets to commit (you may delete items from it) ===');
}
sub message_prompt {
loc('=== Please enter your commit message above this line ===');
}
sub under_mirror {
my ($self, $target) = @_;
return if $self->{direct};
HAS_SVN_MIRROR and SVN::Mirror::is_mirrored ($target->{repos}, $target->{path});
}
sub fill_commit_message {
my $self = shift;
if ($self->{message_file}) {
die loc ("Can't use -F with -m.\n")
if defined $self->{message};
$self->{message} = read_file ($self->{message_file});
}
}
sub get_commit_message {
my ($self, $extra_message) = @_;
# The existence of $extra_message (the logs from a sm -l, say) should *not*
# prevent the editor from being opened, if there is no -m/-F
$self->fill_commit_message; # from -F to -m
# We have to decide whether or not to launch the editor *before* we append
# $extra_message to the -m/-F message
my $should_launch_editor = ($self->{template} or not defined $self->{message});
if (defined $extra_message or defined $self->{message}) {
$self->{message} = join "\n", grep { defined $_ and length $_ } ($self->{message}, $extra_message);
}
if ($should_launch_editor) {
$self->{message} = get_buffer_from_editor
(loc('log message'), $self->message_prompt,
join ("\n", $self->{message} || '', $self->message_prompt, ''), 'commit');
++$self->{save_message};
}
$self->decode_commit_message;
}
sub decode_commit_message {
my $self = shift;
eval { from_native ($self->{message}, 'commit message', $self->{encoding}); 1 }
or die $@.loc("try --encoding.\n");
}
# XXX: This should just return Editor::Dynamic objects
sub get_dynamic_editor {
my ($self, $target) = @_;
my $m = $self->under_mirror ($target);
my $anchor = $m ? $m->{target_path} : '/';
my ($storage, %cb) = $self->get_editor ($target->new (path => $anchor));
my $editor = SVK::Editor::Rename->new
( editor => $storage,
cb_exist => $self->{parent} ? $cb{cb_exist} : undef);
$editor->{_root_baton} = $editor->open_root ($cb{cb_rev}->(''));
return ($anchor, $editor);
}
sub finalize_dynamic_editor {
my ($self, $editor) = @_;
$editor->close_directory ($editor->{_root_baton});
$editor->close_edit;
delete $self->{save_message};
}
sub adjust_anchor {
my ($self, $editor) = @_;
$editor->adjust_anchor ($editor->{edit_tree}[0][-1]);
}
sub save_message {
my $self = shift;
return unless $self->{save_message};
local $@;
my ($fh, $file) = tmpfile ('commit', DIR => '', TEXT => 1, UNLINK => 0);
print $fh $self->{message};
print loc ("Commit message saved in %1.\n", $file);
}
# Return the editor according to copath, path, and is_mirror (path)
# It will be Editor::XD, repos_commit_editor, or svn::mirror merge back editor.
sub get_editor {
my ($self, $target, $callback, $source) = @_;
my ($editor, %cb);
# XXX: the case that the target is an xd is actually only used in merge.
if ($target->{copath}) {
my $xdroot = $target->root ($self->{xd});
($editor, %cb) = $self->{xd}->get_editor
( %$target,
# assuming the editor returned here are used with Editor::Merge
ignore_checksum => 1,
targets => undef,
quiet => 1,
oldroot => $xdroot,
newroot => $xdroot,
target => '',
check_only => $self->{check_only});
return ($editor, %cb);
}
my ($base_rev, $m, $mpath);
if (!$self->{direct} and HAS_SVN_MIRROR and
(($m, $mpath) = SVN::Mirror::is_mirrored ($target->{repos}, $target->{path}))) {
if ($self->{patch}) {
print loc("Patching locally against mirror source %1.\n", $m->{source});
$base_rev = $m->{fromrev};
}
elsif ($self->{check_only}) {
print loc("Checking locally against mirror source %1.\n", $m->{source});
}
else {
print loc("Merging back to mirror source %1.\n", $m->{source});
$m->{lock_message} = SVK::Command::Sync::lock_message ();
$m->{config} = $self->{svnconfig};
$m->{revprop} = ['svk:signature'];
($base_rev, $editor) = $m->get_merge_back_editor
($mpath, $self->{message},
sub { print loc("Merge back committed as revision %1.\n", $_[0]);
my $rev = shift;
$m->_new_ra->change_rev_prop ($rev, 'svk:signature',
$self->{signeditor}{sig})
if $self->{sign};
$m->run ($rev);
$callback->($m->find_local_rev ($rev), @_)
if $callback }
);
}
}
my $fs = $target->{repos}->fs;
my $yrev = $fs->youngest_rev;
my $root = $fs->revision_root ($yrev);
%cb = SVK::Editor::Merge->cb_for_root
($root, $target->{path}, defined $base_rev ? $base_rev : $yrev);
if ($self->{patch}) {
require SVK::Patch;
die loc ("Illegal patch name: %1.\n", $self->{patch})
if $self->{patch} =~ m!/!;
my $patch = SVK::Patch->new ($self->{patch}, $self->{xd},
$target->depotname, $source, $target->new (targets => undef));
$patch->ticket (SVK::Merge->new (xd => $self->{xd}), $source, $target)
if $source;
$patch->{log} = $self->{message};
my $fname = $self->{xd}->patch_file ($self->{patch});
if ($fname ne '-' && -e $fname) {
die loc ("file %1 already exists.\n", $fname).
($source ? loc ("use 'svk patch regen %1' instead.\n", $self->{patch}) : '');
}
return ($patch->commit_editor ($fname), %cb, callback => \$callback,
send_fulltext => 0);
}
$editor ||= $self->{check_only} ? SVN::Delta::Editor->new :
SVN::Delta::Editor->new
( $target->{repos}->get_commit_editor
( "file://$target->{repospath}",
$target->{path}, $ENV{USER}, $self->{message},
sub { print loc("Committed revision %1.\n", $_[0]);
$fs->change_rev_prop ($_[0], 'svk:signature',
$self->{signeditor}{sig})
if $self->{sign};
# build the copy cache as early as possible
find_prev_copy ($fs, $_[0]);
$callback->(@_) if $callback; }
));
if ($self->{sign}) {
my ($uuid, $dst) = find_svm_source ($target->{repos}, $target->{path});
$self->{signeditor} = $editor = SVK::Editor::Sign->new (_editor => [$editor],
anchor => "$uuid:$dst"
);
}
unless ($self->{check_only}) {
for ($SVN::Error::FS_TXN_OUT_OF_DATE,
$SVN::Error::FS_CONFLICT,
$SVN::Error::FS_ALREADY_EXISTS,
$SVN::Error::FS_NOT_DIRECTORY,
$SVN::Error::RA_DAV_REQUEST_FAILED,
) {
# XXX: this error should actually be clearer in the destructor of $editor.
$self->clear_handler ($_);
# XXX: there's no copath info here
$self->msg_handler ($_, $m ? "Please sync mirrored path $target->{path} first."
: "Please update checkout first.");
$self->add_handler ($_, sub { $editor->abort_edit });
}
$self->clear_handler ($SVN::Error::REPOS_HOOK_FAILURE);
$self->msg_handler($SVN::Error::REPOS_HOOK_FAILURE);
}
return ($editor, %cb, mirror => $m, callback => \$callback,
send_fulltext => !$m);
}
sub exclude_mirror {
my ($self, $target) = @_;
return () if $self->{direct} or !HAS_SVN_MIRROR;
( exclude => {
map { substr ($_, length($target->{path})) => 1 }
$target->contains_mirror },
);
}
sub get_committable {
my ($self, $target, $root) = @_;
my ($fh, $file);
$self->fill_commit_message;
if ($self->{template} or not defined $self->{message}) {
($fh, $file) = tmpfile ('commit', TEXT => 1, UNLINK => 0);
}
if ($fh) {
print $fh $self->{message} if $self->{template} and defined $self->{message};
print $fh "\n", $self->target_prompt, "\n";
}
my $targets = [];
my $encoder = get_encoder;
my $statuseditor = SVK::Editor::Status->new
( notify => SVK::Notify->new
( cb_flush => sub {
my ($path, $status) = @_;
to_native ($path, 'path', $encoder);
my $copath = $target->copath ($path);
push @$targets, [$status->[0] || ($status->[1] ? 'P' : ''),
$copath];
no warnings 'uninitialized';
print $fh sprintf ("%1s%1s%1s \%s\n", @{$status}[0..2], $copath) if $fh;
}));
$self->{xd}->checkout_delta
( %$target,
depth => $self->{recursive} ? undef : 0,
$self->exclude_mirror ($target),
xdroot => $root,
nodelay => 1,
delete_verbose => 1,
absent_ignore => 1,
editor => $statuseditor,
cb_conflict => \&SVK::Editor::Status::conflict,
);
my $conflicts = grep {$_->[0] eq 'C'} @$targets;
if ($#{$targets} < 0 || $conflicts) {
if ($fh) {
close $fh;
unlink $file;
}
die loc("No targets to commit.\n") if $#{$targets} < 0;
die loc("%*(%1,conflict) detected. Use 'svk resolved' after resolving them.\n", $conflicts);
}
if ($fh) {
close $fh;
# get_buffer_from_editor may modify it, so it must be a ref first
$target->{targets} ||= [];
($self->{message}, $targets) =
get_buffer_from_editor (loc('log message'), $self->target_prompt,
undef, $file, $target->{copath}, $target->{targets});
die loc("No targets to commit.\n") if $#{$targets} < 0;
++$self->{save_message};
unlink $file;
}
$self->decode_commit_message;
return [sort {$a->[1] cmp $b->[1]} @$targets];
}
sub committed_commit {
my ($self, $target, $targets) = @_;
my $fs = $target->{repos}->fs;
sub {
my $rev = shift;
my ($entry, $dataroot) = $self->{xd}{checkout}->get ($target->{copath});
my (undef, $coanchor) = $self->{xd}->find_repos ($entry->{depotpath});
my $oldroot = $fs->revision_root ($rev-1);
# optimize checkout map
for my $copath ($self->{xd}{checkout}->find ($dataroot, {revision => qr/.*/})) {
my $coinfo = $self->{xd}{checkout}->get ($copath);
next if $coinfo->{'.deleted'};
my $orev = eval { $oldroot->node_created_rev (abs2rel ($copath, $dataroot => $coanchor, '/')) };
defined $orev or next;
# XXX: cache the node_created_rev for entries within $target->path
next if $coinfo->{revision} < $orev;
$self->{xd}{checkout}->store_override ($copath, {revision => $rev});
}
# update checkout map with new revision
for (reverse @$targets) {
my ($action, $path) = @$_;
my $store = $self->{recursive} ? 'store_recursively' : 'store';
$self->{xd}{checkout}->$store ($path, { $self->_schedule_empty });
if (($action eq 'D') and $self->{xd}{checkout}->get ($path)->{revision} == $rev ) {
# Fully merged, remove the special node
$self->{xd}{checkout}->store (
$path, { revision => undef, $self->_schedule_empty }
);
}
else {
$self->{xd}{checkout}->store (
$path, {
revision => $rev,
($action eq 'D') ? ('.deleted' => 1) : (),
}
)
}
}
my $root = $fs->revision_root ($rev);
# update keyword-translated files
my $encoder = get_encoder;
for (@$targets) {
my ($action, $copath) = @$_;
next if $action eq 'D' || -d $copath;
my $path = $target->{path};
$path = '' if $path eq '/';
my $dpath = abs2rel($copath, $target->{copath} => $path, '/');
from_native ($dpath, 'path', $encoder);
my $prop = $root->node_proplist ($dpath);
my $layer = SVK::XD::get_keyword_layer ($root, $dpath, $prop);
my $eol = SVK::XD::get_eol_layer ($prop, '>');
# XXX: can't bypass eol translation when normalization needed
next unless $layer || ($eol ne ':raw' && $eol ne ' ');
my $fh = $root->file_contents ($dpath);
my $perm = (stat ($copath))[2];
open my ($newfh), ">$eol", $copath or die $!;
$layer->via ($newfh) if $layer;
slurp_fh ($fh, $newfh);
chmod ($perm, $copath);
}
}
}
sub committed_import {
my ($self, $copath) = @_;
sub {
my $rev = shift;
$self->{xd}{checkout}->store_recursively
($copath, {revision => $rev, $self->_schedule_empty});
}
}
sub run {
my ($self, $target) = @_;
my $is_mirrored = $self->under_mirror ($target) && !$self->{direct};
print loc("Commit into mirrored path: merging back directly.\n")
if $is_mirrored and !$self->{patch};
# XXX: should use some status editor to get the committed list for post-commit handling
# while printing the modified nodes.
my $xdroot = $target->root ($self->{xd});
my $committed;
if ($self->{import}) {
$self->get_commit_message () unless $self->{check_only};
$committed = $self->committed_import ($target->{copath});
}
else {
$committed = $self->committed_commit ($target, $self->get_committable ($target, $xdroot));
}
my ($editor, %cb) = $self->get_editor ($target->new (copath => undef), $committed);
die loc("unexpected error: commit to mirrored path but no mirror object")
if $is_mirrored and !($self->{direct} or $self->{patch} or $cb{mirror});
$self->run_delta ($target, $xdroot, $editor, %cb);
}
sub run_delta {
my ($self, $target, $xdroot, $editor, %cb) = @_;
my $fs = $target->{repos}->fs;
my %revcache;
$self->{xd}->checkout_delta
( %$target,
depth => $self->{recursive} ? undef : 0,
xdroot => $xdroot,
editor => $editor,
send_delta => !$cb{send_fulltext},
nodelay => $cb{send_fulltext},
$self->exclude_mirror ($target),
cb_exclude => sub { print loc ("%1 is a mirrored path, please commit separately.\n",
abs2rel ($_[1], $target->{copath} => $target->{report})) },
$self->{import} ?
( auto_add => 1,
obstruct_as_replace => 1,
absent_as_delete => 1) :
( absent_ignore => 1),
$cb{mirror} ?
( cb_copyfrom => sub {
my ($path, $rev) = @_;
$path =~ s|^\Q$cb{mirror}{target_path}\E|$cb{mirror}{source}|;
return ($path, scalar $cb{mirror}->find_remote_rev ($rev));
},
cb_rev => sub {
# XXX: the non-mirror cb_rev should be the same as
# this one, so codepaths are shared.
my $revtarget = shift;
my $cotarget = $target->copath ($revtarget);
$revtarget = $revtarget ? "$target->{path}/$revtarget" : $target->{path};
my ($entry, $schedule) = $self->{xd}->get_entry($cotarget);
# lookup the copy source rev for the case of
# open_directory inside add_directotry that has
# history. but shouldn't do that for replaced item,
# because the rev is used for delete_entry
my ($source_path, $source_rev) = $schedule ne 'replace' ? $self->{xd}->_copy_source ($entry, $cotarget) : ();
($source_path, $source_rev) = ($revtarget, $entry->{revision})
unless defined $source_path;
return $revcache{$source_rev} if exists $revcache{$source_rev};
my $rev = ($fs->revision_root ($source_rev)->node_history ($source_path)->prev (0)->location)[1];
$revcache{$source_rev} = $cb{mirror}->find_remote_rev ($rev);
}) : ());
delete $self->{save_message};
return;
}
sub DESTROY {
$_[0]->save_message;
}
1;
__DATA__
=head1 NAME
SVK::Command::Commit - Commit changes to depot
=head1 SYNOPSIS
commit [PATH...]
=head1 OPTIONS
--import : import mode; automatically add and delete nodes
-m [--message] MESSAGE : specify commit message MESSAGE
-F [--file] FILENAME : read commit message from FILENAME
--encoding ENC : treat -m/-F value as being in charset encoding ENC
--template : use the specified message as the template to edit
-P [--patch] NAME : instead of commit, save this change as a patch
-S [--sign] : sign this change
-C [--check-only] : try operation but make no changes
-N [--non-recursive] : operate on single directory only
--direct : commit directly even if the path is mirrored
=head1 AUTHORS
Chia-liang Kao E<lt>clkao@clkao.orgE<gt>
=head1 COPYRIGHT
Copyright 2003-2005 by Chia-liang Kao E<lt>clkao@clkao.orgE<gt>.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
See L<http://www.perl.com/perl/misc/Artistic.html>
=cut
|