[master] qdiff: crashes with "IndexError: pop from empty list"

[mkluwe]

The branch consists of a single file with some changes. I have attached the crash file and the branch.

This is the traceback:

Traceback:
 Traceback (most recent call last):
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/qbzr/lib/trace.py", line 286, in reports_exception_decorate
     return f(*args, **kargs)
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/qbzr/lib/diffwindow.py", line 206, in initial_load
     self.load_diff()
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/qbzr/lib/diffwindow.py", line 367, in load_diff
     data, properties_changed)
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/qbzr/lib/diffview.py", line 431, in append_diff
     insertIxsWithChangesHighlighted(ixs)
   File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/qbzr/lib/diffview.py", line 380, in insertIxsWithChangesHighlighted
     tag, n = g.pop(0)
 IndexError: pop from empty list

[Craig Hewetson (craighewetson-deactivatedaccount)]

I got this when I did qdiff <dir> where <dir> had 3 files that where modified.

[Jeremy Yoder (jyoder)]

Just saw what appears to be the same error in bzr 2.2.1:

bzr: ERROR: exceptions.IndexError: pop from empty list

Traceback (most recent call last):
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\trace.py", line 300, in reports_exception_decorate
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\diffwindow.py", line 235, in initial_load
  File "bzrlib\cleanup.pyo", line 131, in run
  File "bzrlib\cleanup.pyo", line 165, in _do_with_cleanups
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\diffwindow.py", line 248, in _initial_load
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\diffwindow.py", line 404, in load_diff
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\diffview.py", line 435, in append_diff
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\diffview.py", line 384, in insertIxsWithChangesHighlighted
IndexError: pop from empty list

bzr 2.2.1 on python 2.6.4 (win32)
arguments: ['C:\\Program Files\\Bazaar\\tbzrcommand.exe', '--command=log', '--file=C:\\workdir\\foo.cxx']
encoding: 'cp1252', fsenc: 'mbcs', lang: None

Further details:
The file in question had \r\n line endings in a few spots (not everywhere), so I removed the \r's from everywhere in the file. After that, any attempt to diff the version before \r removal with the new version results in this error. Annotate works fine, for what that's worth.

[Matthäus G. Chajdas (anteru)]

Getting the same. The diff in question is:
=== modified file 'niven/Core/inc/math/Vector.h'
--- niven/Core/inc/math/Vector.h 2011-04-05 12:47:42 +0000
+++ niven/Core/inc/math/Vector.h 2011-04-11 14:57:45 +0000
@@ -405,5 +405,5 @@
  typedef Vector<int, 3> Vector3i;
  typedef Vector<int, 4> Vector4i;
 }
-
+
 #endif

(from bzr diff) while bzr chokes with

bzr: ERROR: exceptions.IndexError: pop from empty list

Traceback (most recent call last):
  File "C:/Program Files (x86)/Bazaar/plugins\qbzr\lib\trace.py", line 321, in reports_exception_decorate
  File "C:/Program Files (x86)/Bazaar/plugins\qbzr\lib\diffwindow.py", line 235, in initial_load
  File "bzrlib\cleanup.pyo", line 131, in run
  File "bzrlib\cleanup.pyo", line 165, in _do_with_cleanups
  File "C:/Program Files (x86)/Bazaar/plugins\qbzr\lib\diffwindow.py", line 248, in _initial_load
  File "C:/Program Files (x86)/Bazaar/plugins\qbzr\lib\diffwindow.py", line 404, in load_diff
  File "C:/Program Files (x86)/Bazaar/plugins\qbzr\lib\diffview.py", line 434, in append_diff
  File "C:/Program Files (x86)/Bazaar/plugins\qbzr\lib\diffview.py", line 383, in insertIxsWithChangesHighlighted
IndexError: pop from empty list

bzr 2.3.0 on python 2.6.6 (win32)
arguments: ['C:\\Program Files (x86)\\Bazaar\\bzrw.exe', 'qcommit', '--ui-mode']
encoding: 'cp1252', fsenc: 'mbcs', lang: None
plugins:
  bzrtools C:\Program Files (x86)\Bazaar\plugins\bzrtools [2.3.1]
  colo C:\Program Files (x86)\Bazaar\plugins\colo [0.2.1]
  explorer C:\Program Files (x86)\Bazaar\plugins\explorer [1.1.2]
  fastimport C:\Program Files (x86)\Bazaar\plugins\fastimport [0.10.0dev]
  launchpad C:\Program Files (x86)\Bazaar\plugins\launchpad [2.3.0]
  loom C:\Program Files (x86)\Bazaar\plugins\loom [2.2.1dev]
  netrc_credential_store C:\Program Files (x86)\Bazaar\plugins\netrc_credential_store [2.3.0]
  news_merge C:\Program Files (x86)\Bazaar\plugins\news_merge [2.3.0]
  pipeline C:\Program Files (x86)\Bazaar\plugins\pipeline [1.1.0]
  qbzr C:\Program Files (x86)\Bazaar\plugins\qbzr [0.20.0]
  rewrite C:\Program Files (x86)\Bazaar\plugins\rewrite [0.6.2dev]
  stats C:\Users\chajdas\AppData\Roaming\bazaar\2.0\plugins\stats [0.1.0dev]
  svn C:\Program Files (x86)\Bazaar\plugins\svn [1.0.5dev]
  upload C:\Program Files (x86)\Bazaar\plugins\upload [1.0.0]
  xmloutput C:\Program Files (x86)\Bazaar\plugins\xmloutput [0.8.7.dev]