PATCH: vcs_info Mercurial backend branch name display

PATCH: vcs_info Mercurial backend branch name display

[Seth House]

This patch fixes a VCS_Info bug (introduced by me) that broke the branch display 
by always displaying as "default".

Sorry for the patch noise.
- Seth

diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg 
b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg
@@ -58,10 +58,11 @@
 # If the user doesn't opt to invoke hg we can still get the current branch
 if [[ -z ${r_branch} && -r ${branchfile} ]] ; then
     r_branch=$(< ${branchfile})
-else
-    r_branch="default"
 fi
 
+# If we still don't know the branch it's safe to assume default
+if [[ -n ${r_branch} ]] || r_branch="default"
+
 # The working dir has uncommitted-changes if the revision ends with a +
 if [[ $r_lrev[-1] == + ]] ; then
     hgchanges=1

Re: PATCH: =?utf-8?b?dmNzX2luZm8=?= Mercurial backend branch name display

[Greg Klanderman]

>>>>> On May 24, 2010 Seth House <seth@eseth.com> wrote:

> This patch fixes a VCS_Info bug (introduced by me) that broke the branch display 
> by always displaying as "default".

> +if [[ -n ${r_branch} ]] || r_branch="default"

Looks like you have a spurious 'if' there..

Greg

Re: PATCH: vcs_info Mercurial backend branch name display

[Seth House]

Greg Klanderman <gak <at> klanderman.net> writes:
> Looks like you have a spurious 'if' there..

No, that is correct. It initially tries to obtain the branch name by
invoking hg (line 54) -- only if the user has opted to allow invoking
hg. If it still doesn't know the branch name and a file containing the
name is readable, it will pull it from the file (line 59). Finally, if
we still don't know the branch it defaults to "default" (line 64).

It could be refactored to the following if you feel this is more
readable:

# If the user doesn't opt to invoke hg we can still get the current branch
if [[ -z ${r_branch} ]] ; then
    if [[ -r ${branchfile} ]] ; then
        r_branch=$(< ${branchfile})
    else
        # If we still don't know the branch it's safe to assume default
        r_branch="default"
    fi
fi

Re: PATCH: vcs_info Mercurial backend branch name display

[Seth House]

Greg Klanderman <gak <at> klanderman.net> writes:
> Looks like you have a spurious 'if' there..

<facepalm>

It took me ten minutes and an email from Bart (thanks Bart!) to see the mistake. 
Here's the fixed patch and now I'm gonna grab more coffee...

diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg 
b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg
@@ -58,10 +58,11 @@
 # If the user doesn't opt to invoke hg we can still get the current branch
 if [[ -z ${r_branch} && -r ${branchfile} ]] ; then
     r_branch=$(< ${branchfile})
-else
-    r_branch="default"
 fi
 
+# If we still don't know the branch it's safe to assume default
+[[ -n ${r_branch} ]] || r_branch="default"
+
 # The working dir has uncommitted-changes if the revision ends with a +
 if [[ $r_lrev[-1] == + ]] ; then
     hgchanges=1