From: Steffen Prohaska Date: Tue, 11 Dec 2007 23:08:57 GMT Subject: Re: [ANNOUNCE] ugit: a pyqt-based git gui // was: Re: If you would write git from scratch now, what would you change? Message-ID: In-Reply-To: <20071211223742.GB19857@steel.home> On Dec 11, 2007, at 11:37 PM, Alex Riesen wrote: > David, Tue, Dec 11, 2007 14:48:32 +0100: >> Though there's still a few things remaining to be implemented, the >> bulk of the initial groundwork is already done. All you need to >> build/run it is python and pyqt4 (pyuic4). I've deliberately >> tried to >> keep the interface similar to git-gui for now since it is obviously >> based on it, but that's not a requirement. > > Interesting. I had to start it like this: > > $ export PYTHONPATH=$(pwd)/build/default:$(pwd)/build/default/ui > $ python ./build/default/bin/ugit.pyc > > It has some problem with merges in "Git Commit Browser": takes a lot > of CPU and very slowly generates a very big diff. > > The diff view is very ... dark. Out of place, when the rest of the > interface corresponds to system theme (mine is rather light). Yeah, it's dark here (Mac OS X), too -- doesn't look very friendly. It took me some time to get the full Qt, SIP, PyQT toolchain running ... below's my first (tiny) fix that makes "Branch > Create ..." work if you don't select track. Steffen diff --git a/py/cmds.py b/py/cmds.py index 5abf930..4a35ead 100644 --- a/py/cmds.py +++ b/py/cmds.py @@ -119,8 +119,8 @@ def git_create_branch (name, base, track=False): '''Creates a branch starting from base. Pass track=True to create a remote tracking branch.''' cmd = 'git branch' - if track: cmd += ' --track ' - cmd += '%s %s' % ( utils.shell_quote (name), + if track: cmd += ' --track' + cmd += ' %s %s' % ( utils.shell_quote (name), utils.shell_quote (base)) return commands.getoutput (cmd)