Merge lp:~adam-buchbinder/ubuntu/lucid/vim/vim-large-file-recovery into lp:ubuntu/lucid/vim

[Adam Buchbinder]

vim (2:7.2.330-1ubuntu2.1) lucid-proposed; urgency=low

  * Backported upstream patch 7.3.216 (LP: #1059085):
    - src/memline.c: Avoid corruption on large-file recovery.
    - src/testdir/test70.in, src/testdir/test70.ok:
      Test large-file recovery.
    - src/testdir/Makefile, src/testdir/Make_amiga.mak,
      src/testdir/Make_dos.mak, src/testdir/Make_os2.mak,
      src/testdir/Make_vms.mms: Update Makefiles to include new tests.

 -- Adam Buchbinder <email address hidden> Sun, 30 Sep 2012 10:44:38 -0400

[Jamie Strandboge (jdstrand)]

Thanks for your patch! In general it looks ok, but the changelog lacks the origins of the patch, which makes it difficult to review the patch against upstream. Normally we would use DEP-3 comments in the patch in debian/patches itself, but because vim on Ubuntu 10.04 LTS does not use a patch system, this information should be included in the debian/changelog. Can you resubmit with this information? Thanks!

review: Needs Fixing

[Adam Buchbinder (adam-buchbinder)]

Googling "vim 7.3.216", the first link is the upstream patch. I'll add a link to the Groups post.

[lp:~adam-buchbinder/ubuntu/lucid/vim/vim-large-file-recovery]

59. By Adam Buchbinder on 2012-10-15

Backported upstream patch 7.3.216 from
https://groups.google.com/d/topic/vim_dev/lTos-bGcNgU/discussion
(LP: #1059085):

[Adam Buchbinder (adam-buchbinder)]

Is that a better description?

review: Resubmit

[Marc Deslauriers (mdeslaur)]

Looks good. ACK. Uploading to lucid-proposed for processing by the SRU team.

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-08 22:08:26 +0000
+++ debian/changelog	2012-10-15 21:11:20 +0000
@@ -1,3 +1,17 @@
+vim (2:7.2.330-1ubuntu2.1) lucid-proposed; urgency=low
+
+  * Backported upstream patch 7.3.216 from
+    https://groups.google.com/d/topic/vim_dev/lTos-bGcNgU/discussion
+    (LP: #1059085):
+    - src/memline.c: Avoid corruption on large-file recovery.
+    - src/testdir/test70.in, src/testdir/test70.ok:
+      Test large-file recovery.
+    - src/testdir/Makefile, src/testdir/Make_amiga.mak,
+      src/testdir/Make_dos.mak, src/testdir/Make_os2.mak,
+      src/testdir/Make_vms.mms: Update Makefiles to include new tests.
+
+ -- Adam Buchbinder <[e-mail]>  Sun, 30 Sep 2012 10:44:38 -0400
+
 vim (2:7.2.330-1ubuntu2) lucid; urgency=low
 
   * debian/rules: Temporarily disable parallel building until we figure out

=== modified file 'src/memline.c'
--- src/memline.c	2010-03-07 10:46:34 +0000
+++ src/memline.c	2012-10-15 21:11:20 +0000
@@ -1236,6 +1236,7 @@
 		    bnum = pp->pb_pointer[idx].pe_bnum;
 		    line_count = pp->pb_pointer[idx].pe_line_count;
 		    page_count = pp->pb_pointer[idx].pe_page_count;
+		    idx = 0;
 		    continue;
 		}
 	    }

=== modified file 'src/testdir/Make_amiga.mak'
--- src/testdir/Make_amiga.mak	2010-03-07 10:46:34 +0000
+++ src/testdir/Make_amiga.mak	2012-10-15 21:11:20 +0000
@@ -26,7 +26,7 @@
 		test48.out test51.out test53.out test54.out test55.out \
 		test56.out test57.out test58.out test59.out test60.out \
 		test61.out test62.out test63.out test64.out test65.out \
-		test66.out test67.out test68.out test69.out
+		test66.out test67.out test68.out test69.out test70.out
 
 .SUFFIXES: .in .out
 
@@ -115,3 +115,4 @@
 test67.out: test67.in
 test68.out: test68.in
 test69.out: test69.in
+test70.out: test70.in

=== modified file 'src/testdir/Make_dos.mak'
--- src/testdir/Make_dos.mak	2010-03-07 10:46:34 +0000
+++ src/testdir/Make_dos.mak	2012-10-15 21:11:20 +0000
@@ -27,7 +27,7 @@
 		test30.out test31.out test32.out test33.out test34.out \
 		test37.out test38.out test39.out test40.out test41.out \
 		test42.out test52.out test65.out test66.out test67.out \
-		test68.out test69.out
+		test68.out test69.out test70.out
 
 SCRIPTS32 =	test50.out
 

=== modified file 'src/testdir/Make_ming.mak'
--- src/testdir/Make_ming.mak	2010-03-07 10:46:34 +0000
+++ src/testdir/Make_ming.mak	2012-10-15 21:11:20 +0000
@@ -46,7 +46,7 @@
 		test30.out test31.out test32.out test33.out test34.out \
 		test37.out test38.out test39.out test40.out test41.out \
 		test42.out test52.out test65.out test66.out test67.out \
-		test68.out test69.out
+		test68.out test69.out test70.out
 
 SCRIPTS32 =	test50.out
 

=== modified file 'src/testdir/Make_vms.mms'
--- src/testdir/Make_vms.mms	2010-03-07 10:46:34 +0000
+++ src/testdir/Make_vms.mms	2012-10-15 21:11:20 +0000
@@ -69,7 +69,7 @@
 	 test48.out test51.out test53.out test54.out test55.out \
 	 test56.out test57.out test60.out \
 	 test61.out test62.out test63.out test64.out test65.out \
-	 test66.out test67.out test68.out test69.out
+	 test66.out test67.out test68.out test69.out test70.out
 
 .IFDEF WANT_GUI
 SCRIPT_GUI = test16.out

=== modified file 'src/testdir/Makefile'
--- src/testdir/Makefile	2010-03-07 10:46:34 +0000
+++ src/testdir/Makefile	2012-10-15 21:11:20 +0000
@@ -23,7 +23,7 @@
 		test54.out test55.out test56.out test57.out test58.out \
 		test59.out test60.out test61.out test62.out test63.out \
 		test64.out test65.out test66.out test67.out test68.out \
-		test69.out
+		test69.out test70.out
 
 SCRIPTS_GUI = test16.out
 

=== added file 'src/testdir/test70.in'
--- src/testdir/test70.in	1970-01-01 00:00:00 +0000
+++ src/testdir/test70.in	2012-10-15 21:11:20 +0000
@@ -0,0 +1,46 @@
+Inserts 10000 lines with text to fill the swap file with two levels of pointer
+blocks.  Then recovers from the swap file and checks all text is restored.
+
+We need about 10000 lines of 100 characters to get two levels of pointer
+blocks.
+
+STARTTEST
+:so small.vim
+:set nocp fileformat=unix undolevels=-1
+:e! Xtest
+ggdG
+:let text = "\tabcdefghijklmnoparstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnoparstuvwxyz0123456789"
+:let i = 1
+:let linecount = 10000
+:while i <= linecount | call append(i - 1, i . text) | let i += 1 | endwhile
+:preserve
+:" get the name of the swap file
+:redir => swapname
+:swapname
+:redir END
+:let swapname = substitute(swapname, '[[:blank:][:cntrl:]]*\(.\{-}\)[[:blank:][:cntrl:]]*$', '\1', '')
+:" make a copy of the swap file in Xswap
+:set bin
+:exe 'sp ' . swapname
+:w! Xswap
+:echo swapname
+:set nobin
+:new
+:only!
+:bwipe! Xtest
+:call rename('Xswap', swapname)
+:recover Xtest
+:call delete(swapname)
+:new
+:call append(0, 'recovery start')
+:wincmd w
+:let linedollar = line('$')
+:if linedollar < linecount | exe 'wincmd w' | call append(line('$'), "expected " . linecount . " lines but found only " . linedollar) | exe 'wincmd w' | let linecount = linedollar | endif
+:let i = 1
+:while i <= linecount | if getline(i) != i . text | exe 'wincmd w' | call append(line('$'), i . ' differs') | exe 'wincmd w' | endif | let i += 1 | endwhile
+:q!
+:call append(line('$'), 'recovery end')
+:w! test.out
+:qa!
+ENDTEST
+

=== added file 'src/testdir/test70.ok'
--- src/testdir/test70.ok	1970-01-01 00:00:00 +0000
+++ src/testdir/test70.ok	2012-10-15 21:11:20 +0000
@@ -0,0 +1,3 @@
+recovery start
+
+recovery end