On 09/08/2019, Mads Kiilerich wrote:
> On 8/9/19 10:49 AM, Arthur Lutz wrote:
> > Mads, thanks for helping me out, indeed I'm not very at ease with
> > integrating patches through email.
>
>
> Somehow, the repo ended up *not* using the change from Simon's July 30th
> mail -
> https://bitbucket.org/kiilerix/logilab-hgview/commits/5ec8742f142b15ce3f11e738c36629f72ff350c5?at=default
>
> Instead, an earlier version was used, leaving a bit of tech debt behind -
> https://bitbucket.org/logilab/hgview/commits/935e96716f5dea5a1b2dfd8e7d0cf66725b08364
> .
>
> No blocker, though ...
I had issue with theses patches (tested with both of them). Tested with
mercurial 5.0 and 5.1
This trigger a new error:
Traceback (most recent call last):
File "/home/ppepiot/src/hgview/hgviewlib/util.py", line 298, in <lambda>
composed = lambda *args, **kwargs: f(g(*args, **kwargs))
File "/home/ppepiot/src/hgview/hgviewlib/qt4/hgfileview.py", line 293, in
displayFile
except HgLookupError: # occur on deleted files
NameError: global name 'HgLookupError' is not defined
Which was obviously introduced by
https://hg.logilab.org/master/hgview/rev/d22053bff9c0
When removing the NameError I get (the real error):
Traceback (most recent call last):
File "/home/ppepiot/src/hgview/hgviewlib/util.py", line 298, in <lambda>
composed = lambda *args, **kwargs: f(g(*args, **kwargs))
File "/home/ppepiot/src/hgview/hgviewlib/qt4/hgfileview.py", line 300, in
displayFile
flag, data = self._model.graph.filedata(filename, self._ctx.rev(), mode)
File "/home/ppepiot/src/hgview/hgviewlib/hggraph.py", line 608, in filedata
parentctx = self.repo[self._fileparent(fctx)]
File "/home/ppepiot/src/hgview/hgviewlib/hggraph.py", line 635, in _fileparent
return fctx.p1().rev()
File "/usr/lib/python2.7/dist-packages/mercurial/context.py", line 914, in p1
return self.parents()[0]
File "/usr/lib/python2.7/dist-packages/mercurial/context.py", line 1701, in
parents
pl = [(path, filenode(pcl[0], path), fl)]
File "/usr/lib/python2.7/dist-packages/mercurial/context.py", line 1691, in
filenode
return ctx._manifest.get(path, nullid)
File "/usr/lib/python2.7/dist-packages/mercurial/manifest.py", line 560, in
get
return self._lm[key][0]
TypeError: getitem: manifest keys must be a string.
Any idea how to fix theses as well ? Which hgview/mercurial version do you use
which require these patches ? How to reproduce the issue you're trying to solve
?
I'm going to backout this changeset because I need a working version
with mercurial 5.1 for our internal users.
Thanks!
_______________________________________________
Python-Projects mailing list
[email protected]
https://lists.logilab.org/mailman/listinfo/python-projects
