Commits

Antoine Albertelli committed 80827cb

Fixed a bug where the prompt would not display the branch if we are not at the root directory of a repository.

Comments (0)

Files changed (2)

     printf '%s%s%s%s%s' (set_color $fish_color_cwd) (prompt_pwd) (set_color normal) 
 
     # Prints mercurial current branch if we are in a repository.
-    if test -e .hg
-        printf " %s" (hg branch 2> /dev/null) 
-    end
+    printf " %s" (hg branch 2> /dev/null) 
 
     # Prints the git branch if we are in a git repository.
-    if test -e .git
-        printf " %s" (git branch | grep "*" | cut --fields=2 --delimiter=" ") 
-    end 
+    printf " %s" (git branch 2> /dev/null | grep "*" | cut --fields=2 --delimiter=" ") 
     echo ' >'
 end
 cups-filters
 cups-pk-helper
 curl
+cython
 damageproto
 dash
 dasher
 fuse-exfat
 gavl
 gawk
-gcalctool
 gcc-ada
 gcc-fortran
 gcc-libs-multilib
 gnome-applets
 gnome-backgrounds
 gnome-bluetooth
+gnome-calculator
 gnome-color-manager
 gnome-contacts
 gnome-control-center
 gnome-doc-utils
 gnome-documents
 gnome-font-viewer
-gnome-games
-gnome-games-extra-data
 gnome-icon-theme
 gnome-icon-theme-extras
 gnome-icon-theme-symbolic
 jre7-openjdk
 jre7-openjdk-headless
 js
+js185
 json-c
 json-glib
 k3b
 lcms2
 ldb
 ldns
+leptonica
 less
+lesstif
 lib32-alsa-lib
 lib32-alsa-plugins
 lib32-atk
 libgcrypt
 libgdata
 libgdiplus
+libgdm
 libgdu
 libgee
+libgee06
 libgexiv2
 libgksu
 libglade
 libmusicbrainz3
 libmusicbrainz4
 libmusicbrainz5
+libnautilus-extension
 libnice
 libnl
 libnotify
 libpulse
 libpurple
 libpwquality
+libqmi
 libquvi
 libquvi-scripts
 libqzeitgeist
 libsndfile
 libsocialweb
 libsoup
-libsoup-gnome
 libspectre
 libspnav
 libssh
 libxklavier
 libxml2
 libxmu
+libxp
 libxpm
 libxrandr
 libxrender
 mlt
 mlt-python-bindings
 mobile-broadband-provider-info
+modemmanager
 mono
 mono-addins
 most
 powertop
 ppl
 ppp
+printproto
 procps-ng
 projectm
 protobuf
 pygobject2-devel
 pygoocanvas
 pygtk
-pylint
 pyqt
 pyqt-common
 pyrex
 python
+python-atspi
 python-beautifulsoup4
 python-cairo
 python-certifi
 python-dbus
 python-dbus-common
 python-distribute
+python-gobject
 python-matplotlib
 python-numpy
 python-pip
 python2-numpy
 python2-pip
 python2-pyflakes
+python2-pylint
 python2-pyopenssl
 python2-pyparsing
 python2-pypdf
 sip
 skype
 slang
+slim
 sloccount
 smbclient
 smpeg
 telepathy-haze
 telepathy-logger
 telepathy-mission-control
+tesseract
+tesseract-data-eng
 tevent
 texinfo
 texlive-bibtexextra
 xineramaproto
 xinetd
 xkeyboard-config
+xlockmore
 xmlto
 xorg-bdftopcf
 xorg-font-util
 xterm
 xvidcore
 xz
+yagf
 yajl
 yaourt
 yasm