{"thread":{"id":"16863","subject":"[ANNOUNCE] git-cola 1.3.4","startedAt":"2008-12-25T23:36:26Z","lastAt":"2008-12-26T09:38:14Z","messageCount":5,"participants":["David Aguilar","R. Tyler Ballance"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"98700","messageId":"20081225233625.GA11029@gmail.com","threadId":"16863","inReplyTo":null,"subject":"[ANNOUNCE] git-cola 1.3.4","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2008-12-25T23:36:26Z","receivedAt":"2008-12-25T23:36:26Z","isPatch":false,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"The latest git-cola release v1.3.4 is available at the\nusual places:\n\ngit-cola homepage:\n\thttp://cola.tuxfamily.org/\n\ngit-cola on github:\n\tgit clone git://github.com/davvid/git-cola.git \n\thttp://github.com/davvid/git-cola/tree/master\n\n\ngit-cola is a powerful git gui written in Python.\ngit-cola uses the PyQt4 gui toolkit and is supported on all\nplatforms where git is available, including Windows/msysgit.\n\nThe latest versions of git-cola sport a fresh new interface and\nseveral new helpful dialogs. One of the newer git-cola dialogs\nis the 'Commit Comparison' dialog which allows you to compare\narbitrary commits using standard merge tools (e.g. xxdiff).\n\ngit-cola uses a custom git command called git-difftool to\ndrive the merge tools. This is useful if you'd like\nto use the functionality in your own scripts or from the\ncommand line. I will post the current version of git-difftool\nto the list for feedback and possible inclusion in the\ngit contrib/ area since it is a generally useful utility.\n\nSee the online documentation for more information.\n\n---------------------------------------------------------------\n\nChanges since v1.3.3 are as follows:\n\nBarry Roberts (3):\n Fix stash typo\n Context menu items for Commits list\n Speed up file identification\n\nDavid Aguilar (15):\n i18n: fix a few more places where we weren't unicode-safe\n compare: reinstate the Commit -> Compare File... menu action\n views: fix obsolete references to the old dockwidgets\n diff gui: properly restore the scroll bar values on update\n cola: pass --no-color to 'git diff' to avoid receiving ANSI sequences\n controllers: fix a typo when restoring the scrollbar values on rescan\n options dialog: fix some annoyances with the font handling\n compare: fix an edge case when decreasing the number of log results\n Use 'utf-8' instead of 'utf8' in core.encode()\n models: call 'git update-index --refresh' in get_workdir_state()\n rebase: list all branches in the branch chooser, not just local ones\n INSTALL: remove references to the now unused 'file' command\n win32: add a win32/ folder for storing all of the win32 hacks\n INSTALL: fix a typo in the windows installation section\n remote: add a rebase checkbox to the pull dialog\n\n-- \n\n\tDavid\n"},{"id":"98710","messageId":"1230277737.14882.54.camel@starfruit","threadId":"16863","inReplyTo":"20081225233625.GA11029@gmail.com","subject":"Re: [ANNOUNCE] git-cola 1.3.4","fromName":"R. Tyler Ballance","fromEmail":"tyler@slide.com","sentAt":"2008-12-26T07:48:57Z","receivedAt":"2008-12-26T07:48:57Z","isPatch":false,"sender":{"key":"tyler@slide.com","avatar":null},"body":"On Thu, 2008-12-25 at 15:36 -0800, David Aguilar wrote:\n> The latest git-cola release v1.3.4 is available at the\n> usual places:\n\nLooks pretty nice, I was trying to give this a whirl on Python 2.6 and\nwas receiving the following errors while trying to build:\n\n \n tyler@starfruit:~/source/git/git-cola> /usr/bin/python setup.py\n build\n Traceback (most recent call last):\n File \"setup.py\", line 131, in \n main()\n File \"setup.py\", line 21, in main\n __check_pyqt_version()\n File \"setup.py\", line 98, in __check_pyqt_version\n pyqtver = utils.run_cmd('pyuic4', '--version').split()[-1]\n File \"/home/tyler/source/git/git-cola/cola/utils.py\", line 50,\n in run_cmd\n return git.Git.execute(command)\n File \"/home/tyler/source/git/git-cola/cola/git.py\", line 96,\n in execute\n stdout=subprocess.PIPE)\n File \"/usr/lib64/python2.6/subprocess.py\", line 595, in\n __init__\n errread, errwrite)\n File \"/usr/lib64/python2.6/subprocess.py\", line 1106, in\n _execute_child\n raise child_exception\n OSError: [Errno 8] Exec format error\n tyler@starfruit:~/source/git/git-cola> \n \n \nopenSUSE 11.1 (my current OS) ships with 2.6 by default now, so I'm\ncurious as to the environment you're running cola in?\n\nLooks fancy, can't wait to get it running :)\n\nCheers\n-- \n-R. Tyler Ballance\nSlide, Inc.\n"},{"id":"98711","messageId":"402731c90812252359r5b6b9420hcadbfa076f561feb@mail.gmail.com","threadId":"16863","inReplyTo":"1230277737.14882.54.camel@starfruit","subject":"Re: [ANNOUNCE] git-cola 1.3.4","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2008-12-26T07:59:17Z","receivedAt":"2008-12-26T07:59:17Z","isPatch":false,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Thu, Dec 25, 2008 at 11:48 PM, R. Tyler Ballance wrote:\n>\n> Looks pretty nice, I was trying to give this a whirl on Python 2.6 and\n> was receiving the following errors while trying to build:\n>\n>\n> tyler@starfruit:~/source/git/git-cola> /usr/bin/python setup.py\n> build\n> Traceback (most recent call last):\n\n> pyqtver = utils.run_cmd('pyuic4', '--version').split()[-1]\n\n> OSError: [Errno 8] Exec format error\n> tyler@starfruit:~/source/git/git-cola>\n>\n>\n> openSUSE 11.1 (my current OS) ships with 2.6 by default now, so I'm\n> curious as to the environment you're running cola in?\n>\n> Looks fancy, can't wait to get it running :)\n>\n> Cheers\n> --\n> -R. Tyler Ballance\n> Slide, Inc.\n>\n\nI'm on debian. There's official debian packages these days that are\nmaking their way into both ubuntu and debian.\n\nI'm probably doing something wrong since maybe pyuic4 isn't supposed\nto be called via subprocess.Popen()? See the INSTALL file under\n'build issues'. Your pyuic4 is missing a shebang line at the top of\nthe file. I'm not sure if that's a packaging bug (openSUSE) or pyqt4\nbug. debian's pyuic4 has a #!/bin/sh line at the top and thus doesn't\nhave this issue. I should probably change it so that it works either\nway... i'll see if I can work around that.\n-- \n David\n"},{"id":"98713","messageId":"1230281078.14882.89.camel@starfruit","threadId":"16863","inReplyTo":"402731c90812252359r5b6b9420hcadbfa076f561feb@mail.gmail.com","subject":"Re: [ANNOUNCE] git-cola 1.3.4","fromName":"R. Tyler Ballance","fromEmail":"tyler@slide.com","sentAt":"2008-12-26T08:44:38Z","receivedAt":"2008-12-26T08:44:38Z","isPatch":false,"sender":{"key":"tyler@slide.com","avatar":null},"body":"On Thu, 2008-12-25 at 23:59 -0800, David Aguilar wrote:\n\n> I'm on debian. There's official debian packages these days that are\n> making their way into both ubuntu and debian.\n> \n> I'm probably doing something wrong since maybe pyuic4 isn't supposed\n> to be called via subprocess.Popen()? See the INSTALL file under\n> 'build issues'. Your pyuic4 is missing a shebang line at the top of\n> the file. I'm not sure if that's a packaging bug (openSUSE) or pyqt4\n> bug. debian's pyuic4 has a #!/bin/sh line at the top and thus doesn't\n> have this issue. I should probably change it so that it works either\n> way... i'll see if I can work around that.\n\n\nImpressive call! Adding the shebang to pyuic4 solved the issue, but I'm\nas far in the dark as you are as to whose packaging domain this bug\nfalls under.\n\nSo that issue is out of the way, here's the next one I figure I should\npass your way :)\n\n \n tyler@starfruit:~/source/git/git> git cola\n Traceback (most recent call last):\n File \"/usr/local/bin/git-cola\", line 54, in \n main()\n File \"/usr/local/lib64/python2.6/site-packages/cola/main.py\",\n line 114, in main\n view = View(app.activeWindow())\n File\n \"/usr/local/lib64/python2.6/site-packages/cola/views/main.py\",\n line 22, in __init__\n self.setupUi(self)\n File\n \"/usr/local/lib64/python2.6/site-packages/cola/gui/main.py\",\n line 183, in setupUi\n self.splitter.setSortingEnabled(__sortingEnabled)\n AttributeError: setSortingEnabled\n tyler@starfruit:~/source/git/git> \n\n\n(Pdb) self.splitter\n\n(Pdb) [f for f in dir(self.splitter) if f.lower().find('sort') >= 0]\n[]\n(Pdb) \n\nI went ahead and changed the following lines in cola/gui/main.py to get\nit up and running:\n\n\n \n 181 item = QtGui.QTreeWidgetItem(self.status_tree)\n 182 item = QtGui.QTreeWidgetItem(self.status_tree)\n 183 #self.splitter.setSortingEnabled(__sortingEnabled)\n 184 self.horizontalLayout_2.addWidget(self.splitter)\n 185\n #self.centralwidget.setSortingEnabled(__sortingEnabled)\n 186 main.setCentralWidget(self.centralwidget)\n \n\nThis whole set up is very confusing to me, it appears that those files\n(judging by your .gitignore) are being generated by the Qt4 .ui files,\nbut how that translates into submitting a patch I haven't the faintest\nidea :)\n\n\nI got something running at the very least I suppose :)\n\nCheers\n\n-- \n-R. Tyler Ballance\nSlide, Inc.\n"},{"id":"98715","messageId":"402731c90812260138t43903830m63c686f4811499dd@mail.gmail.com","threadId":"16863","inReplyTo":"1230281078.14882.89.camel@starfruit","subject":"Re: [ANNOUNCE] git-cola 1.3.4","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2008-12-26T09:38:14Z","receivedAt":"2008-12-26T09:38:14Z","isPatch":false,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Fri, Dec 26, 2008 at 12:44 AM, R. Tyler Ballance wrote:\n\n>\n> This whole set up is very confusing to me, it appears that those files\n> (judging by your .gitignore) are being generated by the Qt4 .ui files,\n> but how that translates into submitting a patch I haven't the faintest\n> idea :)\n>\n>\n> I got something running at the very least I suppose :)\n>\n> Cheers\n>\n> --\n> -R. Tyler Ballance\n> Slide, Inc.\n>\n\nI figured out a workaround that'll work for now. I've pushed it out\nso if you're building from source you should be golden. I'll file a\nbug report and see what they have to say. Until then we should be\ngood to go =)\n\nThanks for the report and let me know if there's anything else you run into.\n\n-- \n David\n"}]}