Your message dated Sat, 07 Feb 2015 16:04:51 +0000 with message-id <e1yk7sj-0000mx...@franck.debian.org> and subject line Bug#739898: fixed in python-git 0.3.6+git5-gd8bbfea-1 has caused the Debian Bug report #739898, regarding python-git: untracked_files no longer detected to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 739898: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=739898 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: python-git Version: 0.3.2~RC1-3 Severity: important Tags: upstream patch Hi, The output of git status is no longer in the format expected by python-git, in particular the Repo.untracked_files property parses the git status output expecting a: # Untracked files: while later versions of git droped the #, also there are some subtleties in the management of the file names (avoid the use of replace and rstrip removes spaces not only '\n'). I'm attaching a patch that fixes the untracked_files property. -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.12-1-amd64 (SMP w/4 CPU cores) 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 python-git depends on: ii git [git-core] 1:1.9.0-1 ii git-core 1:1.9.0-1 ii libjs-jquery 1.7.2+dfsg-3 ii python 2.7.5-5 ii python-gitdb 0.5.4-1 python-git recommends no packages. python-git suggests no packages. -- no debconf information -- debsums errors found: debsums: changed file /usr/share/pyshared/git/repo/base.py (from python-git package)diff -Naru python-git/git/repo/base.py python-git.new/git/repo/base.py --- python-git/git/repo/base.py 2011-07-05 21:50:02.000000000 +0200 +++ python-git.new/git/repo/base.py 2014-02-23 17:54:32.157547255 +0100 @@ -512,35 +512,33 @@ return True # END untracked files return False - + @property def untracked_files(self): """ :return: list(str,...) - + Files currently untracked as they have not been staged yet. Paths are relative to the current working directory of the git command. - + :note: ignored files will not appear here, i.e. files mentioned in .gitignore""" # make sure we get all files, no only untracked directores - proc = self.git.status(untracked_files=True, as_process=True) - stream = iter(proc.stdout) + proc = self.git.status(porcelain=True, + untracked_files=True, + as_process=True) + # Untracked files preffix in porcelain mode + preffix = "?? " untracked_files = list() - for line in stream: - if not line.startswith("# Untracked files:"): + for line in proc.stdout: + if not line.startswith(preffix): continue - # skip two lines - stream.next() - stream.next() - - for untracked_info in stream: - if not untracked_info.startswith("#\t"): - break - untracked_files.append(untracked_info.replace("#\t", "").rstrip()) - # END for each utracked info line - # END for each line + filename = line[len(preffix):].rstrip('\n') + # Special characters are escaped + if filename[0] == filename[-1] == '"': + filename = filename[1:-1].decode('string_escape') + untracked_files.append(filename) return untracked_files @property
--- End Message ---
--- Begin Message ---Source: python-git Source-Version: 0.3.6+git5-gd8bbfea-1 We believe that the bug you reported is fixed in the latest version of python-git, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 739...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Yaroslav Halchenko <deb...@onerussian.com> (supplier of updated python-git package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@ftp-master.debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Thu, 05 Feb 2015 18:44:46 -0500 Source: python-git Binary: python-git Architecture: source all Version: 0.3.6+git5-gd8bbfea-1 Distribution: experimental Urgency: medium Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> Changed-By: Yaroslav Halchenko <deb...@onerussian.com> Description: python-git - Python library to interact with Git repositories Closes: 739898 769595 Changes: python-git (0.3.6+git5-gd8bbfea-1) experimental; urgency=medium . * New post-release snapshot with some fixes (Closes: #769595) - detects untracked files correctly now (Closes: #739898) - includes debian/patches/dont-choke-on-rc-version.patch * debian/control - bump Standards-Version to 3.9.6 - added python-smmap (>= 0.8.3) to Build-Depends and Suggests: used for testing - needs gitdb >= 0.6.4 -- adjusted version in *Depends * debian/rules - enable build-time testing if available on network and capable of cloning original GitPython repository Checksums-Sha1: f1793daa902b68c341018ed21f6b187d6d511485 2273 python-git_0.3.6+git5-gd8bbfea-1.dsc 04192f686b996d2472030c150766f80136efd73c 365093 python-git_0.3.6+git5-gd8bbfea.orig.tar.gz 305bee0c2c37982efbaf28ad8a6bc17e9dd4beee 4792 python-git_0.3.6+git5-gd8bbfea-1.debian.tar.xz 6f703ac84c82cdae668cdb3662d48d47c239ef21 296574 python-git_0.3.6+git5-gd8bbfea-1_all.deb Checksums-Sha256: c1bfff196064079d2f512d6f3dd692b53215ea727db9410af673af5d015a855a 2273 python-git_0.3.6+git5-gd8bbfea-1.dsc a4f3d8b20216977bb41c53855d8b24c6191af199876fb0da41552f28fec24243 365093 python-git_0.3.6+git5-gd8bbfea.orig.tar.gz 6d3a9269f02befa2e4eeeea04389e9c6b0f76d5e62afb7ebbb55418828d4f9d9 4792 python-git_0.3.6+git5-gd8bbfea-1.debian.tar.xz a60d6547d47f4f47c2b589b46fbf9f058c11a93b0bfccf01441be718f6e957db 296574 python-git_0.3.6+git5-gd8bbfea-1_all.deb Files: 02ecab02e1e8eb1464d5b76c1e997a1a 2273 python optional python-git_0.3.6+git5-gd8bbfea-1.dsc 4a12cd5a278a2e92ed1c75a4dc828c86 365093 python optional python-git_0.3.6+git5-gd8bbfea.orig.tar.gz 128be897b39747d4d88ab414ba5b8708 4792 python optional python-git_0.3.6+git5-gd8bbfea-1.debian.tar.xz b3164545e2c189213ed21c32cb778587 296574 python optional python-git_0.3.6+git5-gd8bbfea-1_all.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBCAAGBQJU1jaHAAoJEKLeI1Bi2jP6+VwP/2p2Ua/ak+8iC2PYFOgXbec7 Y9jvYDm/essv1T5wXfRA2n+n+35kubXdc+6m1rt2KZlB7MrkRb67X8i20eREF6pQ BlGtGeTBagiiYAo/5b9kphRrPNNKfZSbO7Nyzbg5W0VGkqVaBOsbJ1kiEAez3Mgi MRt69nihcKEu8kNDNVNX1L5XisQJnbfqXbt8gi/NctTML/v4xi/6ab8XrO0wRQ9f LLRjKcEQBcMfVtajoVjIZn64P/jZWb7ywYd/lnp4KaBd6OoJTnH/ll4U6qYdDjK4 dDKAjHS2QKatdnX5+LDrW0EGEIAE1dsi3u9VPiMnWwZ9vAv9GK4rxPYeGTjofl25 F4xB+PeF61Y+AwFDcOCuYfeSFoy71E/CptHlip1t2dcpf8Jwq0+Ikv8zenkL7ftm 5K/znzr1p5lyCMqtSLPU/2XZqrZgzSbIBvbxC82VLC+g3TAun2JCzKLxf7/2S1BJ YBSXDjJb9hspLzarfBG64gy1SiSuS62iWjW2CD1KEue+X6fN+Qb/6ehjgVLfDyAv q3wY5H9ABIREREDG4PWGKnqYei/fb4u7Ce1m1g9ut/ckMZ7US+J37LWLRo8JhNoC oXLInmMnQ6TXkgwsjBEyQc4E3sbrv3qM3f651rds9pXeA2oVUw9Cq335BYB9hjS5 x5aYGsQUCNH8PEMU9UqM =+Y1u -----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________ Python-modules-team mailing list Python-modules-team@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/python-modules-team
