Issues with checkpoints in Sigil 1.9.20

[RbnJrg]

I don't know if is an issue of Sigil but when I want to create a checkpoint, I receive the following message:

Traceback (most recent call last):

  File "/usr/share/sigil/python3lib/repomanager.py", line 493, in performCommit
    tags = porcelain.list_tags(repo='.')

AttributeError: module 'dulwich.porcelain' has no attribute 'list_tags'

And when I want to make a restore from a previous checkpoint, I receive the following:

Traceback (most recent call last):

  File "/usr/share/sigil/python3lib/repomanager.py", line 405, in generate_epub_from_tag
    tags = porcelain.list_tags(repo='.')

AttributeError: module 'dulwich.porcelain' has no attribute 'list_tags'

I'm working under Arch Linux.

[DiapDealer]

My guess is that Dulwich dropped the undocumented list_tags in a recent version. That, of course, epically sucks.

[DiapDealer]

Looks like list_tags has been deprecated for a bit (in favor of tag_list). It was dropped sometime after 0.20.44.

Until we release a fixed version, your only option is to roll back your dulwich version to 0.20.44 or earlier. I'm guessing dulwich 0.20.45 is probably OK as well, but I haven't checked. But since 0.20.46 was released 12 days ago, it's the likely culprit (EDIT: confirmed).

It's, of course, rather uncool of them to remove working functions in such a minor version update.

https://github.com/jelmer/dulwich/co...66baefb44be532

[KevinH]

Yes that sucks. I wonder how far back its replacement tag_list support was added?

[DiapDealer]

Try this on for size...

If you build your own Sigil, replace /usr/local/share/sigil/python3lib/repomanager.py with the repomanager.py attached to his post. If you use the Sigil from the pacman repos, the file to replace will be /usr/share/sigil/python3lib/repomanager.py. If it works, that should hold you until the official fix is released.

It's working for me with both pre- and post dulwich 0.20.46.

[DiapDealer]

Originally Posted by KevinH

Yes that sucks. I wonder how far back its replacement tag_list support was added?

I gave up looking. The updated repomanager.py file I attached in my previous post seems to do the trick, but if you want to do something else, that's fine with me. Instead of checking the version, we could simply catch list_tags import errors and return tag_list instead.

[DiapDealer]

We should probably run through all the Dulwich pieces we use and make sure nothing else is in danger of being dumped.

[KevinH]

Since it works in both, please just push this fix to Sigil master.

Nicely done!

Originally Posted by DiapDealer

Try this on for size...

If you build your own Sigil, replace /usr/local/share/sigil/python3lib/repomanager.py with the repomanager.py attached to his post. If you use the Sigil from the pacman repos, the file to replace will be /usr/share/sigil/python3lib/repomanager.py. If it works, that should hold you until the official fix is released.

It's working for me with both pre- and post dulwich 0.20.46.

[KevinH]

Originally Posted by DiapDealer

We should probably run through all the Dulwich pieces we use and make sure nothing else is in danger of being dumped.

Yes, good idea. I will grab the latest dulwich and look for deprecation warnings.

Unfortunately, dulwich use of versions and its development is unique to say the least.

I donated literally a bunch of code to dulwich to do a simple merge (not just a fast forward) years ago now and virtually none of it was integrated. It seems something as basic as a merge would have been a priority but .... I have given up caring. They seem to worry more about style versus substance.

[DiapDealer]

Originally Posted by KevinH

Since it works in both, please just push this fix to Sigil master.

Nicely done!

Will do.

Thanks for catching this so quickly @RbnJrg! This would have actually broken after the Sigil 1.9.20 release.

[RbnJrg]

Originally Posted by DiapDealer

Will do.

Thanks for catching this so quickly @RbnJrg! This would have actually broken after the Sigil 1.9.20 release.

Thanks to you for fixing the issue so fast! The replacement of repomanager.py did the trick!

[KevinH]

Took a look at the 0.20.45 version before the removal of the deprecated stuff. We do not use dulwich/client.py at all, we do not use index.py's commit_index, we already use tag_create() instead of tag(), and we do not directly work with the RefsContainer objects.

So list_tags to tag_list is the only change that should impact us.

That said I looked back to dulwich 0.18 and even dulwich 0.16 and we could probably safely just change it to tag_list since it existed way back then as well. I think 0.16 is the version of dulwich we first used to introduce checkpointing to Sigil.

So we should be good with your change all in all.

[DiapDealer]

I may just change it to tag_list() outright. It would be a lot more straightforward that way.

[KevinH]

Yes, agreed. Please do when you get a free moment.