[MERGE] Return ConflictsList() instead of [] from Tree.conflicts

[Lukáš Lalinský]

Hi,

running status with specified files and a revision range results in this
error:

$ bzr st ../bzr.dev -r 1..2
modified:
  bzrlib/__init__.py
bzr: ERROR: exceptions.AttributeError: 'list' object has no attribute
'select_conflicts'

Traceback (most recent call last):
  File "/home/lukas/projects/bzr/bzr/bzr.dev/bzrlib/commands.py", line
781, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/lukas/projects/bzr/bzr/bzr.dev/bzrlib/commands.py", line
743, in run_bzr
    ret = run(*run_argv)
  File "/home/lukas/projects/bzr/bzr/bzr.dev/bzrlib/commands.py", line
475, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/lukas/projects/bzr/bzr/bzr.dev/bzrlib/commands.py", line
753, in ignore_pipe
    result = func(*args, **kwargs)
  File "/home/lukas/projects/bzr/bzr/bzr.dev/bzrlib/builtins.py", line
187, in run
    to_file=self.outf, short=short, versioned=versioned)
  File "/home/lukas/projects/bzr/bzr/bzr.dev/bzrlib/status.py", line
127, in show_tree_status
    conflicts = conflicts.select_conflicts(new, specific_files,
AttributeError: 'list' object has no attribute 'select_conflicts'

bzr 0.91.0dev0 on python 2.5.1.candidate.1 (linux2)
arguments: ['bzr', 'st', '../bzr.dev', '-r', '1..2']

If I understand it correctly, Tree.conflicts is supposed to return a
ConflictsList instance (like WorkingTree.conflicts does), currently it
returns a regular Python list.

Lukas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-E5pG8W.patch
Type: text/x-patch
Size: 3559 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070827/57ea3610/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Toto je =?ISO-8859-1?Q?digit=E1lne?=
	=?ISO-8859-1?Q?_podp=EDsan=E1?= =?UTF-8?Q?_=C4=8Das=C5=A5?=
	=?ISO-8859-1?Q?_spr=E1vy?=
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070827/57ea3610/attachment.pgp