From 05b376b95c618cba88e78c94e43e4e79742b70d8 Mon Sep 17 00:00:00 2001 From: mhagger Date: Thu, 27 May 2010 04:32:10 +0000 Subject: [PATCH] Use literals in "yield" statements to make output more transparent. git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@5124 be7e6eca-30d4-0310-a8e5-ac0d63af7087 --- cvs2svn_lib/rcs_stream.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cvs2svn_lib/rcs_stream.py b/cvs2svn_lib/rcs_stream.py index 5866d60c..e69fb2d1 100644 --- a/cvs2svn_lib/rcs_stream.py +++ b/cvs2svn_lib/rcs_stream.py @@ -92,7 +92,7 @@ def generate_blocks(numlines, diff): if input_pos < start: yield ('c', input_pos, start - input_pos, []) - yield (command, start, count, []) + yield ('d', start, count, []) input_pos = start + count else: # "a" - Add command @@ -107,7 +107,7 @@ def generate_blocks(numlines, diff): if input_pos < start: yield ('c', input_pos, start - input_pos, []) input_pos = start - yield (command, start, count, diff[i:i + count]) + yield ('a', start, count, diff[i:i + count]) i += count # Pass along the part of the input that follows all of the delta @@ -141,7 +141,7 @@ def reorder_blocks(blocks): for (command2, start2, count2, lines2) in i: if command1 == 'd' and command2 == 'a': - yield (command2, start2 - count1, count2, lines2) + yield ('a', start2 - count1, count2, lines2) else: yield (command1, start1, count1, lines1) (command1, start1, count1, lines1) = (command2, start2, count2, lines2) -- 2.11.4.GIT