[i18n] bzr commands affected working tree crashed with unicode error in non-english locale
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
High
|
Martin Packman | ||
2.5 |
Fix Released
|
High
|
Martin Packman | ||
bzr (Ubuntu) |
Fix Released
|
High
|
Jelmer Vernooij | ||
Precise |
Fix Released
|
High
|
Jelmer Vernooij |
Bug Description
bzr 2.5.0-2 standalone with localization enabled, ru locale. Trying to pull latest changes from lp:qbzr got the following traceback:
Wed 2012-03-28 11:34:20 +0300
0.547 bazaar version: 2.5.0
0.547 bzr arguments: [u'pull']
0.562 looking for plugins in C:\work\
0.750 looking for plugins in C:/Program Files/Bazaar/
0.765 Plugin name colo already loaded
0.781 Plugin name explorer already loaded
0.797 Plugin name qbzr already loaded
1.093 encoding stdout as sys.stdout encoding 'cp866'
1.468 opening working tree 'C:/work/
3.328 falling back to default implementation
3.328 failed to load system host keys: [Errno 2] No such file or directory: 'C:\\Documents and Settings\
[ 3972] 2012-03-28 11:34:24.500 INFO: Connected (version 2.0, client Twisted)
4.547 Trying SSH agent key 69DE0146E3CD769
[ 3972] 2012-03-28 11:34:25.765 INFO: Authentication (publickey) successful!
[ 3972] 2012-03-28 11:34:25.953 INFO: Secsh channel 1 opened.
11.312 Using fetch logic to copy between RemoteRepositor
11.312 fetching: <SearchResult search:
14.640 tiplog: recorded pull on <email address hidden>
[ 3972] 2012-03-28 11:34:36.765 INFO: M NEWS.txt
[ 3972] 2012-03-28 11:34:36.765 INFO: M lib/conflicts.py
[ 3972] 2012-03-28 11:34:36.780 INFO: M lib/subprocess.py
[ 3972] 2012-03-28 11:34:36.780 INFO: M lib/widgets/
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-ar.po
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-cs.po
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-da.po
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-de.po
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-en.po
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-en_GB.po
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-es.po
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-et.po
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-fr.po
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-gl.po
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-he.po
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-hu.po
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-it.po
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-ja.po
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-nl.po
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-pl.po
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-pt_BR.po
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-ru.po
[ 3972] 2012-03-28 11:34:36.780 INFO: M po/qbzr-sk.po
[ 3972] 2012-03-28 11:34:36.796 INFO: M po/qbzr-sl.po
[ 3972] 2012-03-28 11:34:36.796 INFO: M po/qbzr-sr.po
[ 3972] 2012-03-28 11:34:36.796 INFO: M po/qbzr-sv.po
[ 3972] 2012-03-28 11:34:36.796 INFO: M po/qbzr-th.po
[ 3972] 2012-03-28 11:34:36.796 INFO: M po/qbzr-tr.po
[ 3972] 2012-03-28 11:34:36.796 INFO: M po/qbzr-uk.po
[ 3972] 2012-03-28 11:34:36.796 INFO: M po/qbzr.pot
16.297 Transferred: 314kB (29.1kB/s r:311kB w:3kB)
16.297 Traceback (most recent call last):
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\merge.pyo", line 2021, in merge_inner
File "bzrlib\merge.pyo", line 686, in do_merge
File "bzrlib\
File "bzrlib\
File "bzrlib\merge.pyo", line 654, in _do_merge_to
File "bzrlib\merge.pyo", line 802, in do_merge
File "bzrlib\
File "bzrlib\
File "bzrlib\merge.pyo", line 808, in _do_merge
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
UnicodeEncodeError: 'ascii' codec can't encode characters in position 22-30: ordinal not in range(128)
Although pull into treeless branch works without problems:
C:\work\
Используется сохранённое местоположение родителя: bzr+ssh:
Connected (version 2.0, client Twisted)
Authentication (publickey) successful!
Secsh channel 1 opened.
Now on revision 1470.
Related branches
- Vincent Ladeuil: Approve
-
Diff: 241 lines (+80/-34)5 files modifiedbzrlib/progress.py (+7/-1)
bzrlib/tests/test_progress.py (+40/-22)
bzrlib/tests/test_ui.py (+20/-8)
bzrlib/ui/text.py (+10/-3)
doc/en/release-notes/bzr-2.5.txt (+3/-0)
summary: |
- [i18n] bzr pull crashed with unicode error + [i18n] bzr pull/update crashed with unicode error |
Changed in bzr: | |
assignee: | nobody → Martin Packman (gz) |
status: | Confirmed → In Progress |
Changed in bzr (Ubuntu): | |
status: | New → Fix Released |
importance: | Undecided → High |
assignee: | nobody → Jelmer Vernooij (jelmer) |
Changed in bzr (Ubuntu Precise): | |
status: | New → In Progress |
importance: | Undecided → High |
assignee: | nobody → Jelmer Vernooij (jelmer) |
Changed in bzr: | |
milestone: | none → 2.6b2 |
status: | In Progress → Fix Released |
The same problem with `bzr update` in the same tree, because my tree is out-of-date due the pull error:
Wed 2012-03-28 11:42:34 +0300 Bazaar\ plugins plugins Bazaar/ plugins/ qbzr' shelve. py commands. pyo", line 920, in exception_ to_return_ code commands. pyo", line 1131, in run_bzr commands. pyo", line 673, in run_argv_aliases commands. pyo", line 695, in run cleanup. pyo", line 136, in run_simple cleanup. pyo", line 166, in _do_with_cleanups builtins. pyo", line 1762, in run workingtree. pyo", line 1435, in update mutabletree. pyo", line 52, in tree_write_locked workingtree. pyo", line 1505, in _update_tree cleanup. pyo", line 136, in run_simple cleanup. pyo", line 166, in _do_with_cleanups
0.328 bazaar version: 2.5.0
0.328 bzr arguments: [u'update']
0.328 looking for plugins in C:\work\
0.437 looking for plugins in C:/Program Files/Bazaar/
0.437 Plugin name colo already loaded
0.437 Plugin name explorer already loaded
0.437 Plugin name qbzr already loaded
0.562 encoding stdout as sys.stdout encoding 'cp866'
0.672 opening working tree 'C:/work/
[ 3336] 2012-03-28 11:42:36.828 INFO: M NEWS.txt
[ 3336] 2012-03-28 11:42:36.828 INFO: M lib/conflicts.py
[ 3336] 2012-03-28 11:42:36.842 INFO: M lib/subprocess.py
[ 3336] 2012-03-28 11:42:36.842 INFO: M lib/widgets/
[ 3336] 2012-03-28 11:42:36.842 INFO: M po/qbzr-ar.po
[ 3336] 2012-03-28 11:42:36.858 INFO: M po/qbzr-cs.po
[ 3336] 2012-03-28 11:42:36.858 INFO: M po/qbzr-da.po
[ 3336] 2012-03-28 11:42:36.858 INFO: M po/qbzr-de.po
[ 3336] 2012-03-28 11:42:36.875 INFO: M po/qbzr-en.po
[ 3336] 2012-03-28 11:42:36.875 INFO: M po/qbzr-en_GB.po
[ 3336] 2012-03-28 11:42:36.875 INFO: M po/qbzr-es.po
[ 3336] 2012-03-28 11:42:36.890 INFO: M po/qbzr-et.po
[ 3336] 2012-03-28 11:42:36.890 INFO: M po/qbzr-fr.po
[ 3336] 2012-03-28 11:42:36.905 INFO: M po/qbzr-gl.po
[ 3336] 2012-03-28 11:42:36.905 INFO: M po/qbzr-he.po
[ 3336] 2012-03-28 11:42:36.905 INFO: M po/qbzr-hu.po
[ 3336] 2012-03-28 11:42:36.921 INFO: M po/qbzr-it.po
[ 3336] 2012-03-28 11:42:36.921 INFO: M po/qbzr-ja.po
[ 3336] 2012-03-28 11:42:36.921 INFO: M po/qbzr-nl.po
[ 3336] 2012-03-28 11:42:36.937 INFO: M po/qbzr-pl.po
[ 3336] 2012-03-28 11:42:36.937 INFO: M po/qbzr-pt_BR.po
[ 3336] 2012-03-28 11:42:36.937 INFO: M po/qbzr-ru.po
[ 3336] 2012-03-28 11:42:36.953 INFO: M po/qbzr-sk.po
[ 3336] 2012-03-28 11:42:36.953 INFO: M po/qbzr-sl.po
[ 3336] 2012-03-28 11:42:36.953 INFO: M po/qbzr-sr.po
[ 3336] 2012-03-28 11:42:36.967 INFO: M po/qbzr-sv.po
[ 3336] 2012-03-28 11:42:36.967 INFO: M po/qbzr-th.po
[ 3336] 2012-03-28 11:42:36.967 INFO: M po/qbzr-tr.po
[ 3336] 2012-03-28 11:42:36.983 INFO: M po/qbzr-uk.po
[ 3336] 2012-03-28 11:42:36.983 INFO: M po/qbzr.pot
2.328 Transferred: 0kB (0.0kB/s r:0kB w:0kB)
2.328 Traceback (most recent call last):
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\merge.pyo", line 2021, in merge_inner
File "bzrlib\merge.pyo", line 686, in do_merge
File "bzrlib\
File "bzrlib\
File "bzrlib\merge.pyo", line 654, in _do_merge_to
File "bzrlib\merge.pyo", line 802, i...