thg issueshttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues2020-06-21T10:10:44Zhttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/1546Visual Diff2020-06-21T10:10:44ZBitbucket ImporterVisual Diff*Created originally on Bitbucket by Anonymous*
I was using Visual Diff on a .cs source file. When I closed the diff tool I noticed a window telling me to report the following here:
{{{
#!python
** Mercurial version (1.9.1). Tortoi...*Created originally on Bitbucket by Anonymous*
I was using Visual Diff on a .cs source file. When I closed the diff tool I noticed a window telling me to report the following here:
{{{
#!python
** Mercurial version (1.9.1). TortoiseHg version (2.1.2)
** Command: --nofork vdiff --listfile C:\Users\Helge\AppData\Local\Temp\THG1474.tmp
** CWD: D:\Daten\Helge\Programmierung\SetACL Studio\Source\GUI\ACLEditor\ViewModels
** Encoding: cp1252
** Extensions loaded: fetch, gestalt, kilnauth, kilnpath, big-push, kiln, caseguard, kbfiles
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:13:38) [MSC v.1500 64 bit (AMD64)]
** Windows version: (6, 1, 7601, 2, 'Service Pack 1')
** Processor architecture: x64
** Qt-4.7.1 PyQt-4.8.3
Traceback (most recent call last):
File "tortoisehg\hgqt\run.pyo", line 504, in __call__
File "mercurial\demandimport.pyo", line 85, in _demandimport
ImportError: No module named thginithook
}}}https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/1116visual diff2020-06-21T10:02:00ZBitbucket Importervisual diff*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.9.1). TortoiseHg version (2.1.2)
** Command: --nofork vdiff
** CWD: Z:\Mercurial\CHCSWSv2
** Encoding: cp1252
** Extensions loaded:
** Python v...*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.9.1). TortoiseHg version (2.1.2)
** Command: --nofork vdiff
** CWD: Z:\Mercurial\CHCSWSv2
** Encoding: cp1252
** Extensions loaded:
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:46:32) [MSC v.1500 32 bit (Intel)]
** Windows version: (5, 1, 2600, 2, 'Service Pack 3')
** Processor architecture: x86
** Qt-4.7.1 PyQt-4.8.3
Traceback (most recent call last):
File "tortoisehg\hgqt\run.pyo", line 504, in __call__
File "mercurial\demandimport.pyo", line 85, in _demandimport
ImportError: No module named thginithook
}}}https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/1061visual diff2020-06-21T10:00:55ZBitbucket Importervisual diff*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.9.1). TortoiseHg version (2.1.2)
** Command: --nofork vdiff
** CWD: E:\Projects\rediff\rediff-mail
** Encoding: cp1252
** Extensions loaded: tran...*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.9.1). TortoiseHg version (2.1.2)
** Command: --nofork vdiff
** CWD: E:\Projects\rediff\rediff-mail
** Encoding: cp1252
** Extensions loaded: transplant
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:46:32) [MSC v.1500 32 bit (Intel)]
** Windows version: (5, 1, 2600, 2, 'Service Pack 3')
** Processor architecture: x86
** Qt-4.7.1 PyQt-4.8.3
Traceback (most recent call last):
File "tortoisehg\hgqt\run.pyo", line 504, in __call__
File "mercurial\demandimport.pyo", line 85, in _demandimport
ImportError: No module named thginithook
}}}https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/534Visual Diff2020-06-21T09:49:58ZBitbucket ImporterVisual Diff*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.8.2). TortoiseHg version (2.0.3)
** Command: --nofork vdiff
** CWD: C:\Scripts
** Extensions loaded: fixfrozenexts
** Python version: 2.6.6 (r266...*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.8.2). TortoiseHg version (2.0.3)
** Command: --nofork vdiff
** CWD: C:\Scripts
** Extensions loaded: fixfrozenexts
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:46:32) [MSC v.1500 32 bit (Intel)]
** Windows version: (5, 2, 3790, 2, 'Service Pack 2')
** Processor architecture: x86
** Qt-4.7.1 PyQt-4.8.2
Traceback (most recent call last):
File "tortoisehg\hgqt\run.pyo", line 469, in __call__
File "tortoisehg\hgqt\visdiff.pyo", line 613, in run
File "tortoisehg\hgqt\visdiff.pyo", line 349, in visualdiff
File "tortoisehg\hgqt\visdiff.pyo", line 343, in dodiffwrapper
File "tortoisehg\hgqt\visdiff.pyo", line 332, in dodiff
File "tortoisehg\hgqt\visdiff.pyo", line 135, in launchtool
File "subprocess.pyo", line 623, in __init__
File "subprocess.pyo", line 833, in _execute_child
UnicodeEncodeError: 'ascii' codec can't encode characters in position 113-114: ordinal not in range(128)
}}}https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/487Visual Diff attempt caused bug report in TortoiseHg2020-06-21T09:48:57ZBitbucket ImporterVisual Diff attempt caused bug report in TortoiseHg*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.8.1). TortoiseHg version (2.0.2)
** Command: --nofork workbench
** CWD: C:\Users\Michael Trigoboff\Documents\PCC\CS260\cs260LabCode
** Extensions ...*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.8.1). TortoiseHg version (2.0.2)
** Command: --nofork workbench
** CWD: C:\Users\Michael Trigoboff\Documents\PCC\CS260\cs260LabCode
** Extensions loaded: fixfrozenexts
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:13:38) [MSC v.1500 64 bit (AMD64)]
** Windows version: (6, 1, 7601, 2, 'Service Pack 1')
** Processor architecture: x64
** Qt-4.7.1 PyQt-4.8.2
Traceback (most recent call last):
File "tortoisehg\hgqt\repowidget.pyo", line 1017, in diffPair
File "tortoisehg\hgqt\visdiff.pyo", line 206, in visualdiff
File "mercurial\copies.pyo", line 192, in copies
File "mercurial\copies.pyo", line 154, in checkcopies
File "mercurial\context.pyo", line 557, in ancestors
File "mercurial\context.pyo", line 396, in parents
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 263, in _filenode
File "mercurial\revlog.pyo", line 750, in lookup
LookupError: data/lab4.soln/lab4.soln.vcxproj.filters.i@413228c6470a: no match found
}}}https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5631Visual Diff -> AttributeError: 'module' object has no attribute 'quotecommand'2020-10-08T11:48:33ZRossBoylanVisual Diff -> AttributeError: 'module' object has no attribute 'quotecommand'From MS Windows explorer I right-clicked on a file and requested a visual diff from thg.
I think it was working recently, but at least in this case a box popped up telling me to report the bug.
Maybe same as #5620, but that was marked a...From MS Windows explorer I right-clicked on a file and requested a visual diff from thg.
I think it was working recently, but at least in this case a box popped up telling me to report the bug.
Maybe same as #5620, but that was marked as a duplicate of #5588. But the latter says the issue was fixed in 5.5, but the report below indicates I'm on 5.5.
Here's the reported info:
#!python
** Mercurial version (5.5rc0+19-0ea08126a2af). TortoiseHg version (5.5rc0+2-b76ceb74fe60)
** Command: --nofork vdiff --listfile C:\Users\rdboylan\AppData\Local\Temp\THG231A.tmp
** CWD: Z:\FahyGroup\Ross Boylan\Data Management
** Encoding: cp1252
** Extensions loaded: tortoisehg.util.configitems
** Python version: 2.7.17 (v2.7.17:c2f86d86e6, Oct 19 2019, 21:01:17) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=2, build=9200, platform=2, service_pack='')
** Processor architecture: x64
** Qt-5.9.9 PyQt-5.13.2 QScintilla-2.10.8
Traceback (most recent call last):
File "tortoisehg\hgqt\run.pyo", line 138, in dispatch
File "tortoisehg\hgqt\run.pyo", line 342, in _runcatch
File "tortoisehg\hgqt\run.pyo", line 436, in runcommand
File "tortoisehg\hgqt\run.pyo", line 488, in _runcommand
File "tortoisehg\hgqt\run.pyo", line 441, in checkargs
File "tortoisehg\hgqt\run.pyo", line 435, in <lambda>
File "tortoisehg\hgqt\qtapp.pyo", line 466, in __call__
File "tortoisehg\hgqt\qtapp.pyo", line 530, in _createdialog
File "mercurial\util.pyo", line 1867, in check
File "tortoisehg\hgqt\run.pyo", line 1406, in vdiff
File "tortoisehg\hgqt\visdiff.pyo", line 409, in visualdiff
File "tortoisehg\hgqt\visdiff.pyo", line 403, in dodiffwrapper
File "tortoisehg\hgqt\visdiff.pyo", line 388, in dodiff
File "tortoisehg\hgqt\visdiff.pyo", line 164, in launchtool
AttributeError: 'module' object has no attribute 'quotecommand'https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/260"Visual Diff" button in Hg log viewer2020-06-21T09:44:15ZBitbucket Importer"Visual Diff" button in Hg log viewer*Created originally on Bitbucket by [yruslan (Ruslan Yushchenko)](https://bitbucket.org/%7Bb452f22d-f78d-4944-9e5f-e2d27ea3b8b4%7D/)*
The new "Hg log file viewer" feature is great for comparing arbitrary file revisions. But often is is ...*Created originally on Bitbucket by [yruslan (Ruslan Yushchenko)](https://bitbucket.org/%7Bb452f22d-f78d-4944-9e5f-e2d27ea3b8b4%7D/)*
The new "Hg log file viewer" feature is great for comparing arbitrary file revisions. But often is is desirable to use external tool like Kdiff3 or WinMerge to view the difference. It would be nice to add the button to the toolbar or/and to right click menu.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/1799Visual Diff doesn't work as expected on last applied patch2020-06-21T10:15:39ZBitbucket ImporterVisual Diff doesn't work as expected on last applied patch*Created originally on Bitbucket by [ccaughie (Colin Caughie)](https://bitbucket.org/%7B9959ebea-5ce8-4ee1-aaac-1e9233f0aca5%7D/)*
When I select the last applied patch in the workbench, then right-click on one of the files in the lower-...*Created originally on Bitbucket by [ccaughie (Colin Caughie)](https://bitbucket.org/%7B9959ebea-5ce8-4ee1-aaac-1e9233f0aca5%7D/)*
When I select the last applied patch in the workbench, then right-click on one of the files in the lower-left pane and choose "Visual Diff", it shows the diff between the applied patch and the working copy, not the diff from the previous revision. If I've just done a qref it always shows an empty diff.
This is neither useful nor consistent; doing this on any other revision, or the working directory, always shows the diff from the previous revision.
What I would *really* like to do in this situation is to bring up a diff between the previous revision and my working copy, so that I can make further edits within the diff tool. If this is considered inconsistent behavior for the Visual Diff command, it would be extremely useful to have another command that did this, e.g. "Diff Parent to Local".https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/1886visual diff doesn't work when sor patg have no ascii symbols2020-06-21T10:17:20ZBitbucket Importervisual diff doesn't work when sor patg have no ascii symbols*Created originally on Bitbucket by Anonymous*
Hello
When i place hg repo in folder that named in national maner (for example c:\Documents and Settings\<user name>\Мои документы\repo) kdiff writes that is can't display right file. Al...*Created originally on Bitbucket by Anonymous*
Hello
When i place hg repo in folder that named in national maner (for example c:\Documents and Settings\<user name>\Мои документы\repo) kdiff writes that is can't display right file. Also when i try to anotate files i got follow error:
{{{
#!python
** Mercurial version (2.2.1). TortoiseHg version (2.4)
** Command: --nofork annotate --listfile C:\DOCUME~1\Ruslan\LOCALS~1\Temp\THG13.tmp
** CWD: C:\Documents and Settings\Ruslan\Мои документы\Dropbox\src\python\deploy
** Encoding: cp1251
** Extensions loaded: hggit, hgsubversion
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:46:32) [MSC v.1500 32 bit (Intel)]
** Windows version: (5, 1, 2600, 2, 'Service Pack 3')
** Processor architecture: x86
** Qt-4.7.4 PyQt-4.8.6
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 52, in data
File "tortoisehg\hgqt\manifestmodel.pyo", line 114, in fileIcon
File "mercurial\localrepo.pyo", line 622, in wjoin
File "ntpath.pyo", line 108, in join
UnicodeDecodeError: 'ascii' codec can't decode byte 0xcc in position 33: ordinal not in range(128)
}}}https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/1421VisualDiff don't work when file names contains national characters2020-06-21T10:08:10ZBitbucket ImporterVisualDiff don't work when file names contains national characters*Created originally on Bitbucket by [rumatavz](https://bitbucket.org/%7B834ac0fc-381c-4485-b5cd-8d92a8212cfe%7D/)*
I have following file structure:
D:\HgTest\Новая папка\Новый текстовый документ.txt
When I try to get visual diff for...*Created originally on Bitbucket by [rumatavz](https://bitbucket.org/%7B834ac0fc-381c-4485-b5cd-8d92a8212cfe%7D/)*
I have following file structure:
D:\HgTest\Новая папка\Новый текстовый документ.txt
When I try to get visual diff for file Новый текстовый документ.txt (right click - TortosieHG - VisualDiff) I'v got message:
"Opening of this files failed"
File names are:
Íîâàÿ ïàïêà\Íîâûé òåêñòîâûé äîêóìåíò.txt@0:e0fa0c0478f8
Íîâàÿ ïàïêà\Íîâûé òåêñòîâûé äîêóìåíò.txt
If I manually select files with national characters in names diff works fine.
In my case characters was cyrillic.
I'm using Win7(I can reproduce this bag in both 32 and 64) with Russian localization.
*Attachments:* [hgBug](/uploads/ba6e8cec635773aaa02017358d4769c3/hgBug.png)[hgBug2](/uploads/5124cb3646408f7eafa2c3587c30a4d2/hgBug2.png)https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/1145Visual Diff Error2020-06-21T10:02:31ZBitbucket ImporterVisual Diff Error*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.9.1). TortoiseHg version (2.1.2)
** Command: --nofork vdiff --listfile C:\Users\ADMINI~1\AppData\Local\Temp\2\THG417.tmp
** CWD: E:\Projects\Web\sr...*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.9.1). TortoiseHg version (2.1.2)
** Command: --nofork vdiff --listfile C:\Users\ADMINI~1\AppData\Local\Temp\2\THG417.tmp
** CWD: E:\Projects\Web\src\Modal
** Encoding: cp1252
** Extensions loaded:
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:13:38) [MSC v.1500 64 bit (AMD64)]
** Windows version: (6, 1, 7600, 2, '')
** Processor architecture: x64
** Qt-4.7.1 PyQt-4.8.3
Traceback (most recent call last):
File "tortoisehg\hgqt\run.pyo", line 504, in __call__
File "mercurial\demandimport.pyo", line 85, in _demandimport
ImportError: No module named thginithook
}}}https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/208Visual Diff fails with Binary Files2020-06-21T09:43:09ZBitbucket ImporterVisual Diff fails with Binary Files*Created originally on Bitbucket by Anonymous*
I reported error 195 and if I understand the response it was a duplicate of 181 and has been solved. I did not report how I get the error. After reinstalling version 2 (Mercurial-1.8, Pyt...*Created originally on Bitbucket by Anonymous*
I reported error 195 and if I understand the response it was a duplicate of 181 and has been solved. I did not report how I get the error. After reinstalling version 2 (Mercurial-1.8, Python-2.6.6, PyQt-4.8.2, Qt-4.7.1) I am still getting the error. Follow is the details on how I get the error.
I have multiple revisions a Microsoft Word document in the repository. These files look like binary files to TortoiseHg. When I open Workbench and double click on a version of the word document I get the “Visual Diffs” dialog box with beyondcompare3 in the “Select Tool” text box and the “Directory diff” button. When I click on the “Directory diff” button I get the following error message in a “TortoiseHg Bug Report” dialog box with “Ok”, “Save”, and “Quit” buttons.
{{{
#!python
** Please report this bug to http://bitbucket.org/tortoisehg/thg/issues
** Mercurial version (1.8). TortoiseHg version (2.0)
** Command: --nofork workbench
** CWD: C:\Working
** Extensions loaded: fixfrozenexts
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:46:32) [MSC v.1500 32 bit (Intel)]
** Windows version: (6, 1, 7601, 2, 'Service Pack 1')
** Processor architecture: x86
** Qt-4.7.1 PyQt-4.8.2
TypeError: p1dirdiff() takes exactly 2 arguments (1 given)
}}}
Clicking the “Ok” button return to the “Visual Diffs” dialog box.
I added text versions of the file to the repository and the “Visual Diffs” work as expected. The previsions version of Tortoisehg (tortoisehg-1.1.9.1-hg-1.7.5-x86.msi) does display the Word documents in beyondcompare3.
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/519visual diff for files in incoming cset in workbench tracebacks2020-06-21T09:49:38ZBitbucket Importervisual diff for files in incoming cset in workbench tracebacks*Created originally on Bitbucket by [abuehl (Adrian Buehlmann)](https://bitbucket.org/%7Bbde8a3b1-d552-45fc-95c8-fd1617b73bfd%7D/)*
Running from self.built recent unstable msi
{{{
#!python
** Mercurial version (1.8.2+23-5b0a3f6cbea...*Created originally on Bitbucket by [abuehl (Adrian Buehlmann)](https://bitbucket.org/%7Bbde8a3b1-d552-45fc-95c8-fd1617b73bfd%7D/)*
Running from self.built recent unstable msi
{{{
#!python
** Mercurial version (1.8.2+23-5b0a3f6cbead). TortoiseHg version (2.0.3+18-d6363fbfe2c8)
** Command: --nofork workbench
** CWD: C:\Users\adi\hgrepos\hg-crew
** Extensions loaded: fixfrozenexts, transplant, rebase, mq, graphlog, patchbomb
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:13:38) [MSC v.1500 64 bit (AMD64)]
** Windows version: (6, 1, 7601, 2, 'Service Pack 1')
** Processor architecture: x64
** Qt-4.7.1 PyQt-4.8.3
Traceback (most recent call last):
File "tortoisehg\hgqt\filelistview.pyo", line 137, in vdiff
File "tortoisehg\hgqt\visdiff.pyo", line 175, in visualdiff
File "mercurial\localrepo.pyo", line 207, in __getitem__
File "mercurial\context.pyo", line 25, in __init__
File "mercurial\revlog.pyo", line 312, in node
IndexError: list index out of range
}}}https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/179Visual diff from explorer on binary file2020-06-21T09:42:27ZBitbucket ImporterVisual diff from explorer on binary file*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Please report this bug to http://bitbucket.org/tortoisehg/thg/issues
** Mercurial version (1.8). TortoiseHg version (2.0)
** Command: --nofork vdiff --listfile C:\DOCUM...*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Please report this bug to http://bitbucket.org/tortoisehg/thg/issues
** Mercurial version (1.8). TortoiseHg version (2.0)
** Command: --nofork vdiff --listfile C:\DOCUME~1\Colin\LOCALS~1\Temp\THG75F.tmp
** CWD: C:\dev\masks\Deimos_R\docs\public
** Extensions loaded: fixfrozenexts, extdiff
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:46:32) [MSC v.1500 32 bit (Intel)]
** Windows version: (5, 1, 2600, 2, 'Service Pack 3')
** Processor architecture: x86
** Qt-4.7.1 PyQt-4.8.2
Traceback (most recent call last):
File "tortoisehg\hgqt\visdiff.pyo", line 469, in toolSelect
KeyError: '5'
}}}https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/1220Visual diff in commit tab on applied patch2020-06-21T10:04:01ZBitbucket ImporterVisual diff in commit tab on applied patch*Created originally on Bitbucket by [czarnyczarodziej (Piotr Klecha)](https://bitbucket.org/%7B0bfb38f6-a6af-4583-8336-9958c07dac8d%7D/)*
Choosing visual diff on file list resets checked files - just like switching between QNew and QRef...*Created originally on Bitbucket by [czarnyczarodziej (Piotr Klecha)](https://bitbucket.org/%7B0bfb38f6-a6af-4583-8336-9958c07dac8d%7D/)*
Choosing visual diff on file list resets checked files - just like switching between QNew and QRefresh. This only happens when visual diff is selected from popup, from shortcut everything is fine.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/1234Visual Diff launches diff tool without files to compare (ubuntu)2020-06-21T10:04:17ZBitbucket ImporterVisual Diff launches diff tool without files to compare (ubuntu)*Created originally on Bitbucket by Anonymous*
When trying to open Visual Diff (either from command line or GUI), the external diff tool (e.g. kdiff3) is launched but not showing the compared files.
Some research showed that the tool...*Created originally on Bitbucket by Anonymous*
When trying to open Visual Diff (either from command line or GUI), the external diff tool (e.g. kdiff3) is launched but not showing the compared files.
Some research showed that the tool is launched with no arguments, regardless of the tool's .args property under [merge-tools] section in the .hgrc file.
** Mercurial version (1.9.2). TortoiseHg version (2.1.3). Ubuntu 10.04https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4027Visual Diff no longer works after update from 2.4.x to 3.2.32020-06-21T10:50:12ZBitbucket ImporterVisual Diff no longer works after update from 2.4.x to 3.2.3*Created originally on Bitbucket by Anonymous*
Visual Diff using BC3 quit working after upgrading to Beyond Compare 4, then found out it should be resolved by updating to latest tortoise. Upgrade went well (except for having to close ou...*Created originally on Bitbucket by Anonymous*
Visual Diff using BC3 quit working after upgrading to Beyond Compare 4, then found out it should be resolved by updating to latest tortoise. Upgrade went well (except for having to close out 12 apps), but visual diff now gives me a bug report (attached).
*Attachments:* [bugreport.txt](/uploads/a61d9858bf903c65ba358e1a133590ab/bugreport.txt)https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5833Visual Diff not working with external diff tool2023-08-22T04:15:04ZPaul LumbVisual Diff not working with external diff toolTortoiseHg 6.2.2
I am attempting to use an external diff tool but find it is not being called from the Visual Diffs window
I have the following defined in .hgrc.
````
[diff-patterns]
**.foo = testtool
[merge-tools]
testtool.executabl...TortoiseHg 6.2.2
I am attempting to use an external diff tool but find it is not being called from the Visual Diffs window
I have the following defined in .hgrc.
````
[diff-patterns]
**.foo = testtool
[merge-tools]
testtool.executable = c:\tmp\test.bat
testtool.diffargs = $child $parent
testtool.gui = False
testtool.priority = 1
````
File c:\tmp\test.bat contains
````
echo testtool called with %1 and %2 > c:\tmp\test.log
````
which should record the call to the external tool into test.log.
I also have a test repository in ````c:\tmp\hgtest```` with two files a.foo and b.foo and a couple of revisions which are bookmarked as ````bm1```` and ````bm2````.
Executing
````thg -R "c:\tmp\hgtest" vdiff -r bm1 -r bm2````
starts the Visual Diff window showing a.foo and b.foo and also shows in Select Tools that I can use my external ````testtool```` for the comparison
![Screenshot_2022-09-30_181334](/uploads/fb1267b2505ded267133fc77e1813b05/Screenshot_2022-09-30_181334.jpg)
However when I double-click on one of the filenames nothing happens and the external testtool is not invoked. No error appears.
By comparison if in the Select Tool widget I choose one of the internal tools then that tool will be opened. It just appears to be external tools which will not run.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/446Visual diff of incoming changesets crashes2020-06-21T09:48:07ZBitbucket ImporterVisual diff of incoming changesets crashes*Created originally on Bitbucket by [sborho (Steve Borho)](https://bitbucket.org/%7Ba7b33259-0b76-44e3-9ee3-0946c696a082%7D/)*
{{{
#!python
** Mercurial version (1.8.1+48-913c2c66a555). TortoiseHg version (2.0.2+102-de756a7ca8d8)
**...*Created originally on Bitbucket by [sborho (Steve Borho)](https://bitbucket.org/%7Ba7b33259-0b76-44e3-9ee3-0946c696a082%7D/)*
{{{
#!python
** Mercurial version (1.8.1+48-913c2c66a555). TortoiseHg version (2.0.2+102-de756a7ca8d8)
** Command:
** CWD: C:\Windows\system32
** Extensions loaded: fixfrozenexts, mercurial_keyring, purge, perfarce, mq
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:13:38) [MSC v.1500 64 bit (AMD64)]
** Windows version: (6, 1, 7600, 2, '')
** Processor architecture: x64
** Qt-4.7.1 PyQt-4.8.2
Traceback (most recent call last):
File "tortoisehg\hgqt\filelistview.pyo", line 143, in vdiff
File "tortoisehg\hgqt\visdiff.pyo", line 180, in visualdiff
File "mercurial\localrepo.pyo", line 206, in __getitem__
File "mercurial\context.pyo", line 25, in __init__
File "mercurial\revlog.pyo", line 312, in node
IndexError: list index out of range
}}}https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/679Visual diff of renamed and modified file displays blank.2020-06-21T09:52:58ZBitbucket ImporterVisual diff of renamed and modified file displays blank.*Created originally on Bitbucket by Anonymous*
I am taking snapshots of a project and putting it into a repository. If I detect renames, and then try to do a "visual diff" using an external utility, the "before" copy is blank. However...*Created originally on Bitbucket by Anonymous*
I am taking snapshots of a project and putting it into a repository. If I detect renames, and then try to do a "visual diff" using an external utility, the "before" copy is blank. However, the built in +/- view and "in context of file" views show the old file (of different name) as desired.