diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2022-01-29 16:15:26 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2022-02-20 10:16:54 +0000 |
| commit | 421f5d7f67976e369ef8613c455d8232e2326f3a (patch) | |
| tree | 4177823a8db3743b4c52c9a5346028da1d06f10f | |
| parent | 80389df48067bab3711ad1604bc9554d08fb9994 (diff) | |
| download | zsh-421f5d7f67976e369ef8613c455d8232e2326f3a.tar.gz zsh-421f5d7f67976e369ef8613c455d8232e2326f3a.tar.xz zsh-421f5d7f67976e369ef8613c455d8232e2326f3a.zip | |
49728: vcs_info hg mq: Don't include applied patches in the unapplied patches
For instance, with 4 applied patches, 5 unapplied patches, and no guards involved, the patch-format style would indicate 9 (= 4+5) unapplied patches and 4 applied patches.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_hg | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index a856cc47f..a3e6497c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2022-02-20 Daniel Shahaf <d.s@daniel.shahaf.name> + * 49728: Functions/VCS_Info/Backends/VCS_INFO_get_data_hg: + vcs_info hg mq: Don't include applied patches in the unapplied + patches + * 49727 (+ comment): Doc/Zsh/contrib.yo, Functions/VCS_Info/Backends/VCS_INFO_get_data_git, Functions/VCS_Info/Backends/VCS_INFO_get_data_hg, diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg index e7123f0bf..ea3798b81 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg @@ -183,6 +183,9 @@ if zstyle -T ":vcs_info:${vcs}:${usercontext}:${rrn}" get-mq \ # Skip commented lines [[ ${i_patch} == [[:space:]]#"#"* ]] && continue + # Skip applied patches + (( ${+mqpatches[(re)${i_patch}]} )) && continue + # Separate negative and positive guards to more easily find the # intersection of active guards with patch guards i_patchguards=( ${(s: :)i_patchguards} ) |