Update the bash prompt from 'applied' instead of the obsolete 'current'

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
söndag 20 maj 2007 skrev Yann Dirson:
> Note that "tail -1" gives a warning with newer versions, "tail -n 1"
> should be the proper call.
My man page doesn't mention -N being deprecated, but ok since -n 1 seems
to work here too.

> Also I'm not sure it is a good way to look at "applied" file, since
> Karl IIRC has plans to change this.  Better call "stg top" and not
> touch that again :)

Calling stg is too slow to be be used here. I that command in my first draft
for this function and people complained (see the thread named "Bash snippet
to show branch and patch in bash prompt"). It takes ~ 0.15s on here which is
very noticable, barely below my pain threshold.

We'll update the prompt when and if Karl breaks this.

It'd probably drain my battery too :/

-- robin

 contrib/stgbashprompt.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/stgbashprompt.sh b/contrib/stgbashprompt.sh
index 16bb39bba711d9a24e69ed82c7f44eeb6dfca641..f4817a12a698ec4c88722ee344313d400a5ca9ed 100755 (executable)
--- a/contrib/stgbashprompt.sh
+++ b/contrib/stgbashprompt.sh
@@ -8,8 +8,8 @@ if [ "$PS1" ]; then
                git_dir=$(git-rev-parse --git-dir 2> /dev/null) || return
                ref=$(git-symbolic-ref HEAD 2> /dev/null) || return
                br=${ref#refs/heads/}
                git_dir=$(git-rev-parse --git-dir 2> /dev/null) || return
                ref=$(git-symbolic-ref HEAD 2> /dev/null) || return
                br=${ref#refs/heads/}

-               top=$(cat $git_dir/patches/$br/current 2>/dev/null) \
-                       && top="/$top"
+               top=$(tail -n 1 $git_dir/patches/$br/applied 2>/dev/null) \
+                       && top="/$top";

                echo "[$br$top]"
        }
        PS1='\u@\h:$(__prompt_git)\W\$ '
                echo "[$br$top]"
        }
        PS1='\u@\h:$(__prompt_git)\W\$ '