Re: update and unbreak devel/hgview

On Mon, Oct 30, 2017 at 06:53:59PM +0100, Juan Francisco Cantero Hurtado wrote:
> Looks like hgview is another package with no users :P . It has been
> broken since August.
>
> Reported by landry@:
> for l in (self.repo.sjoin('lock'), self.repo.join('wlock')):
> AttributeError: 'localrepository' object has no attribute 'join'
>
> OK?

Same patch for -stable. edd, OK?


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/hgview/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 2 Apr 2015 14:21:13 -0000 1.3
+++ Makefile 30 Oct 2017 22:07:27 -0000
@@ -3,6 +3,7 @@
COMMENT = fast Mercurial log navigator

MODPY_EGG_VERSION = 1.8.2
+REVISION = 0
DISTNAME = hgview-${MODPY_EGG_VERSION}

CATEGORIES = devel
Index: patches/patch-hgviewlib_qt4_hgrepoviewer_py
===================================================================
RCS file: patches/patch-hgviewlib_qt4_hgrepoviewer_py
diff -N patches/patch-hgviewlib_qt4_hgrepoviewer_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-hgviewlib_qt4_hgrepoviewer_py 30 Oct 2017 22:07:27 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+repo.join has been deprecated since Mercurial 4.2.
+
+Index: hgviewlib/qt4/hgrepoviewer.py
+--- hgviewlib/qt4/hgrepoviewer.py.orig
++++ hgviewlib/qt4/hgrepoviewer.py
+@@ -565,7 +565,7 @@ class HgRepoViewer(QtGui.QMainWindow, HgDialogMixin, _
+ (self.repo.root, ".hg", "dirstate"),
+ (self.repo.root, ".hg", "store", "phasesroots"),]
+ watchedfiles = [os.path.join(*wf) for wf in watchedfiles]
+- for l in (self.repo.sjoin('lock'), self.repo.join('wlock')):
++ for l in (self.repo.sjoin('lock'), self.repo.vfs.join('wlock')):
+ try:
+ if util.readlock(l):
+ break