Hello community,
here is the log from the commit of package git-cola for openSUSE:Factory
checked in at 2015-06-16 14:06:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/git-cola (Old)
and /work/SRC/openSUSE:Factory/.git-cola.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git-cola"
Changes:
--------
--- /work/SRC/openSUSE:Factory/git-cola/git-cola.changes 2015-06-15
17:51:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.git-cola.new/git-cola.changes 2015-06-16
14:06:16.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Jun 16 06:36:42 UTC 2015 - marcin.ba...@gmail.com
+
+- Update to 2.2.1
+- Fixes
+* Fixed the “Sign off” feature in the commit message editor.
+
+-------------------------------------------------------------------
Old:
----
v2.2.tar.gz
New:
----
v2.2.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ git-cola.spec ++++++
--- /var/tmp/diff_new_pack.i9TXQA/_old 2015-06-16 14:06:17.000000000 +0200
+++ /var/tmp/diff_new_pack.i9TXQA/_new 2015-06-16 14:06:17.000000000 +0200
@@ -18,7 +18,7 @@
Name: git-cola
-Version: 2.2
+Version: 2.2.1
Release: 0
Summary: Sleek and powerful git GUI
License: GPL-2.0+
++++++ v2.2.tar.gz -> v2.2.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-cola-2.2/cola/_version.py
new/git-cola-2.2.1/cola/_version.py
--- old/git-cola-2.2/cola/_version.py 2015-06-15 09:07:56.000000000 +0200
+++ new/git-cola-2.2.1/cola/_version.py 2015-06-15 20:21:56.000000000 +0200
@@ -1,2 +1,2 @@
# The current git-cola version
-VERSION = '2.2'
+VERSION = '2.2.1'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-cola-2.2/cola/models/main.py
new/git-cola-2.2.1/cola/models/main.py
--- old/git-cola-2.2/cola/models/main.py 2015-06-15 09:07:56.000000000
+0200
+++ new/git-cola-2.2.1/cola/models/main.py 2015-06-15 20:21:56.000000000
+0200
@@ -119,9 +119,10 @@
self.project = os.path.basename(self.git.worktree())
return is_valid
- def set_commitmsg(self, msg):
+ def set_commitmsg(self, msg, notify=True):
self.commitmsg = msg
- self.notify_observers(self.message_commit_message_changed, msg)
+ if notify:
+ self.notify_observers(self.message_commit_message_changed, msg)
def save_commitmsg(self, msg):
path = self.git.git_path('GIT_COLA_MSG')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-cola-2.2/cola/widgets/commitmsg.py
new/git-cola-2.2.1/cola/widgets/commitmsg.py
--- old/git-cola-2.2/cola/widgets/commitmsg.py 2015-06-15 09:07:56.000000000
+0200
+++ new/git-cola-2.2.1/cola/widgets/commitmsg.py 2015-06-15
20:21:56.000000000 +0200
@@ -28,7 +28,6 @@
QtGui.QWidget.__init__(self, parent)
self.model = model
- self.notifying = False
self.spellcheck_initialized = False
self._linebreak = None
@@ -153,8 +152,8 @@
self.model.add_observer(self.model.message_commit_message_changed,
self._set_commit_message)
- self.connect(self, SIGNAL('set_commit_message(PyQt_PyObject'),
- self.set_commit_message)
+ self.connect(self, SIGNAL('set_commit_message(PyQt_PyObject)'),
+ self.set_commit_message, Qt.QueuedConnection)
self.connect(self.summary, SIGNAL('cursorPosition(int,int)'),
self.emit_position)
@@ -273,11 +272,9 @@
def commit_message_changed(self, value=None):
"""Update the model when values change"""
- self.notifying = True
message = self.commit_message()
- self.model.set_commitmsg(message)
+ self.model.set_commitmsg(message, notify=False)
self.refresh_palettes()
- self.notifying = False
self.update_actions()
def clear(self):
@@ -306,11 +303,6 @@
def set_commit_message(self, message):
"""Set the commit message to match the observed model"""
- if self.notifying:
- # Calling self.model.set_commitmsg(message) causes us to
- # loop around so break the loop
- return
-
# Parse the "summary" and "description" fields
umsg = ustr(message)
lines = umsg.splitlines()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-cola-2.2/contrib/win32/fetch-pyqt-windows.sh
new/git-cola-2.2.1/contrib/win32/fetch-pyqt-windows.sh
--- old/git-cola-2.2/contrib/win32/fetch-pyqt-windows.sh 1970-01-01
01:00:00.000000000 +0100
+++ new/git-cola-2.2.1/contrib/win32/fetch-pyqt-windows.sh 2015-06-15
20:21:56.000000000 +0200
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+set -e
+
+# Download and the PyQt4 Windows installer and unpack files from it into
+# pynsist_pkgs
+
+cd "$(dirname "0")"
+
+PY_VERSION=2.7
+PYQT_VERSION=4.11.4
+QT_VERSION=4.8.7
+BITNESS=32
+
+INSTALLER_FILE=PyQt4-${PYQT_VERSION}-gpl-Py${PY_VERSION}-Qt${QT_VERSION}-x${BITNESS}.exe
+URL=http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-${PYQT_VERSION}/${INSTALLER_FILE}
+
+if ! test -e "$INSTALLER_FILE"
+then
+ echo "Downloading $URL"
+ curl --location "$URL/download" -o "$INSTALLER_FILE"
+fi
+
+rm -rf pyqt4-windows
+mkdir pyqt4-windows
+7z x -opyqt4-windows "$INSTALLER_FILE"
+
+PKGS=../../pynsist_pkgs
+rm -rf $PKGS
+mkdir $PKGS
+
+echo "Rearranging files into pynsist_pkgs..."
+mv 'pyqt4-windows/Lib/site-packages'/* $PKGS
+rm $PKGS/PyQt4/assistant.exe $PKGS/PyQt4/designer.exe
+
+rm -r pyqt4-windows
+echo "Done"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-cola-2.2/contrib/win32/fetch_pyqt_windows.sh
new/git-cola-2.2.1/contrib/win32/fetch_pyqt_windows.sh
--- old/git-cola-2.2/contrib/win32/fetch_pyqt_windows.sh 2015-06-15
09:07:56.000000000 +0200
+++ new/git-cola-2.2.1/contrib/win32/fetch_pyqt_windows.sh 1970-01-01
01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-# Download and the PyQt4 Windows installer and unpack files from it into
-# pynsist_pkgs
-
-set -e
-
-cd "$( dirname "${BASH_SOURCE[0]}" )"
-
-PY_VERSION=3.4
-PYQT_VERSION=4.11.3
-QT_VERSION=4.8.6
-BITNESS=32
-
-INSTALLER_FILE=PyQt4-${PYQT_VERSION}-gpl-Py${PY_VERSION}-Qt${QT_VERSION}-x${BITNESS}.exe
-URL=http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-${PYQT_VERSION}/${INSTALLER_FILE}
-
-if [ ! -e "$INSTALLER_FILE" ]
-then
- wget -O "$INSTALLER_FILE" "$URL"
-fi
-
-rm -rf pyqt4-windows
-mkdir pyqt4-windows
-7z x -opyqt4-windows "$INSTALLER_FILE"
-
-PKGS=../../pynsist_pkgs
-rm -rf $PKGS
-mkdir $PKGS
-
-echo "Rearranging files into pynsist_pkgs..."
-mv 'pyqt4-windows/Lib/site-packages'/* $PKGS
-rm $PKGS/PyQt4/assistant.exe $PKGS/PyQt4/designer.exe
-mv 'pyqt4-windows/$_OUTDIR/'*.pyd $PKGS/PyQt4/
-
-rm -r pyqt4-windows
-echo "Done"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-cola-2.2/pynsist.cfg
new/git-cola-2.2.1/pynsist.cfg
--- old/git-cola-2.2/pynsist.cfg 2015-06-15 09:07:56.000000000 +0200
+++ new/git-cola-2.2.1/pynsist.cfg 2015-06-15 20:21:56.000000000 +0200
@@ -1,11 +1,11 @@
[Application]
-name=Git Cola
-version=2.1.2
+name=git-cola
+version=2.2.1
entry_point=cola.main:shortcut_launch
icon=share/git-cola/icons/git-cola.ico
[Python]
-version=3.4.3
+version=2.7.10
bitness=32
[Include]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-cola-2.2/share/doc/git-cola/relnotes/v2.2.1.rst
new/git-cola-2.2.1/share/doc/git-cola/relnotes/v2.2.1.rst
--- old/git-cola-2.2/share/doc/git-cola/relnotes/v2.2.1.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/git-cola-2.2.1/share/doc/git-cola/relnotes/v2.2.1.rst 2015-06-15
20:21:56.000000000 +0200
@@ -0,0 +1,8 @@
+.. _v2.2.1:
+
+git-cola v2.2.1
+===============
+
+Fixes
+-----
+* Fixed the "Sign off" feature in the commit message editor.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-cola-2.2/share/doc/git-cola/relnotes.rst
new/git-cola-2.2.1/share/doc/git-cola/relnotes.rst
--- old/git-cola-2.2/share/doc/git-cola/relnotes.rst 2015-06-15
09:07:56.000000000 +0200
+++ new/git-cola-2.2.1/share/doc/git-cola/relnotes.rst 2015-06-15
20:21:56.000000000 +0200
@@ -6,6 +6,7 @@
:titlesonly:
relnotes/unreleased
+ relnotes/v2.2.1
relnotes/v2.2
relnotes/v2.1.2
relnotes/v2.1.1
