Using Winmerge with TortoiseBzr
Niben M Singh
niben_s at rocketmail.com
Fri May 1 16:30:17 BST 2009
Gary -
QBzr was installed as the part of Bazaar installation and it was 0.9.9.
I got the latest snapshot from lp:qbzr and replaced the entire qbzr folder in plungin directory of bazaar. Just to be sure then I restarted my pc. Here is the log. You can see that it generated same messge when i tried to do diff using WinMerge. Its in the last part of the log. Please let me know if there is something that I am doing wrong.
------------------------------
Fri 2009-05-01 09:43:21 -0500
[ 512] 2009-05-01 09:43:22.358 INFO: tbzrcache running...
[ 512] 2009-05-01 09:54:29.842 ERROR: Error processing remote request
Traceback (most recent call last):
File "tbzrlib\pipe\server.pyo", line 132, in run_command_loop
File "tbzrlib\dispatcher.pyo", line 201, in dispatch
File "tbzrlib\dispatcher.pyo", line 116, in get_menu_commands
File "tbzrlib\actions.pyo", line 259, in get_actions_for_files
File "tbzrlib\cache\statuscache.pyo", line 54, in is_path_allowed
TypeError: cannot concatenate 'str' and 'NoneType' objects
[ 512] 2009-05-01 09:54:29.953 ERROR: Error processing remote request
Traceback (most recent call last):
File "tbzrlib\pipe\server.pyo", line 132, in run_command_loop
File "tbzrlib\dispatcher.pyo", line 201, in dispatch
File "tbzrlib\dispatcher.pyo", line 116, in get_menu_commands
File "tbzrlib\actions.pyo", line 259, in get_actions_for_files
File "tbzrlib\cache\statuscache.pyo", line 54, in is_path_allowed
TypeError: cannot concatenate 'str' and 'NoneType' objects
[ 512] 2009-05-01 10:13:51.387 ERROR: Error processing remote request
Traceback (most recent call last):
File "tbzrlib\pipe\server.pyo", line 132, in run_command_loop
File "tbzrlib\dispatcher.pyo", line 201, in dispatch
File "tbzrlib\dispatcher.pyo", line 42, in get_file_status
File "tbzrlib\cache\statuscache.pyo", line 154, in get_status_for_path
File "tbzrlib\cache\cacheddirectory.pyo", line 56, in get_status_for_member
File "tbzrlib\app.pyo", line 399, in is_dir_versioned
File "bzrlib\workingtree.pyo", line 339, in open_containing
File "bzrlib\bzrdir.pyo", line 1608, in open_workingtree
File "bzrlib\workingtree.pyo", line 2698, in find_format
NoWorkingTree: No WorkingTree exists for "file:///C:/BazaarSourceCodeRepository/.bzr/checkout/".
[ 512] 2009-05-01 10:13:54.292 ERROR: Error processing remote request
Traceback (most recent call last):
File "tbzrlib\pipe\server.pyo", line 132, in run_command_loop
File "tbzrlib\dispatcher.pyo", line 201, in dispatch
File "tbzrlib\dispatcher.pyo", line 42, in get_file_status
File "tbzrlib\cache\statuscache.pyo", line 154, in get_status_for_path
File "tbzrlib\cache\cacheddirectory.pyo", line 56, in get_status_for_member
File "tbzrlib\app.pyo", line 399, in is_dir_versioned
File "bzrlib\workingtree.pyo", line 339, in open_containing
File "bzrlib\bzrdir.pyo", line 1608, in open_workingtree
File "bzrlib\workingtree.pyo", line 2698, in find_format
NoWorkingTree: No WorkingTree exists for "file:///C:/BazaarSourceCodeRepository/.bzr/checkout/".
1836.528 opening working tree 'C:/BazaarSourceCodeRepository/Database Development - Dev'
1836.809 opening working tree 'C:/BazaarSourceCodeRepository/Database Development - Dev'
[ 512] 2009-05-01 10:14:03.855 INFO: added path to watch 'C:\BazaarSourceCodeRepository\Database Development - Dev' - now watching 1 locations
1843.168 opening working tree 'C:/BazaarSourceCodeRepository/qbzr'
1843.184 opening working tree 'C:/BazaarSourceCodeRepository/qbzr'
[ 512] 2009-05-01 10:14:04.996 INFO: added path to watch 'C:\BazaarSourceCodeRepository' - now watching 1 locations
[ 512] 2009-05-01 10:14:05.058 ERROR: Error processing remote request
Traceback (most recent call last):
File "tbzrlib\pipe\server.pyo", line 132, in run_command_loop
File "tbzrlib\dispatcher.pyo", line 201, in dispatch
File "tbzrlib\dispatcher.pyo", line 42, in get_file_status
File "tbzrlib\cache\statuscache.pyo", line 154, in get_status_for_path
File "tbzrlib\cache\cacheddirectory.pyo", line 56, in get_status_for_member
File "tbzrlib\app.pyo", line 399, in is_dir_versioned
File "bzrlib\workingtree.pyo", line 339, in open_containing
File "bzrlib\bzrdir.pyo", line 1608, in open_workingtree
File "bzrlib\workingtree.pyo", line 2698, in find_format
NoWorkingTree: No WorkingTree exists for "file:///C:/BazaarSourceCodeRepository/.bzr/checkout/".
1852.824 opening working tree 'C:/BazaarSourceCodeRepository/Database Development - Dev'
1852.840 opening working tree 'C:/BazaarSourceCodeRepository/qbzr'
[ 512] 2009-05-01 10:14:14.198 ERROR: Error processing remote request
Traceback (most recent call last):
File "tbzrlib\pipe\server.pyo", line 132, in run_command_loop
File "tbzrlib\dispatcher.pyo", line 201, in dispatch
File "tbzrlib\dispatcher.pyo", line 42, in get_file_status
File "tbzrlib\cache\statuscache.pyo", line 154, in get_status_for_path
File "tbzrlib\cache\cacheddirectory.pyo", line 56, in get_status_for_member
File "tbzrlib\app.pyo", line 399, in is_dir_versioned
File "bzrlib\workingtree.pyo", line 339, in open_containing
File "bzrlib\bzrdir.pyo", line 1608, in open_workingtree
File "bzrlib\workingtree.pyo", line 2698, in find_format
NoWorkingTree: No WorkingTree exists for "file:///C:/BazaarSourceCodeRepository/.bzr/checkout/".
Fri 2009-05-01 10:14:19 -0500
0.172 looking for plugins in C:/Documents and Settings/singhni.SSOL/Application Data/bazaar/2.0/plugins
0.312 looking for plugins in C:/Program Files/Bazaar/plugins
0.406 Plugin name qbzr already loaded
5.265 opening working tree 'C:/BazaarSourceCodeRepository/Database Development - Dev'
11.343 encoding stdout as osutils.get_user_encoding() 'cp1252'
12.984 encoding stdout as osutils.get_user_encoding() 'cp1252'
13.593 encoding stdout as osutils.get_user_encoding() 'cp1252'
14.624 encoding stdout as osutils.get_user_encoding() 'cp1252'
---------------------------------------------
Thanks,
Niben
________________________________
From: Gary van der Merwe <garyvdm at gmail.com>
To: Niben M Singh <niben_s at rocketmail.com>
Cc: Bazaar <bazaar at lists.canonical.com>
Sent: Friday, May 1, 2009 3:08:23 AM
Subject: Re: Using Winmerge with TortoiseBzr
On Fri, May 1, 2009 at 4:24 AM, Niben M Singh <niben_s at rocketmail.com> wrote:
> Martin -
>
> When I added WinMerge as default diff and tried to get diff between
> revisions or files nothing happens. If I switch to default diff then it
> works.
>
> I looked into the .bzr.log in "My Documents" folder and this is the entry I
> see when I try to diff with WinMerge.
>
> 4.281 encoding stdout as osutils.get_user_encoding() 'cp1252'
> 7.281 encoding stdout as osutils.get_user_encoding() 'cp1252'
>
> Thanks in advance!
>
> Niben
There was a bug with the error reporting. I've fixed this in the qbzr
trunk, and it will be released with qbzr 0.10.0.
How did you install qbzr (Most probably with the bzr installer, as it
is included with that.) Would you be able to try lp:qbzr?
Gary
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20090501/9e0e5fed/attachment.htm
More information about the bazaar
mailing list