Explorar el Código

* empty log messages are now handled correctly
* better handling of trailing new lines in messages

git-svn-id: trunk@47 -

florian hace 20 años
padre
commit
34f32597a2
Se han modificado 1 ficheros con 11 adiciones y 4 borrados
  1. 11 4
      utils/svn2cl.pp

+ 11 - 4
utils/svn2cl.pp

@@ -56,11 +56,15 @@ begin
                     end
                   else if currentinfo.NodeName='msg' then
                     begin
-                      if currentinfo.haschildnodes and
-                        (currentinfo.firstchild is TDOMText) then
-                        currentmsg:=(currentinfo.firstchild as TDOMText).Data
+                      if currentinfo.haschildnodes then
+                        begin
+                          if (currentinfo.firstchild is TDOMText) then
+                            currentmsg:=(currentinfo.firstchild as TDOMText).Data
+                          else
+                            error('Malformed msg node');
+                        end
                       else
-                        error('Malformed msg node');
+                        currentmsg:='<empty log message>';
                     end
                   else if currentinfo.NodeName='date' then
                     begin
@@ -126,6 +130,9 @@ begin
                 end;
               if pathtemp<>'  ' then
                 writeln(pathtemp);
+              { truncate trailing new line }
+              while currentmsg[length(currentmsg)] in [#13,#10] do
+                delete(currentmsg,length(currentmsg),1);
               writeln;
               writeln('  ',currentmsg);
               writeln;