search

cjprecord / editra-plugins

Automatically exported from code.google.com/p/editra-plugins
0 stars 0 forks source link

[Projects] Show Verion History - Diff #118

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago 
What Plugin does this relate to? Projects

What version of the Plugin? 1.3

What steps will reproduce the problem?

1. Apply attached patch to fix other trivial bugs first. See patch, it
explains itself.
2. Right Click a file and select "Show Version History".
3. Select 1 or 2 versions. 
4. Click the Compare button.

What is the expected output?

Expect diff between two version.

What do you see instead?

1. When using an external diff tool (Meld): 
"Could not retrieve file" dialog
"The requested file could not be retrieved from the source control system."

2. When using builtin diff:

Exception in thread Thread-17:
Traceback (most recent call last):
  File "/usr/lib/python2.6/threading.py", line 525, in __bootstrap_inner
    self.run()
  File
"/home/kevin/.Editra/plugins/Projects-1.3-py2.6.egg/projects/ScCommand.py",
line 110, in run
    value, err = self.task(*self._args, **self._kwargs)
  File
"/home/kevin/.Editra/plugins/Projects-1.3-py2.6.egg/projects/ScCommand.py",
line 285, in Diff
    diffwin.GenerateDiff(path2, path1, html=True)
  File
"/home/kevin/.Editra/plugins/Projects-1.3-py2.6.egg/projects/diffwin.py",
line 209, in GenerateDiff
    lfile = GetLines(left)
  File
"/home/kevin/.Editra/plugins/Projects-1.3-py2.6.egg/projects/diffwin.py",
line 242, in GetLines
    reader = util.GetFileReader(fname)
  File
"/usr/local/lib/python2.6/dist-packages/Editra-0.4.88-py2.6.egg/Editra/src/util.
py",
line 341, in GetFileReader
    file_h = file(file_name, "rb")
TypeError: coercing to Unicode: need string or buffer, NoneType found

What version of Editra are you using? On what operating system?

Ubuntu Linux 9.04
Python2.6
Editra 0.4.88
Mercurial Distributed SCM (version 1.2.1)

Please provide any additional information below.

Original issue reported on code.google.com by smithkevinc@gmail.com on 4 Jun 2009 at 3:19

Attachments:

GoogleCodeExporter commented 9 years ago 
Thanks,

* Patch Applied, Can't believe that those typo errors hadn't been found till 
now.

* Fixed the crash with the builtin diff

There seems to be an issue in the fetch command to get the revisions to do a 
diff
with through the History log window. The regular diff (compare to previous 
version)
menu option works correctly but when calling it from the hist dialog it fails to
retrieve one/both of the files.

Cody

Original comment by CodyPrec...@gmail.com on 4 Jun 2009 at 4:05

GoogleCodeExporter commented 9 years ago

Original comment by CodyPrec...@gmail.com on 7 Nov 2009 at 4:56