From c62db9e7dc2f59337aec1df55663383c524886cb Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Thu, 22 Oct 2015 12:30:24 +0000 Subject: 36912: vcs_info quilt: Tolerate being in child of .pc's parent Without this, gen-applied-string would only be set when .pc is a child of cwd, not when it is a child of an ancestor of cwd. --- ChangeLog | 5 +++++ Functions/VCS_Info/VCS_INFO_quilt | 1 + 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index ef5cbe1f0..fe93bc724 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-10-24 Daniel Shahaf + + * 36912: Functions/VCS_Info/VCS_INFO_quilt: vcs_info quilt: + Tolerate being in child of .pc's parent + 2015-10-24 Peter Stephenson * unposted: Src/utils.c: small typo. diff --git a/Functions/VCS_Info/VCS_INFO_quilt b/Functions/VCS_Info/VCS_INFO_quilt index bc71cfb7d..29603a27a 100644 --- a/Functions/VCS_Info/VCS_INFO_quilt +++ b/Functions/VCS_Info/VCS_INFO_quilt @@ -119,6 +119,7 @@ function VCS_INFO_quilt() { applied=() fi patches=$(<$pc/.quilt_patches) + patches=`builtin cd -q "${pc:h}" && print -r - ${patches:A}` fi if zstyle -t "${context}" get-unapplied; then # This zstyle call needs to be moved further up if `quilt' needs -- cgit 1.4.1 From 779b3112f85d01d297ab04e6c1b68a0b33d76a55 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Wed, 21 Oct 2015 05:11:59 +0000 Subject: 36913 + 36945: vcs_info quilt: Pass patch subject lines to gen-applied-string The format used is '${patchname} ${subject}', which is analogous to the git backend. --- ChangeLog | 3 +++ Functions/VCS_Info/VCS_INFO_quilt | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/ChangeLog b/ChangeLog index fe93bc724..dffd3b35a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-10-24 Daniel Shahaf + * 36913 + 36945: Functions/VCS_Info/VCS_INFO_quilt: vcs_info quilt: + Pass patch subject lines to gen-applied-string + * 36912: Functions/VCS_Info/VCS_INFO_quilt: vcs_info quilt: Tolerate being in child of .pc's parent diff --git a/Functions/VCS_Info/VCS_INFO_quilt b/Functions/VCS_Info/VCS_INFO_quilt index 29603a27a..c3c3d864d 100644 --- a/Functions/VCS_Info/VCS_INFO_quilt +++ b/Functions/VCS_Info/VCS_INFO_quilt @@ -145,6 +145,36 @@ function VCS_INFO_quilt() { unapplied=() fi + if [[ -n $patches ]]; then + () { + local i line + for ((i=1; i<=$#applied; i++)); do + if [[ -f "$patches/$applied[$i]" ]] && + read -r line < "$patches/$applied[$i]" && + [[ $line != (#b)(---|Index:)* ]] && + true + ; + then + applied[$i]+=" $line" + else + applied[$i]+=" ?" + fi + done + for ((i=1; i<=$#unapplied; i++)); do + if [[ -f "$patches/$unapplied[$i]" ]] && + read -r line < "$patches/$unapplied[$i]" && + [[ $line != (#b)(---|Index:)* ]] && + true + ; + then + unapplied[$i]+=" $line" + else + unapplied[$i]+=" ?" + fi + done + } + fi + all=( ${(Oa)applied} ${unapplied} ) if VCS_INFO_hook 'gen-applied-string' "${applied[@]}"; then -- cgit 1.4.1 From e3c68450d77e679499a93fa87d964907213e15c3 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Sat, 24 Oct 2015 20:31:01 +0000 Subject: unposted: _beep completion: Actually hook it for the 'beep' command. --- ChangeLog | 3 +++ Completion/Unix/Command/_beep | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index dffd3b35a..44830070e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-10-24 Daniel Shahaf + * unposted: Completion/Unix/Command/_beep: _beep completion: + Actually hook it for the 'beep' command. + * 36913 + 36945: Functions/VCS_Info/VCS_INFO_quilt: vcs_info quilt: Pass patch subject lines to gen-applied-string diff --git a/Completion/Unix/Command/_beep b/Completion/Unix/Command/_beep index c49c09726..d393bc91e 100644 --- a/Completion/Unix/Command/_beep +++ b/Completion/Unix/Command/_beep @@ -1,4 +1,4 @@ -#compdef _beep +#compdef beep # beep [--verbose | --debug] [-e device | --device device] [-f N] [-l N] # [-r N] [-d N] [-D N] [-s] [-c] -- cgit 1.4.1