Page MenuHomeFreeBSD

New port: devel/py-hg-evolve: Changeset Evolution with Mercurial
ClosedPublic

Authored by rhurlin on Nov 9 2020, 6:03 PM.

Details

Summary

evolve is a Mercurial extension for faster and safer mutable history. It implements the changeset evolution concept for Mercurial[1][2].

[1] https://www.mercurial-scm.org/doc/evolution/#
[2] https://pypi.org/project/hg-evolve/

This is the first draft of the new port, requested by arrowd ;)
Unfortunately there is a conflict with an identically named and equally placed file of the dependent port devel/mercurial:

#make install
===>  Installing for py37-hg-evolve-10.1.0
===>  Checking if py37-hg-evolve is already installed
===>   Registering installation for py37-hg-evolve-10.1.0
Installing py37-hg-evolve-10.1.0...
pkg-static: py37-hg-evolve-10.1.0 conflicts with mercurial-5.5_1 (installs files into the same place).  Problematic file: /usr/local/lib/python3.7/site-packages/hgext3rd/__init__.py
*** Error code 70

I need some help here to decide which strategy is the best way to avoid the conflict.

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

rhurlin retitled this revision from New port:devel/py-hg-evolve: Changeset Evolution with Mercurial to New port: devel/py-hg-evolve: Changeset Evolution with Mercurial.

Looking at what arch does is always a good source of inspiration:
https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=hg-evolve
They seem to just delete the conflicting file :)

Is the content of the two files identical?

Looking at what arch does is always a good source of inspiration:
https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=hg-evolve
They seem to just delete the conflicting file :)

Is the content of the two files identical?

Good idea, many thanks :)

Obviously the files are almost identical, only one empty line is missing:

#diff -urN /usr/local/lib/python3.7/site-packages/hgext3rd/__init__.py work-py37/stage/usr/local/lib/python3.7/site-packages/hgext3rd/__init__.py
--- /usr/local/lib/python3.7/site-packages/hgext3rd/__init__.py	2020-08-03 19:43:51.000000000 +0200
+++ work-py37/stage/usr/local/lib/python3.7/site-packages/hgext3rd/__init__.py	2019-09-21 17:30:33.000000000 +0200
@@ -1,5 +1,4 @@
 # name space package to host third party extensions
 from __future__ import absolute_import
 import pkgutil
-
 __path__ = pkgutil.extend_path(__path__, __name__)

I'm still waiting for a reply from Gleb, as he is interested in this new port ...

This is how I solve the conflict in my port:

https://reviews.freebsd.org/source/ports/browse/head/devel/tortoisehg/Makefile$38

The port looks fine, but I still don't have a time to run-test it. I'll do this later today.

Solve the conflict with devel/mercurial.

Quick testing tells that it seems to be working. Thanks a lot for doing this!

Macro shipit:

This revision is now accepted and ready to land.Nov 10 2020, 8:37 AM