/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

  • Committer: Jan Hudec
  • Date: 2006-11-25 20:38:39 UTC
  • mto: (2199.1.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 2200.
  • Revision ID: bulb@ucw.cz-20061125203839-9nuhv32z63hb8811
Option --pull for merge command.

Option --pull was added to merge command, that, if the merge would be
trivial, ie. if the common ancestor is equal to the local tip, causes pull of
the remote instead of creating the merger.

Simple test for this option is included.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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