Bug#1054806: git-cola: FTBFS: sed: can't read /<>/debian/git-cola/usr/lib/python3*/site-packages/cola/widgets/spellcheck.py: No such file or directory
On Sat, Oct 28, 2023 at 12:13 AM László Böszörményi (GCS) wrote: > > Hi David, > > On Sat, Oct 28, 2023 at 6:39 AM David Aguilar wrote: > > This step in the build log looks suspicious: > > > > sed -i 's|env python|env python3|' \ > > > > /<>/debian/git-cola/usr/lib/python3*/site-packages/cola/widgets/spellcheck.py > Yes, this is the culprit and already fixed locally. > > > Another note is that 3.12.0 is a very old version. Newer versions have > > the python3 shebangs. That's probably related. > Then newer versions also have a new dependency that is not (yet) > packaged for Debian. I don't have time for that as if I remember > correctly it is something uncommon. I think I will let git-cola go. > > Regards, > Laszlo/GCS Sorry for the inconvenience. I always strive to avoid breaking Debian. We shouldn't have any new dependencies -- that might've been an oversight (adding a dependency on rst.linker) which was fixed some time ago. I believe a related issue was that rst.linker did not work offline (which was bad for Debian), so we dropped it. https://github.com/git-cola/git-cola/issues/1251 Git Cola itself will only ever depend on packages already available in Debian, forevermore. Thank you Laszlo, David
Bug#1054806: git-cola: FTBFS: sed: can't read /<>/debian/git-cola/usr/lib/python3*/site-packages/cola/widgets/spellcheck.py: No such file or directory
Hi Lucas, This step in the build log looks suspicious: sed -i 's|env python|env python3|' \ /<>/debian/git-cola/usr/lib/python3*/site-packages/cola/widgets/spellcheck.py Two notes: - The PKGBUILDDIR pattern looks like a template variable that was not replaced. The << >> parts seem to be messing with the shell. That explains the "can't read" errors. - That step probably isn't even needed at all these days. Our #! shebang lines all say "python3" in newer versions... oh.. Another note is that 3.12.0 is a very old version. Newer versions have the python3 shebangs. That's probably related. Let me know if there's anything I can do to help. On Fri, Oct 27, 2023 at 12:51 PM Lucas Nussbaum wrote: > > Source: git-cola > Version: 3.12.0-2 > Severity: serious > Justification: FTBFS > Tags: trixie sid ftbfs > User: lu...@debian.org > Usertags: ftbfs-20231027 ftbfs-trixie > > Hi, > > During a rebuild of all packages in sid, your package failed to build > on amd64. > > > Relevant part (hopefully): > > make[2]: Entering directory '/<>/share/doc/git-cola' > > mkdir -p /<>/debian/git-cola/usr/share/doc/git-cola > > install -m 644 *.html > > /<>/debian/git-cola/usr/share/doc/git-cola > > install -m 644 *.rst /<>/debian/git-cola/usr/share/doc/git-cola > > sphinx-build -b html -d _build/doctrees -a . _build/html > > Running Sphinx v5.3.0 > > loading pickled environment... done > > building [mo]: all of 0 po files > > building [html]: all source files > > updating environment: 0 added, 0 changed, 0 removed > > looking for now-outdated files... none found > > preparing documents... done > > writing output... [ 20%] git-cola > > writing output... [ 40%] git-dag > > writing output... [ 60%] index > > writing output... [ 80%] relnotes > > writing output... [100%] thanks > > > > generating indices... genindex done > > writing additional pages... search done > > copying static files... done > > copying extra files... done > > dumping search index in English (code: en)... done > > dumping object inventory... done > > Renaming directory '_sources' -> 'sources' > > Renaming directory '_static' -> 'static' > > build succeeded. > > > > The HTML pages are in _build/html. > > mkdir -p /<>/debian/git-cola/usr/share/doc/git-cola/html > > rsync -r --delete --delete-excluded --exclude=.buildinfo > > --exclude=.gitignore _build/html/ > > /<>/debian/git-cola/usr/share/doc/git-cola/html/ > > make[2]: Leaving directory '/<>/share/doc/git-cola' > > make[1]: Leaving directory '/<>' > > sed -i 's|env python|env python3|' \ > > > > /<>/debian/git-cola/usr/lib/python3*/site-packages/cola/widgets/spellcheck.py > > sed: can't read > > /<>/debian/git-cola/usr/lib/python3*/site-packages/cola/widgets/spellcheck.py: > > No such file or directory > > make: *** [debian/rules:37: install] Error 2 > > > The full build log is available from: > http://qa-logs.debian.net/2023/10/27/git-cola_3.12.0-2_unstable.log > > All bugs filed during this archive rebuild are listed at: > https://bugs.debian.org/cgi-bin/pkgreport.cgi?tag=ftbfs-20231027;users=lu...@debian.org > or: > https://udd.debian.org/bugs/?release=na=ign=7=7=only=ftbfs-20231027=lu...@debian.org=1=1=1=1#results > > A list of current common problems and possible solutions is available at > http://wiki.debian.org/qa.debian.org/FTBFS . You're welcome to contribute! > > If you reassign this bug to another package, please mark it as 'affects'-ing > this package. See https://www.debian.org/Bugs/server-control#affects > > If you fail to reproduce this, please provide a build log and diff it with > mine > so that we can identify if something relevant changed in the meantime. > -- David
Bug#1029482: git-cola: New upstream version 4.1.0
Package: git-cola Version: 4.1.0-1 Severity: wishlist Dear Maintainer, git-cola has not been recently updated due to Breaking Changes in its Python build system (distutils deprecations, PEP-517/518). https://github.com/git-cola/git-cola/issues/1231#issuecomment-1136733246 I took at stab at updating the debian packaging and have made the updates available in this public repository: https://github.com/davvid/git-cola-debian/ The new packaging should get us over the 3.x -> 4.x breaking changes hurdle. https://github.com/davvid/git-cola-debian/commits/main The "debian: update packaging to 3.12.0-2" commit synced the repository with the latest version in debian, last packaged by g...@debian.org. The new commits (post the 3.12.0 import) got it to deal with issues in setuptools_scm and pip install --prefix=/usr. An interesting detail is that the updated packaging contains two workarounds for issues that affect Debian. Any project using setuptools_scm [1] or "pip install --prefix=/usr" [2] may be in a similar boat until the upstream issues are resolved. Hopefully these workarounds are acceptable for now. https://github.com/davvid/git-cola-debian/blob/main/debian/rules#L8 https://github.com/davvid/git-cola-debian/blob/main/debian/rules#L17 History: The git-cola-debian packaging repository is derived from the debian packaging originally hosted on aioth.debian.org: https://alioth-archive.debian.org/git/collab-maint/git-cola.git.tar.xz git-cola-debian's history is truncated. I did not have the sources for any of the intermediate versions from gcs that were being managed using quilt so there are no commits corresponding to them. I'm also the upstream for this package so I'd like to help keep the Debian packaging up to date. Thanks! -- System Information: Debian Release: bookworm/sid APT prefers testing APT policy: (500, 'testing') Architecture: amd64 (x86_64) Kernel: Linux 6.1.0-1-amd64 (SMP w/4 CPU threads; PREEMPT) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages git-cola depends on: ii git [git-core] 1:2.39.0-1 ii libjs-jquery3.6.1+dfsg+~3.5.14-1 ii libjs-modernizr 2.6.2+ds1-5 ii libjs-underscore1.13.4~dfsg+~1.11.4-3 ii node-html5shiv 3.7.3+dfsg-5 ii python3 3.10.6-3+b1 ii python3-importlib-metadata 4.12.0-1 ii python3-pyqt5 5.15.7+dfsg-3+b3 ii python3-qtpy2.3.0-1 ii python3-send2trash 1.8.1~b0-2 Versions of packages git-cola recommends: ii gitk 1:2.39.0-1 ii tcl [tclsh] 8.6.11+1 ii xxdiff 1:5.1+git20220924+dfsg-1 git-cola suggests no packages. -- no debconf information
Bug#1018369: git-cola: build-depends on python3-nose or uses it for autopkgtest
Hi Dmitriy, We don't depend on nose these days. We dropped that dependency upstream a while back in favor of pytest. The debian packaging probably needs to drop the dependency. Thanks! On Sun, Aug 28, 2022 at 11:41 AM Dmitry Shachnev wrote: > > Source: git-cola > Version: 3.12.0-1 > User: python-modules-t...@lists.alioth.debian.org > Usertags: nose-rm > > Dear Maintainer, > > Your package still uses nose [1], which is an obsolete testing framework for > Python, dead and unmaintained since 2015 [2][3]. > > If you received this bug report, it means that your package either has a > build-dependency on python3-nose or uses that package in debian/tests/control. > If that is not the case, please reply and CC me explicitly. > > Please port your package to one of the alternatives: nose2 [4], pytest [5] > or unittest from Python standard library [6]. > > There is a script called nose2pytest [7] which can assist with migrating from > nose to pytest. > > This mass bug filing was discussed on debian-devel in [8]. > > [1]: https://tracker.debian.org/pkg/nose > [2]: https://github.com/nose-devs/nose/commit/0f40fa995384afad > [3]: https://pypi.org/project/nose/#history > [4]: https://docs.nose2.io/en/latest/ > [5]: https://docs.pytest.org/en/latest/ > [6]: https://docs.python.org/3/library/unittest.html > [7]: https://github.com/pytest-dev/nose2pytest > [8]: https://lists.debian.org/debian-devel/2022/08/msg00184.html > > -- > Dmitry Shachnev > -- David
Bug#966031: git-cola: Uses old name of sip module
On Wed, Jul 22, 2020 at 4:30 AM Dmitry Shachnev wrote: > Source: git-cola > Version: 3.7-1 > Usertags: sip5 > > Dear Maintainer, > > You are receiving this bug because your package seems to be using PyQt5 > and has Python files with "import sip" lines. > > With the latest version of PyQt5 in experimental, the private sip module > used by PyQt5 is called "PyQt5.sip", not just "sip". I am going to upload > this version to unstable around end of August. > > You may need to update your imports to do something like this: > > try: > from PyQt5 import sip > except ModuleNotFoundError: > import sip > > Alternatively, you may import sip after importing PyQt5. So the following > will work too: > > from PyQt5 import QtCore > import sip > Hi Dmitriy git-cola uses the qtpy module: https://github.com/spyder-ide/qtpy This module abstracts over various Python+Qt backends -- PyQt4, PyQt5, PySide, and PySide2 are all supported. PyQt5 is our recommended backend. The sip issue is already handled by this module -- the "import sip" code path is only ever activated in the PyQt4 code paths. Modern systems will never hit that code. The PyQt5 code paths are all sip-free. Thank you for your work on debian. cheers, -- David
Bug#789257: git-cola: Fails to start, can't find installed python-qt4
On Fri, Jun 19, 2015 at 10:52:37AM +0200, Martin Erik Werner wrote: Package: git-cola Version: 2.1.2-1 Severity: important git-cola fails to start with: Sorry, you do not seem to have PyQt4 installed. Please install it before using git-cola. e.g.: sudo apt-get install python-qt4 even though python-qt4 is installed. -- System Information: Debian Release: stretch/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.0.0-2-amd64 (SMP w/4 CPU cores) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages git-cola depends on: ii git [git-core]1:2.1.4-2.1 ii libjs-jquery 1.7.2+dfsg-3.2 ii libjs-modernizr 2.6.2+ds1-1 ii libjs-underscore 1.7.0~dfsg-1 ii python-qt44.11.4+dfsg-1 pn python:anynone Versions of packages git-cola recommends: ii gitk1:2.1.4-2.1 ii xxdiff 1:4.0+hg437+dfsg-2 Versions of packages git-cola suggests: pn python-pyinotify none ii python-simplejson 3.7.3-1 Hmm, that's odd. Does it work if you do e.g. python2 /usr/bin/git-cola ? I'm wondering whether it's possible that python-qt4 is installed for a different version of Python. I'm also on sid and I was just able to launch the version from `master` from its source tree (./bin/git-cola) without issues. Does the latest version from github work for you? git clone git://github.com/git-cola/git-cola.git ./git-cola/bin/git-cola git-cola is just doing the following in python. Can you launch these commands inside a python shell and let me know what happens? import sip from PyQt4 import QtGui Lastly, what does `python --version` print? I'm starting a dist-upgrade now. I'll see if I can repro the problem tonight once I'm upgraded, but this is surprising. Thanks for the report. cheers, -- David -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#723874: lightdm: adds hardcoded options to xserver commandline
I've implemented a configuration variable, xserver-allow-vt-switch, which inhibits the hard-coded -novtswitch flag. I've emailed the patches to the maintainer and have pushed the changes to the vtswitch branch here: https://github.com/davvid/lightdm/commits/vtswitch I hope this helps others. I'm on sid and this is still an issue, so I figured I should try and fix it... cheers, -- David -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#706580: git-cola: FTBFS with Sphinx 1.2: UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 288: ordinal not in range(128)
On Sun, May 5, 2013 at 10:16 PM, Laszlo Boszormenyi (GCS) g...@debian.hu wrote: On Wed, 2013-05-01 at 19:52 -0700, David Aguilar wrote: On Wed, May 1, 2013 at 2:25 PM, Jakub Wilk jw...@debian.org wrote: Source: git-cola Version: 1.8.2-1 Severity: important Tags: patch User: python-modules-t...@lists.alioth.debian.org Usertags: sphinx1.2 [...] I'm planning on tagging the official v1.8.3 release (which includes this fix) this weekend. Other than the tag which I have not yet added, the code in master is exactly what I'm planning on releasing. As I see, the v1.8.3 is still a go. Please note me if you tagged it and I will do an upload. Laszlo/GCS Thanks, I just tagged and released. -- David -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#706580: git-cola: FTBFS with Sphinx 1.2: UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 288: ordinal not in range(128)
On Wed, May 1, 2013 at 2:25 PM, Jakub Wilk jw...@debian.org wrote: Source: git-cola Version: 1.8.2-1 Severity: important Tags: patch User: python-modules-t...@lists.alioth.debian.org Usertags: sphinx1.2 When rebuilt against python-sphinx 1.2~b1+dfsg-1 (available in experimental), git-cola failed to build from source: [...snip...] /build/git-cola-oksCdv/git-cola-1.8.2/extras/sphinxtogithub/sphinxtogithub.py, line 54, in process | text = replacer.process( text ) | File /build/git-cola-oksCdv/git-cola-1.8.2/extras/sphinxtogithub/sphinxtogithub.py, line 38, in process | return text.replace( self.from_, self.to ) | UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 288: ordinal not in range(128) The problem is that Application.outdir attribute is a unicode string (rather than byte string) in Sphinx 1.2. The attached patch fixes the FTBFS. It's not beautiful, but it fixes the problem at hand, and doesn't make things worse than status quo. Thank you so much, Jakub. I've pushed the changes up to github. I'm planning on tagging the official v1.8.3 release (which includes this fix) this weekend. Other than the tag which I have not yet added, the code in master is exactly what I'm planning on releasing. cheers, -- David -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#690182: git-cola looking for adopters?
Hello, Thanks for the kind words and help, Iulian. I can help maintain the package in Debian and would be happy to be mentored through the process. I'm not very familiar with the process but I can learn. Are there any mailing lists I should join? -- David -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#565763: git-cola: Stage hunk feature doesn't work
Hello I submitted a bug against python-qt4. 4.6.0 is buggy. 4.6.1 fixes the problem. Please mark this big ad a dup. Debian needs to package pyqt 4.6.1 or newer. Sorry :-/ Sent from my iPhone On Jan 18, 2010, at 9:41 AM, Andrey Smachev b...@ispras.ru wrote: Package: git-cola Version: 1.4.1.2-1 Severity: normal Stage hunk feature, described in documentation, just doesn't work. Please see the screenshot attached and compare it with the screenshot in the documentation (/usr/share/doc/git-cola/html/ diffview.html). 'h' and 's' hotkeys also doesn't work. -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (500, 'testing') Architecture: i386 (i686) Kernel: Linux 2.6.32.2 (SMP w/2 CPU cores; PREEMPT) Locale: LANG=ru_RU.UTF-8, LC_CTYPE=ru_RU.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages git-cola depends on: ii git-core 1:1.6.5-1 fast, scalable, distributed revisi ii python2.5.4-2An interactive high- level object-o ii python-qt44.6-1 Python bindings for Qt4 ii python-support1.0.6 automated rebuilding support for P Versions of packages git-cola recommends: ii gitk 1:1.6.5-1 fast, scalable, distributed revisi ii xxdiff1:3.2-10 graphical file/ directory compariso Versions of packages git-cola suggests: pn python-pyinotify none (no description available) ii python-simplejson 2.0.9-1Simple, fast, extensible JSON enco -- no debconf information screenshot_033.png -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#564657: python-qt4 4.6-1 breaks git-cola
Package: python-qt4 Version 4.6-1 When using git-cola with python-qt4 4.6-1 the selection notifications are never seen and thus some of the context menu entries are missing. This problem does not exist in PyQt 4.6.1 (newer) or 4.5.x (older) versions. It's a regression in PyQt. This problem exists in 4.6.0 (aka debian 4.6-1) only. For example: git clone someproject.git cd someproject echo test README git cola (right-click on the modified README file, it should have menu entries for staging, etc., but doesn't) It looks like you guys are ready for 4.6.2: http://svn.debian.org/viewsvn/python-modules/packages/python-qt4/trunk/debian/changelog?revision=10573view=markup I've had several reports about PyQt 4.6.0. The resolution was always the same--use any other version. Are there plans to release 4.6.2 soon? Linux aquarius 2.6.30-2-amd64 #1 SMP Mon Dec 7 05:21:45 UTC 2009 x86_64 GNU/Linux debian/testing Thanks for your great work, -- David -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#519972: git-cola: should use private module dirs.
On 0, Bernd Zeimetz b...@debian.org wrote: Package: git-cola Version: 1.3.5.28-1 Severity: serious git-cola ships private modules, they should be installed to /usr/share/git-cola according to the policy [1], if there is not a good reason to install them system-wide. As the modules are not used by any other program, they should be moved into the private directory. [1] http://www.debian.org/doc/packaging-manuals/python-policy/ch-programs.html#s-current_version_progs The latest release of git-cola fixes this bug. http://cola.tuxfamily.org/releases/cola-1.3.7.4-src.tar.gz enjoy, -- David -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#519972: git-cola: should use private module dirs.
On 0, Bernd Zeimetz b...@debian.org wrote:
David Aguilar wrote:
Thanks Bernd.
What should I do about the .pyc/.pyo files?
I'm assuming that I shouldn't generate them and should instead
let Debian generate them?
Right, that's what python-support (and python-central, if you like that more)
takes care of.
They'll also take care of your .py files in /usr/share/packagename
automatically, so if you install the modules to
$(CURDIR)/debian/usr/share/packagename, everything should be fine. You need to
make sure that the files in /usr/bin know about the path, though, for example
by
adding the path to sys.path.
Awesome, okay I'll work on getting this fixed soon.
I've cc'd cola's debian package maintainer in case there's
anything that needs to be done on the packaging front to
account for the path change from using
/usr/lib/python2.*/site-packages/cola to
/usr/share/cola/lib for cola's private modules.
BTW I have a fix for the bug regarding cola breaking
help('modules') so I'll probably be rolling a new release
tonight to address it.
Thanks for the help!
--
David
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#519971: git-cola: breaks python help
On 0, Bernd Zeimetz b...@debian.org wrote:
Package: git-cola
Version: 1.3.5.28-1
Severity: grave
Grave? :'(
Ouch! Lesson learned.
See below...
git-cola breaks the python modules help:
0 b...@think:~$ python2.5
Python 2.5.4 (r254:67916, Feb 18 2009, 03:00:47)
[GCC 4.3.3] on linux2
Type help, copyright, credits or license for more information.
help('modules')
Please wait a moment while I gather a list of all available modules...
File /var/lib/python-support/python2.5/cola/jsonpickle/__init__.py, line
97, in __init__
self.load_backend('json', 'dumps', 'loads', ValueError)
File /var/lib/python-support/python2.5/cola/jsonpickle/__init__.py, line
138, in load_backend
self._encoders[name] = getattr(mod, encode_name)
AttributeError: 'module' object has no attribute 'dumps'
I fixed this and pushed out a new tarball:
http://cola.tuxfamily.org/releases/?C=NO=D
cola-1.3.5.44-src.tar.gz
Here's the commit diff:
http://github.com/davvid/git-cola/commit/61cff60a6970afbed3c3cd3922303b18edb891a8
This won't be a problem in the future when cola starts using a
private path for its internal python modules, but until then
this should make things happy.
I tested the latest code on debian/testing and it seems to do
the right thing now.
Thanks for your help!
--
David
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#519972: git-cola: should use private module dirs.
On Mon, Mar 16, 2009 at 7:25 AM, Bernd Zeimetz b...@debian.org wrote: Package: git-cola Version: 1.3.5.28-1 Severity: serious git-cola ships private modules, they should be installed to /usr/share/git-cola according to the policy [1], if there is not a good reason to install them system-wide. As the modules are not used by any other program, they should be moved into the private directory. [1] http://www.debian.org/doc/packaging-manuals/python-policy/ch-programs.html#s-current_version_progs Let me know if you need any help with that. Cheers, Bernd Thanks Bernd. What should I do about the .pyc/.pyo files? I'm assuming that I shouldn't generate them and should instead let Debian generate them? I believe that was the reasoning behind using site-packages. Is there a command I can run that'll let me see what the final .deb will look like so that I can fiddle around with the install scripts until I get it right? Hmm.. I think I originally used the same setup.py and bin/ script used by stg (stacked git) when figuring out how to setup the install. Do they have the same problem? bin/git-cola imports the cola modules so I'll have to change it accordingly. If stg is already fixed then I could take a look at how their package is setup. I'm under the impression that distutils (via setup.py) creates those .py[co] files by default... Thanks nonetheless. I'm a Debian user so I take Debian requests very seriously. -- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.28.6-think (SMP w/2 CPU cores; PREEMPT) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages git-cola depends on: ii git-core 1:1.6.2-1 fast, scalable, distributed revisi ii python 2.5.4-2 An interactive high-level object-o ii python-qt4 4.4.2-4 Python bindings for Qt4 ii python-support 0.8.7 automated rebuilding support for P Versions of packages git-cola recommends: ii gitk 1:1.6.2-1 fast, scalable, distributed revisi Versions of packages git-cola suggests: pn python-pyinotify none (no description available) ii python-simplejson 2.0.9-1 Simple, fast, extensible JSON enco -- no debconf information -- David -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#513383: git-cola: Display problem after checking in single hunks
On Wed, Jan 28, 2009 at 6:38 AM, Christoph Haas em...@christoph-haas.de wrote: Package: git-cola Version: 1.3.5-1 Severity: normal It's nice that git-cola allows to check in individual hunks of a modified file. Checking in single hunks works well. But right after a hunk gets staged the Diff View isn't shown correctly. Instead of displaying the hunks from top to bottom it appears like all hunks get joined onto a single line. Perhaps the @@ at the beginning of a hunk isn't detected correctly or something. Hello! I'd love to help fix this. Hmm.. When git-cola gets in this state, do you think you could send me the output of simply 'git diff'? That's fundamentally what cola is parsing. If you happen to have a reproducible test case then that would help. It's possible that git is actually combining the hunks down into a single hunk, or, more likely, cola has a bug. Send me some data and I can squash this ASAP. Thanks Christoph, -David BTW I develop cola using debian/testing, so our environments are probably pretty similar. debian is awesome. -- System Information: Debian Release: 5.0 APT prefers unstable APT policy: (500, 'unstable') Architecture: i386 (i686) Kernel: Linux 2.6.26-1-686 (SMP w/1 CPU core) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages git-cola depends on: ii git-core 1:1.5.6.5-2 fast, scalable, distributed revisi ii python 2.5.2-3 An interactive high-level object-o ii python-qt4 4.4.2-4 Python bindings for Qt4 ii python-support 0.8.7 automated rebuilding support for P Versions of packages git-cola recommends: ii gitk 1:1.5.6.5-2 fast, scalable, distributed revisi Versions of packages git-cola suggests: pn python-pyinotify none (no description available) ii python-simplejson 1.9.2-1Simple, fast, extensible JSON enco -- no debconf information -- David -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#506993: git-cola: problems with inotify
On Wed, Nov 26, 2008 at 1:07 PM, David Bremner [EMAIL PROTECTED] wrote: Package: git-cola Version: 1.3.2-1 Severity: normal There seems to be some problem with git-cola's inotify support on my system. Instead of noticing a file change, I get the following output in the shell: Traceback (most recent call last): File /var/lib/python-support/python2.5/cola/controllers/__init__.py, line 332, in event if msg.type() == inotify.INOTIFY_EVENT: AttributeError: 'module' object has no attribute 'INOTIFY_EVENT' Hello This has been fixed in upstream version 1.3.2.5. I've attached a patch of the upstream commit that fixed it. Here's a link to that commit: http://gitorious.org/projects/git-cola/repos/mainline/commits/0fe0bd382878bb3c7c1bb58448d1dee0f78e2cee .. and a quick 'n dirty fix for the impatient (sorry 'bout the typo!): perl -p -i -e \ s/INOTIFY_EVENT_TYPE/INOTIFY_EVENT/g \ /var/lib/python-support/python2.5/cola/inotify.py -- System Information: Debian Release: lenny/sid APT prefers testing APT policy: (900, 'testing') Architecture: amd64 (x86_64) Kernel: Linux 2.6.26-1-amd64 (SMP w/2 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages git-cola depends on: ii git-core 1:1.5.6.5-1 fast, scalable, distributed revisi ii python 2.5.2-3 An interactive high-level object-o ii python-qt4 4.4.2-4 Python bindings for Qt4 ii python-support 0.8.4 automated rebuilding support for P Versions of packages git-cola recommends: ii gitk 1:1.5.6.5-1 fast, scalable, distributed revisi Versions of packages git-cola suggests: ii python-pyinotify 0.7.1-1Simple Linux inotify Python bindin pn python-simplejson none (no description available) -- no debconf information -- David 0001-inotify-fix-a-bug-introduced-when-removing-the-defa.patch Description: application/mbox
