Fix various typos and problems.
This commit is contained in:
parent
0fd3c3256d
commit
0eaae363eb
1 changed files with 8 additions and 8 deletions
|
@ -160,10 +160,10 @@ END_ICAL
|
|||
ELISP_END
|
||||
;
|
||||
$elispFH->close();
|
||||
my @emacsOutput = read_from_process($emacsBinary, '--no-windows',
|
||||
my @emacsOutput = read_from_process($config->{emacsBinary}, '--no-windows',
|
||||
'--batch', '--no-site-file', '-l', $elispFile);
|
||||
DieLog("Emacs process for exporting $privateCalendarFile and " .
|
||||
"$publicCalendarFile exited with non-zero exit status of " .
|
||||
DieLog("Emacs process for importing $veventFile and " .
|
||||
"$config->{proposedDiary} exited with non-zero exit status of " .
|
||||
"$? ($!), and output of:\n " . join("\n ", @emacsOutput))
|
||||
if ($? != 0);
|
||||
my $goodCount =0;
|
||||
|
@ -183,14 +183,14 @@ sub HandleProposal ($$$) {
|
|||
ParseEventAndAddProposed($config, $file, "PROPOSED CHANGE");
|
||||
} elsif ($operation eq 'D') {
|
||||
chdir $config->{gitDir} or DieLog("Unable to change directory to $config->{gitDir}");
|
||||
system($emacsSettings->{gitBinary}, 'checkout', $config->{myBranch});
|
||||
system($config->{gitBinary}, 'checkout', $config->{myBranch});
|
||||
DieLog("Unable to checkout $config->{myBranch} branch in git") unless ($? == 0);
|
||||
|
||||
ParseEventAndAddProposed($config, $file, "PROPOSED DELETE");
|
||||
|
||||
# Now, reset back to incoming branch, as GenerateDiaryFromNewEvents assumes that.
|
||||
chdir $config->{gitDir} or DieLog("Unable to change directory to $config->{gitDir}");
|
||||
system($emacsSettings->{gitBinary}, 'checkout', $config->{incomingBranch});
|
||||
system($config->{gitBinary}, 'checkout', $config->{incomingBranch});
|
||||
DieLog("Unable to checkout $config->{incomingBranch} branch in git") unless ($? == 0);
|
||||
} else {
|
||||
DieLog("Invalid operation of $operation for $file");
|
||||
|
@ -202,13 +202,13 @@ sub GenerateDiaryFromNewEvents ($) {
|
|||
|
||||
chdir $config->{gitDir} or DieLog("Unable to change directory to $config->{gitDir}");
|
||||
|
||||
system($emacsSettings->{gitBinary}, 'checkout', $config->{incomingBranch});
|
||||
system($config->{gitBinary}, 'checkout', $config->{incomingBranch});
|
||||
DieLog("Unable to checkout $config->{incomingBranch} branch in git") unless ($? == 0);
|
||||
my @gitDiffSummaryOutput =
|
||||
read_from_process($emacsSettings->{gitBinary}, 'diff-index', $config->{myBranch});
|
||||
read_from_process($config->{gitBinary}, 'diff-index', $config->{myBranch});
|
||||
|
||||
foreach my $line (@gitDiffSummaryOutput) {
|
||||
next if $line ~= /$ENV{USER}/; # Ignore lines that aren't for my calendar.
|
||||
next if $line =~ /$ENV{USER}/; # Ignore lines that aren't for my calendar.
|
||||
DieLog("odd line in diff-index output: $line") unless
|
||||
$line =~ /(A|D|M)\s+(\S+)$/;
|
||||
my($operation, $file) = ($1, $2);
|
||||
|
|
Loading…
Add table
Reference in a new issue