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
|
package SVK::Command::Cmerge;
use strict;
use SVK::Version; our $VERSION = $SVK::VERSION;
use base qw( SVK::Command::Merge SVK::Command::Copy SVK::Command::Propset );
use SVK::XD;
use SVK::I18N;
use SVK::Editor::Combine;
sub options {
($_[0]->SUPER::options);
}
sub parse_arg {
my $self = shift;
$self->SVK::Command::Merge::parse_arg (@_);
}
sub lock {
my $self = shift;
$self->SVK::Command::Merge::lock (@_);
}
sub run {
my ($self, $src, $dst) = @_;
# XXX: support checkonly
if ($0 =~ /svk$/) {
# Only warn about deprecation if the user is running svk.
# (Don't warn when running tests)
print loc("%1 cmerge is deprecated, pending improvements to the Subversion API",$0) ."\n";
print loc("'Use %1 merge -c' to obtain similar functionality.",$0)."\n\n";
}
my @revlist = $self->parse_revlist;
my $repos = $src->{repos};
my $fs = $repos->fs;
my $base = SVK::Merge->auto (%$self, repos => $repos, src => $src, dst => $dst,
ticket => 1)->{base};
# find a branch target
die loc("cannot find a path for temporary branch")
if $base->{path} eq '/';
my $tmpbranch = "$src->{path}-merge-$$";
$self->command (copy =>
{ message => "preparing for cherry picking merging" }
)->run ($base => $src->new (path => $tmpbranch))
unless $self->{check_only};
my $ceditor = SVK::Editor::Combine->new(tgt_anchor => $base->{path},
#$check_only ? $base_path : $tmpbranch,
base_root => $base->root,
pool => SVN::Pool->new,
);
my $spool = SVN::Pool->new_default;
for (@revlist) {
my ($fromrev, $torev) = @$_;
print loc("Merging with base %1 %2: applying %3 %4:%5.\n",
@{$base}{qw/path revision/}, $src->{path}, $fromrev, $torev);
SVK::Merge->new (%$self, repos => $repos,
base => $src->new (revision => $fromrev),
src => $src->new (revision => $torev), dst => $dst,
)->run ($ceditor, $ceditor->callbacks,
# XXX: should be base_root's rev?
cb_rev => sub { $fs->youngest_rev });
$spool->clear;
}
$ceditor->replay (SVN::Delta::Editor->new
(_debug => 0,
_editor => [ $repos->get_commit_editor
("file://$src->{repospath}",
$tmpbranch,
$ENV{USER}, "merge $self->{chgspec} from $src->{path}",
sub { print loc("Committed revision %1.\n", $_[0]) })
]),
$fs->youngest_rev);
my $newrev = $fs->youngest_rev;
my $uuid = $fs->get_uuid;
# give ticket to src
my $ticket = SVK::Merge->new (xd => $self->{xd})->
find_merge_sources ($src->new (revision => $newrev), 1, 1);
$ticket->{"$uuid:$tmpbranch"} = $newrev;
unless ($self->{check_only}) {
my $oldmessage = $self->{message};
$self->{message} = "cherry picking merge $self->{chgspec} to $dst->{path}";
$self->do_propset_direct ($src, 'svk:merge',
join ("\n", map {"$_:$ticket->{$_}"} sort keys %$ticket));
$self->{message} = $oldmessage;
}
my ($depot) = $self->{xd}->find_depotname ($src->{depotpath});
++$self->{auto};
$self->SUPER::run ($src->new (path => $tmpbranch,
depotpath => "/$depot$tmpbranch",
revision => $fs->youngest_rev),
$dst);
return;
}
1;
__DATA__
=head1 NAME
SVK::Command::Cmerge - Merge specific changes
=head1 SYNOPSIS
This command is currently deprecated, pending improvements to the
Subversion API. In the meantime, use C<svk merge -c> to obtain
similar functionality.
cmerge -c CHGSPEC DEPOTPATH [PATH]
cmerge -c CHGSPEC DEPOTPATH1 DEPOTPATH2
=head1 OPTIONS
-c [--change] REV : act on comma-separated revisions REV
-l [--log] : use logs of merged revisions as commit message
-r [--revision] N:M : act on revisions between N and M
-a [--auto] : merge from the previous merge point
--verbatim : verbatim merge log without indents and header
--no-ticket : do not record this merge point
-m [--message] MESSAGE : specify commit message MESSAGE
-F [--file] FILENAME : read commit message from FILENAME
--template : use the specified message as the template to edit
--encoding ENC : treat -m/-F value as being in charset encoding ENC
-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
--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
|
