Skip to content
This repository

git-cola: The highly caffeinated Git GUI

core: properly support Python3 on Windows

Python always goes through list2cmdline() on Windows.
This is fine on Python2, but it breaks Python3 because
it expects str, not bytes.

Ensure that Popen() always sees unicode strings by
decoding all inputs when running commands.

Closes #246

Reported-by: @shipownik via github.com
Signed-off-by: David Aguilar <davvid@gmail.com>
latest commit 1109aeb435
David Aguilar davvid authored
Octocat-spinner-32 bin sessions: add support for the X session management protocol
Octocat-spinner-32 cola core: properly support Python3 on Windows
Octocat-spinner-32 contrib icons: use the official Git icon
Octocat-spinner-32 extras modernize: Added support for Python 3
Octocat-spinner-32 po git-cola v1.9.4
Octocat-spinner-32 share core: properly support Python3 on Windows
Octocat-spinner-32 test test: add gravatar test case
Octocat-spinner-32 .gitignore .gitignore: add zip and tar
Octocat-spinner-32 .mailmap .mailmap: add /me to the mailmap
Octocat-spinner-32 CONTRIBUTING.md typofix: CONTRIBUTING.md
Octocat-spinner-32 COPYING packaging: Add a 'COPYING' file
Octocat-spinner-32 COPYRIGHT cola: update copyright for 2013
Octocat-spinner-32 Makefile docs: ditch asciidoc and double-down on sphinx
Octocat-spinner-32 README.md README.md: add full-stops to make the argparse section easier to read
Octocat-spinner-32 docs source: add symlinks for docs and html
Octocat-spinner-32 setup.cfg setup.py: Use setuptools and update package info
Octocat-spinner-32 setup.py cola: move the cola.main package to cola.widgets.main and cola.models…
README.md

git-cola: The highly caffeinated Git GUI

git-cola is a powerful Git GUI with a slick and intuitive user interface.

Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013
David Aguilar and contributors

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.

SCREENSHOTS

Screenshots are available on the git-cola screenshots page.

DOWNLOAD

apt-get install git-cola python-pyinotify

New releases are available on the git-cola download page.

FORK

git clone git://github.com/git-cola/git-cola.git

git-cola on github

git-cola google group

NUTRITIONAL FACTS

ACTIVE INGREDIENTS

  • git 1.6.3 or newer.

  • Python 2.6, 2.7, and 3.2 or newer.

  • PyQt4 4.4 or newer

  • argparse 1.1 or newer. argparse is part of the stdlib in Python 2.7; install argparse separately if you are running on Python 2.6.

ADDITIVES

pyinotify 0.7.1 or newer enables inotify support on Linux.

BREWING INSTRUCTIONS

Normally you can just do "make install" to install git-cola in your $HOME directory ($HOME/bin, $HOME/share, etc). If you want to do a global install you can do

make prefix=/usr install

You don't need to make to run it, though. git-cola is designed to run directly out of its source tree.

bin/git-cola
bin/git-dag

LINUX

Linux is it! Your distro has probably already packaged git-cola. If not, please file a bug against your distribution ;-)

arch

yaourt -S git-cola

debian, ubuntu

apt-get install git-cola

fedora

yum install git-cola

gentoo

emerge git-cola

opensuse

Use the one-click install link.

MAC OS X

Homebrew is the easiest way to install git-cola, Qt4 and PyQt4.

brew install git-cola

Once brew has installed git-cola you can build a git-cola.app application bundle from source and copy it to /Applications.

make git-cola.app

WINDOWS INSTALLATION

Download the latest stable Git, Python 2.x, and Py2x-PyQt4 installers

Once these are installed you can run git-cola from the Start menu or by double-clicking on the git-cola.pyw script.

If you are developing git-cola on Windows you can use python.exe to run git-cola directly from source.

python.exe bin/git-cola

If you want to build the git-cola Installer yourself run the provided script

contrib/win32/create-installer.sh

You have to make sure that the file

/share/InnoSetup/ISCC.exe

exists. That is normally the case when you run the msysGit bash and not the Git for Windows bash (look here for the differences).

GOODIES

git-cola ships with an interactive rebase editor called git-xbase. git-xbase can be used to reorder and choose commits and can be launched independently of the main git-cola interface, e.g.:

GIT_SEQUENCE_EDITOR=$PWD/share/git-cola/bin/git-xbase git rebase -i master
Something went wrong with that request. Please try again.