Edgewall Software

Opened 9 years ago

Closed 9 years ago

#12030 closed defect (fixed)

SubversionMergePropertyDiffRenderer with wrong mergeinfo leads a TypeError — at Version 3

Reported by: Jun Omae Owned by: Jun Omae
Priority: normal Milestone: 0.12.7
Component: version control Version: 0.12.6
Severity: normal Keywords: svn
Cc: Branch:
Release Notes:

Fix a TypeError while rendering svn:mergeinfo with missing nodes.

API Changes:
Internal Changes:

Description 

2015-04-10 15:47:40,442 Trac[changeset] WARNING: Diff rendering failed for property svn:mergeinfo with renderer SubversionMergePropertyDiffRenderer:
Traceback (most recent call last):
  File "/home/jun66j5/venv/trac/0.12.6/lib/python2.4/site-packages/trac/versioncontrol/web_ui/changeset.py", line 845, in render_property_diff
    options)
  File "/home/jun66j5/venv/trac/0.12.6/lib/python2.4/site-packages/trac/versioncontrol/svn_prop.py", line 367, in render_property_diff
    added_ni &= revs
TypeError: unsupported operand type(s) for &=: 'set' and 'list'

Change History (3)

comment:1 by Jun Omae, 9 years ago

Milestone: 1.0.6 → 0.12.7
Owner: set to Jun Omae
Status: new → assigned

The issue is introduced in [13018] and would be fixed by the following. I'll post with unit tests later.

  • trac/versioncontrol/svn_prop.py 

    diff --git a/trac/versioncontrol/svn_prop.py b/trac/versioncontrol/svn_prop.py
index 8a4e1c1..7b425d7 100644
    a b class SubversionMergePropertyDiffRenderer(Component):  
    363363                revs = set(changed_revs[spath])
    364364                added &= revs
    365365                removed &= revs
    366             if added or removed:
    367366                added_ni &= revs
    368367                removed_ni &= revs
     368            if added or removed:
    369369                if new_spath:
    370370                    status = _(" (added)")
    371371                else:

comment:2 by Jun Omae, 9 years ago

Proposed changes in [1b59e12ac/jomae.git] (jomae.git@t12030).

Last edited 9 years ago by Jun Omae (previous) (diff)

comment:3 by Jun Omae, 9 years ago

Release Notes: modified (diff)
Resolution: → fixed
Status: assigned → closed

Committed in [13978] and merged in [13979:13980].

Note: See TracTickets for help on using tickets.