Your message dated Fri, 09 Mar 2012 00:54:14 +0000
with message-id <[email protected]>
and subject line Bug#662207: fixed in mercurial 2.1.1-2
has caused the Debian Bug report #662207,
regarding UnicodeDecodeError when refusing to update
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 [email protected]
immediately.)
--
662207: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662207
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: mercurial
Version: 2.1.1-1
Severity: normal
Recent mercurial crashes in ru_RU.UTF-8 locale instead of displaying certain
messages, one of them is "not updating: crosses branches (merge branches or
update --check to force update)", here is the testcase:
mkdir dir1
cd dir1
hg init
echo '1\n2'>file1
hg add file1
hg ci file1 -m "foo"
cd ..
hg clone dir1 dir2
cd dir1
echo '\n3'>>file1
hg ci -m "foo"
cd ../dir2
echo '\n4'>>file1
hg ci -m "foo"
hg pull -u
затягиваем из /home/wrar/tmp/test2/dir1
ищем изменения
добавляем наборы изменений
добавляем манифесты
добавляем изменения в файлы
добавлено 1 наборов изменений с 1
изменениями в 1 файлах (+1 голов)
** неизвестное исключение, пожалуйте,
сообщите об этом по адресу
** http://mercurial.selenic.com/wiki/BugTracker
** Python 2.7.2+ (default, Jan 20 2012, 17:51:10) [GCC 4.6.2]
** Распределенная система контроля версий
Mercurial (версия 2.1.1)
** Загруженные расширения:
Traceback (most recent call last):
File "/usr/bin/hg", line 38, in <module>
mercurial.dispatch.run()
File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 27, in
run
sys.exit((dispatch(request(sys.argv[1:])) or 0) & 255)
File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 64, in
dispatch
return _runcatch(req)
File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 87, in
_runcatch
return _dispatch(req)
File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 683, in
_dispatch
cmdpats, cmdoptions)
File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 465, in
runcommand
ret = _runcommand(ui, options, cmd, d)
File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 737, in
_runcommand
return checkargs()
File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 691, in
checkargs
return cmdfunc()
File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 680, in
<lambda>
d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 456, in check
return func(*args, **kwargs)
File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line 4346, in
pull
ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line 4271, in
postincoming
ui.warn(_("not updating: %s\n" % str(inst)))
File "/usr/lib/python2.7/dist-packages/mercurial/i18n.py", line 42, in
gettext
u = u'\n\n'.join([p and t.ugettext(p) or '' for p in paragraphs])
File "/usr/lib/python2.7/gettext.py", line 404, in ugettext
return unicode(message)
UnicodeDecodeError: 'ascii' codec can't decode byte 0xd0 in position 14:
ordinal not in range(128)
It works in LC_ALL=C. It also fails when hg pull -u should create a file when
it's already exists and untracked.
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.3.0-rc3-wrar+ (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=ru_RU.UTF-8, LC_CTYPE=ru_RU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages mercurial depends on:
ii libc6 2.13-27
ii mercurial-common 2.1.1-1
ii python 2.7.2-10
ii python2.6 2.6.7-4
ii python2.7 2.7.2-13
ii ucf 3.0025+nmu2
Versions of packages mercurial recommends:
ii openssh-client 1:5.9p1-3
Versions of packages mercurial suggests:
ii kompare 4:4.7.4-1
ii qct <none>
ii tk8.5 [wish] 8.5.11-1
ii vim-gtk [vim] 2:7.3.429-2
-- no debconf information
--- End Message ---
--- Begin Message ---
Source: mercurial
Source-Version: 2.1.1-2
We believe that the bug you reported is fixed in the latest version of
mercurial, which is due to be installed in the Debian FTP archive:
mercurial-common_2.1.1-2_all.deb
to main/m/mercurial/mercurial-common_2.1.1-2_all.deb
mercurial_2.1.1-2.debian.tar.gz
to main/m/mercurial/mercurial_2.1.1-2.debian.tar.gz
mercurial_2.1.1-2.dsc
to main/m/mercurial/mercurial_2.1.1-2.dsc
mercurial_2.1.1-2_amd64.deb
to main/m/mercurial/mercurial_2.1.1-2_amd64.deb
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 [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Javi Merino <[email protected]> (supplier of updated mercurial 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 [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Fri, 09 Mar 2012 00:14:13 +0000
Source: mercurial
Binary: mercurial-common mercurial
Architecture: source all amd64
Version: 2.1.1-2
Distribution: unstable
Urgency: low
Maintainer: Python Applications Packaging Team
<[email protected]>
Changed-By: Javi Merino <[email protected]>
Description:
mercurial - easy-to-use, scalable distributed version control system
mercurial-common - easy-to-use, scalable distributed version control system
(common
Closes: 662207
Changes:
mercurial (2.1.1-2) unstable; urgency=low
.
* Add kfreebsd-i386 to the list of slow architectures for the test suite.
* Improve the fix for the test-inherit-mode.t patch based on
suggestions from upstream
* Fix "UnicodeDecodeError when refusing to update" by adding patches
from_upstream__dont_translate_the_abort_message_twice.patch and
from_upstream__fix_all_remaining_uses_of_inside.patch (Closes: #662207)
Checksums-Sha1:
d34b086251b15fe7b8e5d82951d5867f6f8deedd 1530 mercurial_2.1.1-2.dsc
174401cc47da3f31189da26bc0651f3fdd5c569a 39444 mercurial_2.1.1-2.debian.tar.gz
173ff0f85cffa4b815ac568ae3b87e7d0a4f3903 2195662
mercurial-common_2.1.1-2_all.deb
8ac2b0bb69b5e09b01fd625ee92760ac9e75d776 80062 mercurial_2.1.1-2_amd64.deb
Checksums-Sha256:
ba6637ca660f20fad0e512990b9b46641ae8df653c6f62a1af41dc2ad25b6a81 1530
mercurial_2.1.1-2.dsc
ff8df467e5a9b847033f8f69db5c57db8124c26ec7b4963c70ea7a37e17cbc95 39444
mercurial_2.1.1-2.debian.tar.gz
0a62929f80201fbe0cfd69f17fb2f1b1ddbe991cf8bb0418eba9a0ac867911e6 2195662
mercurial-common_2.1.1-2_all.deb
8041dfa996a764180a8058285a2f1785445300539b717a7c49d5108a92a8fc45 80062
mercurial_2.1.1-2_amd64.deb
Files:
1ff5f76bb338553e9c84d8d299513375 1530 vcs optional mercurial_2.1.1-2.dsc
c764be711693ff6a90c45666e558821e 39444 vcs optional
mercurial_2.1.1-2.debian.tar.gz
abad069dc814c12b57b89b7aab534bee 2195662 vcs optional
mercurial-common_2.1.1-2_all.deb
19b40c436f05fe1ec95c5e6f5935fe63 80062 vcs optional mercurial_2.1.1-2_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEARECAAYFAk9ZTq8ACgkQLc4/KDbU5PVXXACfeezcpsPg6QG91qTIzQYLsX7u
cAQAn1v8AnrNowDil+AP0wBT+Q22N6Ky
=I8gx
-----END PGP SIGNATURE-----
--- End Message ---
