From 7fe7690eeddaf1e3af4199dd4985760061b7db71 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tiziano=20M=C3=BCller?= Date: Tue, 18 Oct 2011 08:32:46 +0000 Subject: [PATCH] Version bump. Dropped old. Package-Manager: portage-2.1.10.27/cvs/Linux x86_64 --- dev-vcs/cola/ChangeLog | 9 +- dev-vcs/cola/Manifest | 22 +- dev-vcs/cola/cola-1.4.3.2-r1.ebuild | 105 ------ dev-vcs/cola/cola-1.4.3.2.ebuild | 103 ------ dev-vcs/cola/cola-1.4.3.3.ebuild | 103 ------ ...ola-1.4.3.1.ebuild => cola-1.4.3.5.ebuild} | 8 +- dev-vcs/cola/files/1.4.3.2-backport.patch | 336 ------------------ 7 files changed, 19 insertions(+), 667 deletions(-) delete mode 100644 dev-vcs/cola/cola-1.4.3.2-r1.ebuild delete mode 100644 dev-vcs/cola/cola-1.4.3.2.ebuild delete mode 100644 dev-vcs/cola/cola-1.4.3.3.ebuild rename dev-vcs/cola/{cola-1.4.3.1.ebuild => cola-1.4.3.5.ebuild} (88%) delete mode 100644 dev-vcs/cola/files/1.4.3.2-backport.patch diff --git a/dev-vcs/cola/ChangeLog b/dev-vcs/cola/ChangeLog index d0bf720315c2..365a5b7c382f 100644 --- a/dev-vcs/cola/ChangeLog +++ b/dev-vcs/cola/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-vcs/cola # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.12 2011/09/09 10:57:29 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.13 2011/10/18 08:32:46 dev-zero Exp $ + +*cola-1.4.3.5 (18 Oct 2011) + + 18 Oct 2011; Tiziano Müller + -files/1.4.3.2-backport.patch, -cola-1.4.3.1.ebuild, -cola-1.4.3.2.ebuild, + -cola-1.4.3.2-r1.ebuild, -cola-1.4.3.3.ebuild, +cola-1.4.3.5.ebuild: + Version bump. Dropped old. 09 Sep 2011; Justin Lecher cola-1.4.3.4.ebuild: keyworded *-linux, tested by me diff --git a/dev-vcs/cola/Manifest b/dev-vcs/cola/Manifest index 8156137adc46..37eef3b29afc 100644 --- a/dev-vcs/cola/Manifest +++ b/dev-vcs/cola/Manifest @@ -1,26 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX 1.3.8-disable-tests.patch 855 RMD160 0c356e7f28ad1436a1d7d58af1de6b0071e3636d SHA1 49daeb7442f7a859d9c37b58e525d6c3498760f4 SHA256 cb0d81baa5385d1f394b756b9bf21a2ee9b35bb3765ae5a47216519a1e1b6465 -AUX 1.4.3.2-backport.patch 10708 RMD160 908eb792fe0f18ff166ffa7d80415fa40d98c688 SHA1 60abb28d95df04aef06d436006307df2586641d6 SHA256 4b4fcb6b88d718c9374203b510b7daf67c31a0845bf68543d03fcf38cc5bc4ef AUX index.html 355 RMD160 f01c51559321acd610cfa38e6ebdaa80a96be8fa SHA1 f08daa85670af655ad92e41026008cb2c1f2d0ef SHA256 9b092445f2da302365c22fae670ad75f8d0a57ca64b4c99bf5662b9999869a60 -DIST cola-1.4.3.1.tar.gz 515571 RMD160 83fe1488705683f812af2ccd9206c67e9f1f3ec0 SHA1 a3fb22f2387cda069559441e11a8f52aa16f381c SHA256 3695e0c86c73c77909988e43c043f33c7394762c44e795996c9214d7edaa732a -DIST cola-1.4.3.2.tar.gz 515937 RMD160 b387039a7e6945c9cffad41926fc9fed0e39d4c6 SHA1 72fd84839e3c4f9e5e877a92e39a3d7fdd9fecaf SHA256 8a28786e51a5a5ca5aea10a58b5bd0f2dfce6bfa6cbc3a4a1d9395092548063d -DIST cola-1.4.3.3.tar.gz 516703 RMD160 4d8c5675689d7d50fa5ec08f47db779162b80707 SHA1 9f686fec54e30d992e67c70ee627fff8aa92bd3f SHA256 dbc37472910016bd7052f937689fcc0563df1152b13ffa928cffeffb77b97434 DIST cola-1.4.3.4.tar.gz 517209 RMD160 3e51ded13148b09f3c7a8145ec95ae569c1af4ac SHA1 15866ae4fbe21791d9291c51f302a9a1fd276393 SHA256 36e6a1870378a213a5f36a91ac3d38b612cf578822b72e3d97dadc65c79c935b -EBUILD cola-1.4.3.1.ebuild 2160 RMD160 5d711f96200bc2589a76d2151ea0aeed9b4a41b7 SHA1 cc35e095bf8f3583373b47c4e1dd7bfb44ad49dc SHA256 75211aa4d28375861dd3e08fe8acc7cce7bcb0c6e7ab422becd6ebc0c18c5ab7 -EBUILD cola-1.4.3.2-r1.ebuild 2206 RMD160 2c3116046974cfa33b739616c35a26241a6b9cfe SHA1 9fb311c5f78a34022cbc5771b996b634b93a8855 SHA256 265202a47081918b54ada905f06fd72bbb8c905151b7c9cd990b957e4f302959 -EBUILD cola-1.4.3.2.ebuild 2160 RMD160 db7cf2e5f90d34279e72050b1836b03ed500c09a SHA1 d09ec00f6a172436dd3ba19da19d75c7099df3e6 SHA256 1236d21650039b0ae1ef40bb9d0d066aae712ebaefde5cc4f1b5e2e3199a4c0c -EBUILD cola-1.4.3.3.ebuild 2160 RMD160 862d2519698f9e9cfdab5e247b4ee683ed448234 SHA1 09e520375a46b918a1f95411f703b3e989fed060 SHA256 59d36e9b0dd13dc3621f67679c24c722ed97f6ede4b001d468f19bfafd23775b +DIST cola-1.4.3.5.tar.gz 518482 RMD160 af6e374ee6e17340951490aef514a11454e44ce3 SHA1 cc1258bce1d958a25283d91335b49964371fc008 SHA256 16651f8d17193cb69ae1dd71e455331817876875f84bb76176505ccd8d1b59ed EBUILD cola-1.4.3.4.ebuild 2186 RMD160 197bb39d8f4a92dd8b5b6468d8964bb446ee6461 SHA1 df4ffec06a700ff619b2b1969a7104f74940fdfb SHA256 8c68239cca7336f4940657b69c4f4c2b45b52d9517b9fabff1b57f68b4a2bd44 -MISC ChangeLog 3188 RMD160 1c25896883b8cbb88907a3ff35ad5a01b126e63b SHA1 483e302d137467d6cad40f10256be70061dec91b SHA256 2a647a33288623dd596d248b16685e977863f4cc3d760fda4a2ccf369cacbc47 +EBUILD cola-1.4.3.5.ebuild 2190 RMD160 5f1171307fb0765e3b191d94dec671f58e926177 SHA1 835d7b1aea5a3a57a36a5421a7516af1de15894a SHA256 204ee4e90c7b878a58b0910bb6765d297d53d174b3bff0f084811534ad1a9964 +MISC ChangeLog 3452 RMD160 f9aa29ec421eb627b76e31ff0b4ea692b465dccc SHA1 1383160c6e1b4c56a81f92a262aad14dfa2b4703 SHA256 77ef2a7abe78c8b249da39daf06d2a36dbaaab132646bf990aa8383fe4e5eee5 MISC metadata.xml 327 RMD160 bbcc6c45cde41ee3e186fb09024c487df2cf2aa0 SHA1 1aedaad61ffd291249e17d81b95ac2c3577a5b4e SHA256 58d6d26898968598d329ec34fc35da837fb8f6dab1271581091ba2c8b9b6fe21 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQEIAAYFAk59nKQACgkQfXuS5UK5QB0bOAP+OOA9HFlYVtkeI3hgPSuNr1wL -LCxaFtm/hlIBtIYMfr3A6swp843s5b1vBEr5vvWPQbeNlRj6RiO1sVO1FHEHfrWX -zaBr9MwfepTEx1GBvBDOxbiVsMiZ8gcYqw93NTn4F+dQCdWuURcxHfu4VzVyWhHj -Np0oWguPcaoiNZPeCJM= -=ddZ7 +iEYEARECAAYFAk6dOSAACgkQGwVqY66cHjAbrgCeLagXI/D4mHYVfQarHXLPQgXW +xwUAnjoyO00IXlO1ZSZbEURRPThjCEXi +=zl0Z -----END PGP SIGNATURE----- diff --git a/dev-vcs/cola/cola-1.4.3.2-r1.ebuild b/dev-vcs/cola/cola-1.4.3.2-r1.ebuild deleted file mode 100644 index 9e4a885997d0..000000000000 --- a/dev-vcs/cola/cola-1.4.3.2-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/cola-1.4.3.2-r1.ebuild,v 1.2 2011/04/23 07:05:25 jlec Exp $ - -EAPI="3" - -PYTHON_DEPEND="2" - -inherit distutils eutils - -DESCRIPTION="A sweet, carbonated git gui known for its sugary flavour and caffeine-inspired features." -HOMEPAGE="http://cola.tuxfamily.org/" -SRC_URI="http://cola.tuxfamily.org/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc test" - -RDEPEND=" - dev-python/jsonpickle - dev-python/pyinotify - dev-python/PyQt4 - dev-vcs/git" -DEPEND="${RDEPEND} - doc? ( - app-text/asciidoc - dev-python/sphinx - app-text/xmlto ) - sys-devel/gettext - test? ( dev-python/nose )" - -# tests currently broken due to unfinished translation framework -RESTRICT="test" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - # don't install docs into wrong location - sed -i \ - -e '/doc/d' \ - setup.py || die "sed failed" - - sed -i \ - -e "s|'doc', 'git-cola'|'doc', '${PF}', 'html'|" \ - cola/resources.py || die "sed failed" - - # don't prefix install path with homedir - rm setup.cfg - - epatch \ - "${FILESDIR}/1.3.8-disable-tests.patch" \ - "${FILESDIR}"/${PV}-backport.patch - - python_convert_shebangs 2 bin/git-cola share/git-cola/bin/ssh-askpass -} - -src_compile() { - distutils_src_compile - - if use doc ; then - cd share/doc/git-cola/ - emake all || die "building docs failed" - fi -} - -src_install() { - distutils_src_install - - # remove bundled libraries - rm -rf "${D}"/usr/share/git-cola/lib/{jsonpickle,simplejson} - - # remove wrong translation file - rm -rf "${D}/usr/share/locale/" - - insinto /usr/share/locale - doins -r share/locale/* - - cd share/doc/git-cola/ - dodoc *.txt - - if use doc ; then - dohtml -r _build/html/* - doman *.1 - else - dohtml "${FILESDIR}/index.html" - fi -} - -src_test() { - PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" nosetests \ - --verbose --with-doctest --with-id --exclude=jsonpickle --exclude=json \ - || die "running nosetests failed" -} - -pkg_postinst() { - python_mod_optimize /usr/share/git-cola/lib/cola -} - -pkg_postrm() { - python_mod_cleanup /usr/share/git-cola/lib/cola -} diff --git a/dev-vcs/cola/cola-1.4.3.2.ebuild b/dev-vcs/cola/cola-1.4.3.2.ebuild deleted file mode 100644 index 523e8ed7b586..000000000000 --- a/dev-vcs/cola/cola-1.4.3.2.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/cola-1.4.3.2.ebuild,v 1.2 2011/04/23 07:05:25 jlec Exp $ - -EAPI="3" - -PYTHON_DEPEND="2" - -inherit distutils eutils - -DESCRIPTION="A sweet, carbonated git gui known for its sugary flavour and caffeine-inspired features." -HOMEPAGE="http://cola.tuxfamily.org/" -SRC_URI="http://cola.tuxfamily.org/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc test" - -RDEPEND=" - dev-python/jsonpickle - dev-python/pyinotify - dev-python/PyQt4 - dev-vcs/git" -DEPEND="${RDEPEND} - doc? ( - app-text/asciidoc - dev-python/sphinx - app-text/xmlto ) - sys-devel/gettext - test? ( dev-python/nose )" - -# tests currently broken due to unfinished translation framework -RESTRICT="test" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - # don't install docs into wrong location - sed -i \ - -e '/doc/d' \ - setup.py || die "sed failed" - - sed -i \ - -e "s|'doc', 'git-cola'|'doc', '${PF}', 'html'|" \ - cola/resources.py || die "sed failed" - - # don't prefix install path with homedir - rm setup.cfg - - epatch "${FILESDIR}"/1.3.8-disable-tests.patch - - python_convert_shebangs 2 bin/git-cola share/git-cola/bin/ssh-askpass -} - -src_compile() { - distutils_src_compile - - if use doc ; then - cd share/doc/git-cola/ - emake all || die "building docs failed" - fi -} - -src_install() { - distutils_src_install - - # remove bundled libraries - rm -rf "${D}"/usr/share/git-cola/lib/{jsonpickle,simplejson} - - # remove wrong translation file - rm -rf "${D}/usr/share/locale/" - - insinto /usr/share/locale - doins -r share/locale/* - - cd share/doc/git-cola/ - dodoc *.txt - - if use doc ; then - dohtml -r _build/html/* - doman *.1 - else - dohtml "${FILESDIR}/index.html" - fi -} - -src_test() { - PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" nosetests \ - --verbose --with-doctest --with-id --exclude=jsonpickle --exclude=json \ - || die "running nosetests failed" -} - -pkg_postinst() { - python_mod_optimize /usr/share/git-cola/lib/cola -} - -pkg_postrm() { - python_mod_cleanup /usr/share/git-cola/lib/cola -} diff --git a/dev-vcs/cola/cola-1.4.3.3.ebuild b/dev-vcs/cola/cola-1.4.3.3.ebuild deleted file mode 100644 index 4e4019d2144f..000000000000 --- a/dev-vcs/cola/cola-1.4.3.3.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/cola-1.4.3.3.ebuild,v 1.1 2011/04/23 07:05:25 jlec Exp $ - -EAPI="3" - -PYTHON_DEPEND="2" - -inherit distutils eutils - -DESCRIPTION="A sweet, carbonated git gui known for its sugary flavour and caffeine-inspired features." -HOMEPAGE="http://cola.tuxfamily.org/" -SRC_URI="http://cola.tuxfamily.org/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc test" - -RDEPEND=" - dev-python/jsonpickle - dev-python/pyinotify - dev-python/PyQt4 - dev-vcs/git" -DEPEND="${RDEPEND} - doc? ( - app-text/asciidoc - dev-python/sphinx - app-text/xmlto ) - sys-devel/gettext - test? ( dev-python/nose )" - -# tests currently broken due to unfinished translation framework -RESTRICT="test" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - # don't install docs into wrong location - sed -i \ - -e '/doc/d' \ - setup.py || die "sed failed" - - sed -i \ - -e "s|'doc', 'git-cola'|'doc', '${PF}', 'html'|" \ - cola/resources.py || die "sed failed" - - # don't prefix install path with homedir - rm setup.cfg - - epatch "${FILESDIR}"/1.3.8-disable-tests.patch - - python_convert_shebangs 2 bin/git-cola share/git-cola/bin/ssh-askpass -} - -src_compile() { - distutils_src_compile - - if use doc ; then - cd share/doc/git-cola/ - emake all || die "building docs failed" - fi -} - -src_install() { - distutils_src_install - - # remove bundled libraries - rm -rf "${D}"/usr/share/git-cola/lib/{jsonpickle,simplejson} - - # remove wrong translation file - rm -rf "${D}/usr/share/locale/" - - insinto /usr/share/locale - doins -r share/locale/* - - cd share/doc/git-cola/ - dodoc *.txt - - if use doc ; then - dohtml -r _build/html/* - doman *.1 - else - dohtml "${FILESDIR}/index.html" - fi -} - -src_test() { - PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" nosetests \ - --verbose --with-doctest --with-id --exclude=jsonpickle --exclude=json \ - || die "running nosetests failed" -} - -pkg_postinst() { - python_mod_optimize /usr/share/git-cola/lib/cola -} - -pkg_postrm() { - python_mod_cleanup /usr/share/git-cola/lib/cola -} diff --git a/dev-vcs/cola/cola-1.4.3.1.ebuild b/dev-vcs/cola/cola-1.4.3.5.ebuild similarity index 88% rename from dev-vcs/cola/cola-1.4.3.1.ebuild rename to dev-vcs/cola/cola-1.4.3.5.ebuild index 681dc2179de2..cd0db88d5f11 100644 --- a/dev-vcs/cola/cola-1.4.3.1.ebuild +++ b/dev-vcs/cola/cola-1.4.3.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/cola-1.4.3.1.ebuild,v 1.2 2011/04/23 07:05:25 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/cola-1.4.3.5.ebuild,v 1.1 2011/10/18 08:32:46 dev-zero Exp $ EAPI="3" @@ -14,7 +14,7 @@ SRC_URI="http://cola.tuxfamily.org/releases/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc test" RDEPEND=" @@ -69,10 +69,10 @@ src_install() { distutils_src_install # remove bundled libraries - rm -rf "${D}"/usr/share/git-cola/lib/{jsonpickle,simplejson} + rm -rf "${ED}"/usr/share/git-cola/lib/{jsonpickle,simplejson} # remove wrong translation file - rm -rf "${D}/usr/share/locale/" + rm -rf "${ED}/usr/share/locale/" insinto /usr/share/locale doins -r share/locale/* diff --git a/dev-vcs/cola/files/1.4.3.2-backport.patch b/dev-vcs/cola/files/1.4.3.2-backport.patch deleted file mode 100644 index 00132642edcf..000000000000 --- a/dev-vcs/cola/files/1.4.3.2-backport.patch +++ /dev/null @@ -1,336 +0,0 @@ -Backport from HEAD, fixes following issues: - -* File -> Clone doesn't work -* Clone doesn't work with --prompt -* Always checks out $HOME.git if HOME is under git controll, when launched from desktop launcher -* Same for opening bookmarks - -From 6a09349645ca4b576a0eeac69e83adadbd7887e4 Mon Sep 17 00:00:00 2001 -From: David Aguilar -Date: Fri, 15 Apr 2011 01:37:14 -0700 -Subject: [PATCH 2/9] bookmarks: Handle home directories with unicode characters - -Closes #74 - -Signed-off-by: David Aguilar ---- - cola/controllers/bookmark.py | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/cola/controllers/bookmark.py b/cola/controllers/bookmark.py -index 61b9c79..57cc954 100644 ---- a/cola/controllers/bookmark.py -+++ b/cola/controllers/bookmark.py -@@ -5,6 +5,7 @@ import sys - - from PyQt4 import QtGui - -+from cola import core - from cola import utils - from cola import qtutils - from cola.qobserver import QObserver -@@ -19,7 +20,7 @@ def save_bookmark(): - - """ - model = settings.SettingsManager.settings() -- model.add_bookmark(os.getcwd()) -+ model.add_bookmark(core.decode(os.getcwd())) - settings.SettingsManager.save() - qtutils.information("Bookmark Saved") - -@@ -31,6 +32,7 @@ def manage_bookmarks(): - ctl = BookmarkController(model, view) - view.show() - -+ - class BookmarkController(QObserver): - """Handles interactions with the bookmarks dialog - """ --- -1.7.3.4 - - -From bc5940bd362a4750b2b37107a9c6272302f93bd4 Mon Sep 17 00:00:00 2001 -From: David Aguilar -Date: Fri, 15 Apr 2011 01:38:00 -0700 -Subject: [PATCH 3/9] guicmds: Handle cloning repos that contain unicode characters - -Closes #74 - -Signed-off-by: David Aguilar ---- - cola/guicmds.py | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/cola/guicmds.py b/cola/guicmds.py -index b98a445..353bee0 100644 ---- a/cola/guicmds.py -+++ b/cola/guicmds.py -@@ -134,7 +134,7 @@ def cherry_pick(): - cola.notifier().broadcast(signals.cherry_pick, commits) - - --def clone_repo(parent, spawn=True): -+def clone_repo(spawn=True): - """ - Present GUI controls for cloning a repository - -@@ -142,7 +142,7 @@ def clone_repo(parent, spawn=True): - - """ - url, ok = qtutils.prompt('Path or URL to clone (Env. $VARS okay)') -- url = os.path.expandvars(url) -+ url = os.path.expandvars(core.encode(url)) - if not ok or not url: - return None - try: -@@ -168,12 +168,14 @@ def clone_repo(parent, spawn=True): - return None - - # Prompt the user for a directory to use as the parent directory -+ parent = QtGui.QApplication.instance().activeWindow() - msg = 'Select a parent directory for the new clone' - dirname = qtutils.opendir_dialog(parent, msg, cola.model().getcwd()) - if not dirname: - return None - count = 1 -- destdir = os.path.join(dirname, default) -+ dirname = core.decode(dirname) -+ destdir = os.path.join(dirname, core.decode(default)) - olddestdir = destdir - if os.path.exists(destdir): - # An existing path can be specified -@@ -186,7 +188,7 @@ def clone_repo(parent, spawn=True): - while os.path.exists(destdir): - destdir = olddestdir + str(count) - count += 1 -- cola.notifier().broadcast(signals.clone, url, destdir, -+ cola.notifier().broadcast(signals.clone, core.decode(url), destdir, - spawn=spawn) - return destdir - --- -1.7.3.4 - - -From 00f6b77ee15eba1f707dc8aab02359c0483ecff8 Mon Sep 17 00:00:00 2001 -From: David Aguilar -Date: Fri, 15 Apr 2011 01:38:46 -0700 -Subject: [PATCH 4/9] settings: Handle home directories with unicode characters - -Closes #74 - -Signed-off-by: David Aguilar ---- - cola/settings.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/cola/settings.py b/cola/settings.py -index 74ef101..66a12b3 100644 ---- a/cola/settings.py -+++ b/cola/settings.py -@@ -5,11 +5,12 @@ - import os - import user - -+from cola import core - from cola import serializer - from cola.models import observable - - # Here we store settings --_rcfile = os.path.join(user.home, '.cola') -+_rcfile = os.path.join(core.decode(user.home), '.cola') - - - class SettingsModel(observable.ObservableModel): --- -1.7.3.4 - - -From 73a7191758d366e1865e729a0c834eff43a5cbda Mon Sep 17 00:00:00 2001 -From: David Aguilar -Date: Fri, 15 Apr 2011 01:40:07 -0700 -Subject: [PATCH 5/9] startup: Handle repository paths with unicode characters - -Closes #74 - -Signed-off-by: David Aguilar ---- - cola/models/main.py | 3 ++- - cola/views/main.py | 4 ++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/cola/models/main.py b/cola/models/main.py -index b924f45..c155f65 100644 ---- a/cola/models/main.py -+++ b/cola/models/main.py -@@ -139,7 +139,8 @@ class MainModel(ObservableModel): - is_valid = self.git.is_valid() - if is_valid: - self._init_config_data() -- self.set_project(os.path.basename(self.git.worktree())) -+ basename = os.path.basename(self.git.worktree()) -+ self.set_project(core.decode(basename)) - return is_valid - - def _init_config_data(self): -diff --git a/cola/views/main.py b/cola/views/main.py -index d1efbec..0fd1395 100644 ---- a/cola/views/main.py -+++ b/cola/views/main.py -@@ -243,7 +243,7 @@ class MainView(MainWindow): - def _update_callback(self): - """Update the title with the current branch and directory name.""" - branch = self.model.currentbranch -- curdir = os.getcwd() -+ curdir = core.decode(os.getcwd()) - msg = 'Repository: %s\nBranch: %s' % (curdir, branch) - self.commitdockwidget.setToolTip(msg) - -@@ -266,7 +266,7 @@ class MainView(MainWindow): - merge_msg_path = gitcmds.merge_message_path() - if merge_msg_path is None: - return -- merge_msg_hash = utils.checksum(merge_msg_path) -+ merge_msg_hash = utils.checksum(core.decode(merge_msg_path)) - if merge_msg_hash == self.merge_message_hash: - return - self.merge_message_hash = merge_msg_hash --- -1.7.3.4 - - -From 1db197ca4d7c23587d7adb85704381a8473abacb Mon Sep 17 00:00:00 2001 -From: David Aguilar -Date: Fri, 15 Apr 2011 01:58:41 -0700 -Subject: [PATCH 6/9] bookmarks: Pass '--repo' when launching git-cola on a bookmark - -Otherwise git-cola launches in-place when opening a bookmark. - -Closes #75 - -Signed-off-by: David Aguilar ---- - cola/controllers/bookmark.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/cola/controllers/bookmark.py b/cola/controllers/bookmark.py -index 57cc954..446d852 100644 ---- a/cola/controllers/bookmark.py -+++ b/cola/controllers/bookmark.py -@@ -57,7 +57,7 @@ class BookmarkController(QObserver): - if not selection: - return - for item in selection: -- utils.fork(['git', 'cola', item]) -+ utils.fork([sys.executable, sys.argv[0], '--repo', item]) - - def delete(self): - """Removes a bookmark from the bookmarks list""" --- -1.7.3.4 - - -From 9b666a5e031e48b76e575ccb756928727beea05e Mon Sep 17 00:00:00 2001 -From: David Aguilar -Date: Fri, 15 Apr 2011 02:11:01 -0700 -Subject: [PATCH 7/9] main: Add a '--prompt' option and use it in the desktop launchers - -git-cola assumes that the current directory is a git repository. -This is less helpful when launching git-cola through a launcher icon -because it may find a git repository in $HOME. - -Add a '--prompt' flag and use it in all of the launchers. -This forces git-cola to prompt the user for a repository before -launching the main GUI. - -Closes #75 - -Signed-off-by: David Aguilar ---- - cola/main.py | 9 ++++++++- - darwin/git-cola | 2 +- - share/applications/cola.desktop | 2 +- - win32/install.iss | 6 +++--- - 4 files changed, 13 insertions(+), 6 deletions(-) - -diff --git a/cola/main.py b/cola/main.py -index 25330f8..e155261 100644 ---- a/cola/main.py -+++ b/cola/main.py -@@ -62,6 +62,13 @@ def main(): - metavar='PATH', - default=os.getcwd()) - -+ # Specifies that we should prompt for a repository at startup -+ parser.add_option('--prompt', -+ help='Prompt for a repository before starting the main GUI.', -+ dest='prompt', -+ action='store_true', -+ default=False) -+ - # Used on Windows for adding 'git' to the path - parser.add_option('-g', '--git-path', - help='Specifies the path to the git binary', -@@ -156,7 +163,7 @@ def main(): - # Ensure that we're working in a valid git repository. - # If not, try to find one. When found, chdir there. - model = cola.model() -- valid = model.use_worktree(repo) -+ valid = model.use_worktree(repo) and not opts.prompt - while not valid: - startup_dlg = startup.StartupDialog(app.activeWindow()) - gitdir = startup_dlg.find_git_repo() -diff --git a/darwin/git-cola b/darwin/git-cola -index 79e5f73..b37575d 100755 ---- a/darwin/git-cola -+++ b/darwin/git-cola -@@ -8,4 +8,4 @@ export PATH - # Contents/Resources - macos="$(dirname "$0")" - contents="$(dirname "$macos")" --exec python "$contents/Resources/bin/git-cola" -+exec python "$contents/Resources/bin/git-cola" --prompt -diff --git a/share/applications/cola.desktop b/share/applications/cola.desktop -index 44e8d8a..2fdefe0 100644 ---- a/share/applications/cola.desktop -+++ b/share/applications/cola.desktop -@@ -1,7 +1,7 @@ - [Desktop Entry] - Name=Cola Git GUI - Comment=A highly caffeinated git GUI --Exec=git-cola -+Exec=git-cola --prompt - Icon=/usr/share/git-cola/icons/git.svg - StartupNotify=true - Terminal=false --- -1.7.3.4 - - -From effa175c909084424c3c49e0ca855d0716a32645 Mon Sep 17 00:00:00 2001 -From: Justin Lecher -Date: Sat, 16 Apr 2011 11:45:12 +0200 -Subject: [PATCH 9/9] Fix for issue 77, Clone doesn't work with --prompt. - -Signed-off-by: Justin Lecher ---- - cola/views/startup.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/cola/views/startup.py b/cola/views/startup.py -index 7ec5b6e..a2addd9 100644 ---- a/cola/views/startup.py -+++ b/cola/views/startup.py -@@ -102,7 +102,7 @@ class StartupDialog(QtGui.QDialog): - self.accept() - - def _clone(self): -- gitdir = guicmds.clone_repo(self, spawn=False) -+ gitdir = guicmds.clone_repo(spawn=False) - if gitdir: - self._gitdir = gitdir - self.accept() --- -1.7.3.4 - -- 2.26.2