Skip to content

Commit ac1dbed

Browse files
committed
[commit-patch] Whitespace.
1 parent 60f8fb0 commit ac1dbed

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

commit-patch

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -197,24 +197,24 @@ die "No files in patch" unless scalar @files;
197197
#print "Found $vc{name} in $repo\n";
198198
#printf("files: %s\n", join(",", @files));
199199

200-
for my $f (@files) {
201-
run ["cp", "-f", $f, "$f.orig.$$"] or die "couldn't make backup of $f: $!" if -f $f;
202-
$clean{"$f.orig.$$"} = $f;
203-
}
204-
$SIG{PIPE} = $SIG{INT} = $SIG{QUIT} = sub { clean(); print "Cleanly aborted\n"; };
205-
206-
$clean{"working.patch.$$"} = $clean{"non_committed.patch.$$"} = undef;
207-
208-
my ($out,$non_committed_patch);
209-
run([split(/ /,$vc{add}), @files], '>', \$out, '2>', \$err);# Expect these 2 to fail when
210-
run([split(/ /,$vc{remove}), @files], '>', \$out, '2>', \$err);# there are no new files.
211-
run([split(/ /,$vc{diff}), @files], '>', "working.patch.$$", '2>', \$err);# CVS diff dies. Sigh. or die "$err\n";
212-
run(["interdiff", $vc{patcharg}, $patch, "working.patch.$$"], '>', "non_committed.patch.$$", '2>', \$err) or die "$err\n";
213-
run(["patch", $vc{patcharg}, "-R"], '<', "working.patch.$$", '>', \$out, '2>', \$err) or die "$out\n$err\n";
214-
run(["patch", $vc{patcharg}], '<', $patch, '>', \$out, '2>', \$err) or die "$out\n$err\n";
215-
# Don't capture stdout or stderr because it can be interactive (cough cough darcs)
216-
run([split(/ /,$vc_commit), @message_opt, @files],debug => 0) or die "commit failed.\n";
217-
run(["patch", $vc{patcharg}], '<', "non_committed.patch.$$", '>', \$out, '2>', \$err) or die "$out\n$err\n";
200+
for my $f (@files) {
201+
run ["cp", "-f", $f, "$f.orig.$$"] or die "couldn't make backup of $f: $!" if -f $f;
202+
$clean{"$f.orig.$$"} = $f;
203+
}
204+
$SIG{PIPE} = $SIG{INT} = $SIG{QUIT} = sub { clean(); print "Cleanly aborted\n"; };
205+
206+
$clean{"working.patch.$$"} = $clean{"non_committed.patch.$$"} = undef;
207+
208+
my ($out,$non_committed_patch);
209+
run([split(/ /,$vc{add}), @files], '>', \$out, '2>', \$err);# Expect these 2 to fail when
210+
run([split(/ /,$vc{remove}), @files], '>', \$out, '2>', \$err);# there are no new files.
211+
run([split(/ /,$vc{diff}), @files], '>', "working.patch.$$", '2>', \$err);# CVS diff dies. Sigh. or die "$err\n";
212+
run(["interdiff", $vc{patcharg}, $patch, "working.patch.$$"], '>', "non_committed.patch.$$", '2>', \$err) or die "$err\n";
213+
run(["patch", $vc{patcharg}, "-R"], '<', "working.patch.$$", '>', \$out, '2>', \$err) or die "$out\n$err\n";
214+
run(["patch", $vc{patcharg}], '<', $patch, '>', \$out, '2>', \$err) or die "$out\n$err\n";
215+
# Don't capture stdout or stderr because it can be interactive (cough cough darcs)
216+
run([split(/ /,$vc_commit), @message_opt, @files],debug => 0) or die "commit failed.\n";
217+
run(["patch", $vc{patcharg}], '<', "non_committed.patch.$$", '>', \$out, '2>', \$err) or die "$out\n$err\n";
218218

219219
END {
220220
return if $dry_run;

0 commit comments

Comments
 (0)