A new version of git-cola is available fixing several usability issues,
and adding some new features. Changelog can be found at
https://github.com/git-cola/git-cola/blob/64f94b51573653a2f31db24fdf2239387bce2b2a/share/doc/git-cola/relnotes.rst
'make test' runs successfully, and I've been running this version for
the last couple of days on amd64 without encountering a regression.
Before committing the diff below: any users who like to do some
additional testing?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git-cola/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile 27 Jun 2018 21:03:39 -0000 1.23
+++ Makefile 5 Sep 2018 12:49:10 -0000
@@ -2,9 +2,8 @@
COMMENT = python powered git gui
-MODPY_EGG_VERSION= 3.1
+MODPY_EGG_VERSION= 3.2
DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION}
-REVISION = 0
GH_ACCOUNT = git-cola
GH_PROJECT = git-cola
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/git-cola/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 9 May 2018 04:24:30 -0000 1.9
+++ distinfo 5 Sep 2018 12:49:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (git-cola-3.1.tar.gz) = p6CD+EaXpW7nyRDM/GgNNsXER8a1o1IuAb/53pFHT1c=
-SIZE (git-cola-3.1.tar.gz) = 1179782
+SHA256 (git-cola-3.2.tar.gz) = QAXnFNt4sHPB74veVUhUUtx6MeO4zAtNYNYRL/teoig=
+SIZE (git-cola-3.2.tar.gz) = 1208723
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/devel/git-cola/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile
--- patches/patch-Makefile 9 May 2018 04:24:30 -0000 1.4
+++ patches/patch-Makefile 5 Sep 2018 12:49:10 -0000
@@ -8,12 +8,12 @@ code is not used when running git-cola o
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -53,7 +53,7 @@ ifdef V
- else
- QUIET = --quiet
- endif
--PYTEST_FLAGS = $(QUIET) $(TEST_VERBOSE) --doctest-modules
-+PYTEST_FLAGS = $(QUIET) $(TEST_VERBOSE)
- FLAKE8_FLAGS = --max-line-length=80 --statistics --doctests --format=pylint
- PYLINT_FLAGS = --rcfile=.pylintrc
- ifdef color
+@@ -72,7 +72,7 @@ FLAKE8_FLAGS += --format=pylint
+ FLAKE8_FLAGS += --doctests
+
+ PYTEST_FLAGS = $(QUIET) $(TEST_VERBOSE)
+-PYTEST_FLAGS += --doctest-modules
++#PYTEST_FLAGS += --doctest-modules
+
+ TOX_FLAGS = $(VERBOSE_SHORT) --develop --skip-missing-interpreters
+
Index: patches/patch-cola_app_py
===================================================================
RCS file: /cvs/ports/devel/git-cola/patches/patch-cola_app_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-cola_app_py
--- patches/patch-cola_app_py 9 May 2018 04:24:30 -0000 1.4
+++ patches/patch-cola_app_py 5 Sep 2018 12:49:10 -0000
@@ -5,7 +5,7 @@ Use ssh-askpass implementation from xeno
Index: cola/app.py
--- cola/app.py.orig
+++ cola/app.py
-@@ -86,7 +86,7 @@ def setup_environment():
+@@ -90,7 +90,7 @@ def setup_environment():
elif sys.platform == 'darwin':
askpass = resources.share('bin', 'ssh-askpass-darwin')
else:
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/git-cola/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 27 Jun 2018 21:03:40 -0000 1.12
+++ pkg/PLIST 5 Sep 2018 12:49:10 -0000
@@ -202,6 +202,8 @@ share/git-cola/lib/cola/resources.py
share/git-cola/lib/cola/resources.pyc
share/git-cola/lib/cola/settings.py
share/git-cola/lib/cola/settings.pyc
+share/git-cola/lib/cola/spellcheck.py
+share/git-cola/lib/cola/spellcheck.pyc
share/git-cola/lib/cola/textwrap.py
share/git-cola/lib/cola/textwrap.pyc
share/git-cola/lib/cola/utils.py
@@ -302,6 +304,8 @@ share/git-cola/lib/qtpy/QtDesigner.py
share/git-cola/lib/qtpy/QtDesigner.pyc
share/git-cola/lib/qtpy/QtGui.py
share/git-cola/lib/qtpy/QtGui.pyc
+share/git-cola/lib/qtpy/QtHelp.py
+share/git-cola/lib/qtpy/QtHelp.pyc
share/git-cola/lib/qtpy/QtMultimedia.py
share/git-cola/lib/qtpy/QtMultimedia.pyc
share/git-cola/lib/qtpy/QtNetwork.py
@@ -310,6 +314,8 @@ share/git-cola/lib/qtpy/QtOpenGL.py
share/git-cola/lib/qtpy/QtOpenGL.pyc
share/git-cola/lib/qtpy/QtPrintSupport.py
share/git-cola/lib/qtpy/QtPrintSupport.pyc
+share/git-cola/lib/qtpy/QtSql.py
+share/git-cola/lib/qtpy/QtSql.pyc
share/git-cola/lib/qtpy/QtSvg.py
share/git-cola/lib/qtpy/QtSvg.pyc
share/git-cola/lib/qtpy/QtTest.py
