git-cola 1.3.4

The latest git-cola release v1.3.4 is available at the usual places:

git-cola homepage:
http://cola.tuxfamily.org/

git-cola on github:
git clone git://github.com/davvid/git-cola.git
http://github.com/davvid/git-cola/tree/master

git-cola is a powerful git gui written in Python. git-cola uses the PyQt4 gui toolkit and is supported on all platforms where git is available, including Windows/msysgit.

The latest versions of git-cola sport a fresh new interface and several new helpful dialogs. One of the newer git-cola dialogs is the 'Commit Comparison' dialog which allows you to compare arbitrary commits using standard merge tools (e.g. xxdiff).

git-cola uses a custom git command called git-difftool to drive the merge tools. This is useful if you'd like to use the functionality in your own scripts or from the command line. I will post the current version of git-difftool to the list for feedback and possible inclusion in the git contrib/ area since it is a generally useful utility.

See the online documentation for more information.

---------------------------------------------------------------

Changes since v1.3.3 are as follows:

Barry Roberts (3):
Fix stash typo
Context menu items for Commits list
Speed up file identification

David Aguilar (15):
i18n: fix a few more places where we weren't unicode-safe
compare: reinstate the Commit -> Compare File... menu action
views: fix obsolete references to the old dockwidgets diff gui: properly restore the scroll bar values on update
cola: pass --no-color to 'git diff' to avoid receiving ANSI sequences
controllers: fix a typo when restoring the scrollbar values on rescan options dialog: fix some annoyances with the font handling
compare: fix an edge case when decreasing the number of log results Use 'utf-8' instead of 'utf8' in core.encode()
models: call 'git update-index --refresh' in get_workdir_state()
rebase: list all branches in the branch chooser, not just local ones
INSTALL: remove references to the now unused 'file' command
win32: add a win32/ folder for storing all of the win32 hacks
INSTALL: fix a typo in the windows installation section
remote: add a rebase checkbox to the pull dialog

	David

Looks pretty nice, I was trying to give this a whirl on Python 2.6 and was receiving the following errors while trying to build:

tyler@starfruit:~/source/git/git-cola> /usr/bin/python setup.py build
Traceback (most recent call last):
File "setup.py", line 131, in <module>
main()
File "setup.py", line 21, in main
__check_pyqt_version()
File "setup.py", line 98, in __check_pyqt_version
pyqtver = utils.run_cmd('pyuic4', '--version').split()[-1]
File "/home/tyler/source/git/git-cola/cola/utils.py", line 50,
in run_cmd
return git.Git.execute(command)
File "/home/tyler/source/git/git-cola/cola/git.py", line 96,
in execute
stdout=subprocess.PIPE)
File "/usr/lib64/python2.6/subprocess.py", line 595, in
__init__
errread, errwrite)
File "/usr/lib64/python2.6/subprocess.py", line 1106, in
_execute_child
raise child_exception
OSError: [Errno 8] Exec format error tyler@starfruit:~/source/git/git-cola>

openSUSE 11.1 (my current OS) ships with 2.6 by default now, so I'm curious as to the environment you're running cola in?

Looks fancy, can't wait to get it running :)

Cheers

-R. Tyler Ballance
Slide, Inc.

I'm on debian. There's official debian packages these days that are making their way into both ubuntu and debian.

I'm probably doing something wrong since maybe pyuic4 isn't supposed to be called via subprocess.Popen()? See the INSTALL file under 'build issues'. Your pyuic4 is missing a shebang line at the top of the file. I'm not sure if that's a packaging bug (openSUSE) or pyqt4 bug. debian's pyuic4 has a #!/bin/sh line at the top and thus doesn't have this issue. I should probably change it so that it works either way... i'll see if I can work around that.

    David

Impressive call! Adding the shebang to pyuic4 solved the issue, but I'm as far in the dark as you are as to whose packaging domain this bug falls under.

So that issue is out of the way, here's the next one I figure I should pass your way :)

tyler@starfruit:~/source/git/git> git cola
Traceback (most recent call last):
File "/usr/local/bin/git-cola", line 54, in <module>
main()
File "/usr/local/lib64/python2.6/site-packages/cola/main.py",
line 114, in main
view = View(app.activeWindow())
File
"/usr/local/lib64/python2.6/site-packages/cola/views/main.py", line 22, in __init__
self.setupUi(self)
File
"/usr/local/lib64/python2.6/site-packages/cola/gui/main.py", line 183, in setupUi
self.splitter.setSortingEnabled(__sortingEnabled)
AttributeError: setSortingEnabled tyler@starfruit:~/source/git/git>

(Pdb) self.splitter
<PyQt4.QtGui.QSplitter object at 0x9d88d0>
(Pdb) [f for f in dir(self.splitter) if f.lower().find('sort') >= 0] []
(Pdb)

I went ahead and changed the following lines in cola/gui/main.py to get it up and running:

        181         item = QtGui.QTreeWidgetItem(self.status_tree)
        182         item = QtGui.QTreeWidgetItem(self.status_tree)
        183         #self.splitter.setSortingEnabled(__sortingEnabled)
        184         self.horizontalLayout_2.addWidget(self.splitter)
        185
        #self.centralwidget.setSortingEnabled(__sortingEnabled)
        186         main.setCentralWidget(self.centralwidget)

This whole set up is very confusing to me, it appears that those files (judging by your .gitignore) are being generated by the Qt4 .ui files, but how that translates into submitting a patch I haven't the faintest idea :)

I got something running at the very least I suppose :)

Cheers

-R. Tyler Ballance
Slide, Inc.

I figured out a workaround that'll work for now. I've pushed it out so if you're building from source you should be golden. I'll file a bug report and see what they have to say. Until then we should be good to go =)

Thanks for the report and let me know if there's anything else you run into.

    David