Patchwork [04,of,15,V5] bash_completion: determine root executable in case of alias

login
register
mail settings
Submitter Sean Farley
Date Nov. 26, 2013, 7:54 p.m.
Message ID <4db0f0775ba835bd8678.1385499283@laptop.local>
Download mbox | patch
Permalink /patch/3158/
State Accepted
Commit 191ab08e70993229fb6fe12f3dba2148fbc9ebae
Headers show

Comments

Sean Farley - Nov. 26, 2013, 7:54 p.m.
# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1384971595 18000
#      Wed Nov 20 13:19:55 2013 -0500
# Node ID 4db0f0775ba835bd8678fee77846b39de17e5fbc
# Parent  64179bef207f2e50230decf79ab837460e746534
bash_completion: determine root executable in case of alias

This solves an issue for users that have "alias hg='hg --some_opts'" where they
would see wrong entries in the completion output (such as color codes).

Patch

diff --git a/contrib/bash_completion b/contrib/bash_completion
--- a/contrib/bash_completion
+++ b/contrib/bash_completion
@@ -128,16 +128,23 @@ 
     echo $(($count - 1))
 }
 
 _hg()
 {
-    local cur prev cmd cmd_index opts i
+    local cur prev cmd cmd_index opts i aliashg
     # global options that receive an argument
     local global_args='--cwd|-R|--repository'
     local hg="$1"
     local canonical=0
 
+    aliashg=$(alias $hg 2>/dev/null)
+    if [[ -n "$aliashg" ]]; then
+      aliashg=${aliashg#"alias $hg='"}
+      aliashg=${aliashg%"'"}
+      hg=$aliashg
+    fi
+
     COMPREPLY=()
     cur="$2"
     prev="$3"
 
     # searching for the command