Major update to diff algorithms in WorkBench

Hi Barry,

have you had a chance to look at my test reports?

I updated to the latest pysvn repository version today.
This version crashes immediately when I start it:

WorkBench/Source> python wb_main.py
Traceback (most recent call last):
  File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_main.py", line 190, in ?
    sys.exit( main( sys.argv ) )
  File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_main.py", line 66, in main
    app = wb_app.WbApp( startup_dir, args )
  File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 72, in __init__
    self.prefs = wb_preferences.Preferences( self )
  File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_preferences.py", line 64, in __init__
    self.readPreferences()
  File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_preferences.py", line 76, in readPreferences
    handler.readPreferences( self.pref_data )
  File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_preferences.py", line 423, in readPreferences
    bookmark_name = get_option.getstr( 'bookmark_name' )
  File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_preferences.py", line 338, in getstr
    return self.get( name ).strip()
  File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_preferences.py", line 335, in get
    return self.pref_list[ self.index ][ name ]
KeyError: 0


Carsten.


Carsten Koch wrote:
> Barry Scott wrote:
>> Carsten,
>>
>> I have just committed a major change to the diff
algorithms in WorkBench.
>>
>> I will have broken your branch diff code in doing
this. I'll checkin the
>> changes for these calls tomorrow. But I'll need
your help testing them.
> 
> I have tested the following tonight:
> 
> 1. GUI diff:
> *  Diff WC vs. BASE...
>    + works.
> 
> *  Diff WC vs HEAD...
>    - fails with
> 2006-11-01 20:56:02,050 ERROR
AppBackgroundFunction<wb_app.stepGenerator>
> Traceback (most recent call last):
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 365, in __call__
>     self.function( *self.args )
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 398, in stepGenerator
>     where_to_go_next = generator.next()
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_subversion_diff.py", line 312, in
__getLocalFilename
>     revision=path_info.revision )
> TypeError: CXX : Error creating object of type
N2Py7SeqBaseINS_4CharEEE
> 
> * Diff WC vs. branch origin BASE...
>    - fails with
> 2006-11-01 20:58:47,135 ERROR
AppBackgroundFunction<wb_app.stepGenerator>
> Traceback (most recent call last):
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 365, in __call__
>     self.function( *self.args )
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 398, in stepGenerator
>     where_to_go_next = generator.next()
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_subversion_diff.py", line 312, in
__getLocalFilename
>     revision=path_info.revision )
> TypeError: CXX : Error creating object of type
N2Py7SeqBaseINS_4CharEEE
> 
> * Diff WC vs. branch origin HEAD...
>    - fails with
> 2006-11-01 20:59:31,321 ERROR
AppBackgroundFunction<wb_app.stepGenerator>
> Traceback (most recent call last):
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 365, in __call__
>     self.function( *self.args )
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 398, in stepGenerator
>     where_to_go_next = generator.next()
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_subversion_diff.py", line 312, in
__getLocalFilename
>     revision=path_info.revision )
> TypeError: CXX : Error creating object of type
N2Py7SeqBaseINS_4CharEEE
> 
> 
> 2. svn diff:
>    + works in all modes.
> 
> 3. workbench diff.
> *  Diff WC vs. BASE...
>    + works.
> 
> *  Diff WC vs HEAD...
>    - fails with
> 2006-11-01 21:03:28,082 ERROR
AppBackgroundFunction<wb_app.stepGenerator>
> Traceback (most recent call last):
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 365, in __call__
>     self.function( *self.args )
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 398, in stepGenerator
>     where_to_go_next = generator.next()
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_subversion_diff.py", line 282, in __getFileContents
>     peg_revision=path_info.peg_revision ).split('n')
> AttributeError: cat() expecting revision object for
keyword peg_revision
> 
> 
> * Diff WC vs. branch origin BASE...
>    - fails with
> 2006-11-01 21:04:15,513 ERROR
AppBackgroundFunction<wb_app.stepGenerator>
> Traceback (most recent call last):
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 365, in __call__
>     self.function( *self.args )
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 398, in stepGenerator
>     where_to_go_next = generator.next()
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_subversion_diff.py", line 282, in __getFileContents
>     peg_revision=path_info.peg_revision ).split('n')
> AttributeError: cat() expecting revision object for
keyword peg_revision
> 
> * Diff WC vs. branch origin HEAD...
>    - fails with
> 2006-11-01 21:04:37,089 ERROR
AppBackgroundFunction<wb_app.stepGenerator>
> Traceback (most recent call last):
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 365, in __call__
>     self.function( *self.args )
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 398, in stepGenerator
>     where_to_go_next = generator.next()
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_subversion_diff.py", line 282, in __getFileContents
>     peg_revision=path_info.peg_revision ).split('n')
> AttributeError: cat() expecting revision object for
keyword peg_revision
> 
> 
> 4. External text diff.
> 
> *  Diff WC vs. BASE...
>    + works.
> 
> *  Diff WC vs HEAD...
>    - fails with
> 2006-11-01 21:06:21,300 ERROR
AppBackgroundFunction<wb_app.stepGenerator>
> Traceback (most recent call last):
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 365, in __call__
>     self.function( *self.args )
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 398, in stepGenerator
>     where_to_go_next = generator.next()
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_subversion_diff.py", line 312, in
__getLocalFilename
>     revision=path_info.revision )
> TypeError: CXX : Error creating object of type
N2Py7SeqBaseINS_4CharEEE
> 
> 
> 
> * Diff WC vs. branch origin BASE...
>    - fails with
> 2006-11-01 21:06:45,599 ERROR
AppBackgroundFunction<wb_app.stepGenerator>
> Traceback (most recent call last):
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 365, in __call__
>     self.function( *self.args )
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 398, in stepGenerator
>     where_to_go_next = generator.next()
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_subversion_diff.py", line 312, in
__getLocalFilename
>     revision=path_info.revision )
> TypeError: CXX : Error creating object of type
N2Py7SeqBaseINS_4CharEEE
> 
> 
> * Diff WC vs. branch origin HEAD...
>    - fails with
> 
> 2006-11-01 21:07:20,207 ERROR
AppBackgroundFunction<wb_app.stepGenerator>
> Traceback (most recent call last):
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 365, in __call__
>     self.function( *self.args )
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_app.py", line 398, in stepGenerator
>     where_to_go_next = generator.next()
>   File
"/athlon/home/cko/hp/pysvn/trunk/pysvn/WorkBench/Source
/wb_subversion_diff.py", line 312, in
__getLocalFilename
>     revision=path_info.revision )
> TypeError: CXX : Error creating object of type
N2Py7SeqBaseINS_4CharEEE
> 
> 
> 
> 
> 
> 
> Carsten.
> 
> 
> 
> 
> 
>
------------------------------------------------------------
---------
> To unsubscribe, e-mail: dev-unsubscribepysvn.tigris.org
> For additional commands, e-mail: dev-helppysvn.tigris.org
> 
> 


-- 
  
___________________________________________________________
  (                                                         
 )
  | Carsten Koch                  Phone: +49-4286-920001    
 |
  | ICEM Technologies GmbH          Fax: +49-4286-1608      
 |
  | Sotheler Mühlenweg 15        mailto:Carsten.Kochicem.com
|
  | 27404 Elsdorf-Hatzte, Germany  http://www.icem.com        |
 
(___________________________________________________________
)

------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribepysvn.tigris.org
For additional commands, e-mail: dev-helppysvn.tigris.org