Issue #2035 resolved

Manifest Tab: Fails to Open Diff Tool on Files in Subrepos

Serge Baltic
created an issue

The manifest view (switching to Manifest tab when a revision is selected in the graph) includes subrepositories as "folders" in the tree. You can see changed files in subprepos, and the textual diff in the preview area.

Opening the diff with Ctrl+D our double-clicking fails:

{{{

!python

Mercurial version (2.2.3). TortoiseHg version (2.4.2) Command: CWD: W:\ReShuX2\Platform Encoding: UTF-8 Extensions loaded: mercurial_keyring, rebase, transplant, mq, children, churn, extdiff, fetch, hgcr-gui-qt, relink, share Python version: 2.7.3 (default, Apr 10 2012, 23:24:47) [MSC v.1500 64 bit (AMD64)] Windows version: sys.getwindowsversion(major=6, minor=1, build=7601, platform=2, service_pack='Service Pack 1') Processor architecture: x64 ** Qt-4.8.0 PyQt-4.9.1 Traceback (most recent call last): File "tortoisehg\hgqt\manifestdialog.pyo", line 267, in vdiff File "tortoisehg\hgqt\visdiff.pyo", line 206, in visualdiff File "mercurial\match.pyo", line 71, in init File "mercurial\match.pyo", line 302, in _normalize File "mercurial\scmutil.pyo", line 319, in canonpath File "mercurial\scmutil.pyo", line 145, in call Abort: path 'Platform\src\VisualStudio\v10.v11\Src\Install\VsixHelper.cs' is inside nested repo 'Platform'

}}}

Yes it's really inside a nested repo, but it would be nice if a diff view could be opened for it.

Comments (2)

  1. Log in to comment