Issue #150 resolved

Manifest: traceback after "Visual Diff to local" if current rev is Working Dir

Patrice LACOUTURE
created an issue

To show the issue:

  • Select * Working Directory * pseudo-changeset
  • Display the manifest dialog
  • right-click on any file and ask for "Visual Diff to local"

{{{

!python

Please report this bug to http://bitbucket.org/tortoisehg/thg/issues Mercurial version (1.7.5+125-31aa2e5b0750). TortoiseHg version (1.9.3+131-5d0520eb19c9) Command: CWD: /home/patrice Extensions loaded: mq, patchbomb, extdiff, rebase Python version: 2.6.6 (r266:84292, Dec 27 2010, 00:02:40) [GCC 4.4.5] ** Qt-4.6.3 PyQt-4.7.3 Traceback (most recent call last): File "/home/patrice/_archived/Dev/Testing/thg/tortoisehg/hgqt/manifestdialog.py", line 242, in vdifflocal assert type(self.rev) is int AssertionError

}}}

Comments (3)

  1. Patrice LACOUTURE reporter

    The root cause is that the "Visual Diff to Local", "Revert to revision" and "View at Revision" actions should not be available in the first place in this situation (see also issue #149).

    The widget initialization omits to disable these actions accordingly, and the revision change code omits to disable "Revert" when the selection is the working directory.

    Here's a patch that fixes this, and effectively fixes both issues #149 and #150.

  2. Patrice LACOUTURE reporter

    My previous patch actually prevented from using "View at Revision" when Working Directory is selected. On second thought, this option could be valid if it simply becomes equivalent to "Edit Local".

    This new patch below is a replacement to all the patches I posted for #150 and #149 so far, that should fix those two issues with this approach.

    Sorry for multiple-posting.

  3. Log in to comment