/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to contrib/bash/bzrbashprompt.sh

Fix #339055 and #277444 by handling non ascii symlink targets.

* bzrlib/tests/tree_implementations/test_path_content_summary.py:
(TestPathContentSummary.test_unicode_symlink_target_summary): Test
adding a non ascii symlink target.

* bzrlib/tests/workingtree_implementations/test_parents.py:
(TestSetParents.test_unicode_symlink): Should not fail anymore

* bzrlib/tests/branch_implementations/test_sprout.py:
(TestSprout.test_sprout_with_unicode_symlink): Should not fail anymore.

* bzrlib/workingtree.py:
(WorkingTree.path_content_summary): Get the symlink target as
unicode.

* bzrlib/transform.py:
(_PreviewTree.path_content_summary): Get the symlink target as
unicode.

* bzrlib/dirstate.py:
(DirState._read_link): abspath should stay in Unicode.
(DirState._inv_entry_to_details): Encode path in utf8 for the
fingerprint.

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/bash/bzrbashprompt.sh
 
1
# modify PS1 to your preference and include this file in your bashrc
 
2
# or copy to /etc/bash_completions.d.
 
3
 
 
4
function __prompt_bzr()
 
5
{
 
6
        local revno nick;
 
7
        revno=$(bzr revno 2>/dev/null) || return
 
8
        nick=$(bzr nick 2>/dev/null) || return
 
9
        echo "[bzr://$revno@$nick]"
 
10
}
 
11
 
 
12
if [ "$PS1" ]; then
 
13
        PS1='\u@\h:$(__prompt_bzr)\W\$ '
 
14
fi