[MERGE] Re: Implementation and tests for -r revno:N:path

[Matthieu Moy]

John Arbash Meinel <john at arbash-meinel.com> writes:

> Aaron Bentley wrote:
>> 
>> +        except NotBranchError:
>> +            # Don't raise an error when bzr diff is called from
>> +            # outside a working tree.
>> +            tree1, tree2 = None, None
>> 
>> This patch causes us to get a very bad error when plain 'bzr diff' is
>> run in an unversioned directory:
>> 
>> AttributeError: 'NoneType' object has no attribute 'basis_tree'
>> 
>> Previously, it produced:
>> 
>> bzr: ERROR: Not a branch: /home/abentley/bzrplugins/
>> 
>> I'd consider this a regression.
>> 
>> Aaron
>
> Agreed.

Please, consider merging a fix and testcases for this here:

http://www-verimag.imag.fr/~moy/bzr/bzr/bzr.diff-outside-tree-fix/

-- 
Matthieu