# # # patch "ChangeLog" # from [efd55e5a53bbfeeeae9616c0b3f795b1ea3e239d] # to [a771d685caaac614e5ee32e66d341a6a74848573] # # patch "contrib/monotone.zsh_completion" # from [87e133da9523605ec493a1a09bc7ef4ea59a519e] # to [ac67dc83cd168c6de08889760b5ef1c56660b137] # ============================================================ --- ChangeLog efd55e5a53bbfeeeae9616c0b3f795b1ea3e239d +++ ChangeLog a771d685caaac614e5ee32e66d341a6a74848573 @@ -1,3 +1,9 @@ +2006-06-30 Thomas Moschny + + * contrib/monotone.zsh_completion: New function + _mtn_files_changed, used by _mtn_commit and _mtn_revert. Renamed + and updated mtn_files_unmaintained. Minor fixes. + 2006-06-29 Thomas Moschny * contrib/monotone.zsh_completion: Bugfix: completion for 'mtn ci' ============================================================ --- contrib/monotone.zsh_completion 87e133da9523605ec493a1a09bc7ef4ea59a519e +++ contrib/monotone.zsh_completion ac67dc83cd168c6de08889760b5ef1c56660b137 @@ -67,14 +67,14 @@ (( $+functions[_mtn_add] )) || _mtn_add() { _arguments -s \ - '(-)--unknown[add unknown files from workspace]'\ - '*:file to add:_mtn_files_unmaintained' + '--unknown[add unknown files from workspace]'\ + '*:file to add:_mtn_files_unknown' } (( $+functions[_mtn_annotate] )) || _mtn_annotate() { _arguments -s \ - {'(-)-r+','(-)--revision='}'[select revision id for operation]:revision:_mtn_revisions'\ + {'(--revision)-r+','(-r)--revision='}'[select revision id for operation]:revision:_mtn_revisions'\ '--brief[print a brief version of the normal output]'\ '*:file to annotate:_mtn_existing_entries' } @@ -82,7 +82,7 @@ (( $+functions[_mtn_approve] )) || _mtn_approve() { _arguments -s \ - {'(-)-b+','(-)--branch='}'[select branch cert for operation]:branch:_mtn_branches'\ + {'(--branch)-b+','(-b)--branch='}'[select branch cert for operation]:branch:_mtn_branches'\ '(*)*:revision:_mtn_revisions' } @@ -166,7 +166,7 @@ '--date=[override date/time for commit]:date'\ '--author=[override author for commit]:author'\ '--depth=[limit the number of levels of directories to descend]:depth'\ - '*:modified files:_mtn_existing_entries' + '*:modified files:_mtn_files_changed' } (( $+functions[_mtn_complete] )) || @@ -277,7 +277,7 @@ (( $+functions[_mtn_revert] )) || _mtn_revert() { - _mtn_existing_entries + _mtn_files_changed } (( $+functions[_mtn_serve] )) || @@ -314,11 +314,20 @@ # define completion functions for files maintained by monotone. -(( $+functions[_mtn_files_unmaintained] )) || -_mtn_files_unmaintained() { - compadd -- $(mtn ls unknown) +(( $+functions[_mtn_files_unknown] )) || +_mtn_files_unknown() { + for i in $(mtn ls unknown --depth=0 . 2>/dev/null) + do compadd -- $i:t + done } +(( $+functions[_mtn_files_changed] )) || +_mtn_files_changed() { + for i in $(mtn ls changed --depth=0 . 2>/dev/null) + do compadd -- $i:t + done +} + (( $+functions[_mtn_existing_entries] )) || _mtn_existing_entries() { for i in $(mtn ls known --depth=0 . 2>/dev/null)