Merge from trunk of workers/{21150,22552,2265x}.

1 files changed, 21 insertions, 5 deletions

diff --git a/Completion/Unix/Command/_tla b/Completion/Unix/Command/_tla
index a047d1dd1..9c5c5a821 100644
--- a/Completion/Unix/Command/_tla
+++ b/Completion/Unix/Command/_tla
@@ -8,8 +8,13 @@ local hide_short
 # ask the user which version of tla this is
 if ! zstyle -s ":completion:${curcontext}" tla-version tla_version; then
   # ask tla instead
-  tla_version="${${$($TLA --version)#tla tla-}%% from regexps.com*}"
-  [[ $tla_version == *[a-zA-Z]* ]] && tla_version=1.3 # tla doesn't know
+  tla_version="$($TLA --version)"
+  if [[ "${${(f)tla_version}[1]}" == The\ GNU\ Arch\ Revision\ Control\ System\ \(tla\)\ (#b)([0-9.]##) ]]; then
+    tla_version="$match[1]"
+  else
+    tla_version="${${$($TLA --version)#tla tla-}%% from regexps.com*}"
+    [[ $tla_version == *[a-zA-Z]* ]] && tla_version=1.3 # tla doesn't know
+  fi
 fi
 
 # test whether to hide short options from completion
@@ -137,6 +142,7 @@ local cmd_log_ls cmd_update cmd_join_branch cmd_replay cmd_deltapatch
 local cmd_delta_patch cmd_apply_delta cmd_sync_tree cmd_make_sync_tree
 local cmd_delta cmd_revdelta cmd_library_categories cmd_library_branches
 local cmd_library_versions cmd_library_revisions
+local cmd_archive_register
 
 cmd_log_ls=('*:version:_tla_log_versions')
 cmd_log_versions=()
@@ -144,6 +150,7 @@ cmd_log_versions=()
 
 if is-at-least 1.1 $tla_version; then
   cmd_register_archive=('::archive:_tla_archives' ':location:_files -/')
+  cmd_archive_register=($cmd_register_archive)
   cmd_archives=('::regex:')
   cmd_redo=('::changeset:_files -/')
   cmd_changes=('::revision:_tla_revisions'
@@ -252,8 +259,9 @@ local cmd_inventory cmd_srcfind
 cmd_inventory=('::separator:(--)' '*:directory:_files -/')
 cmd_srcfind=($cmd_inventory)
 
-local cmd_tree_lint
+local cmd_tree_lint cmd_lint
 cmd_tree_lint=('::directory:_files -/')
+cmd_lint=($cmd_tree_lint)
 
 local cmd_id cmd_invtag
 cmd_id=('*:file:_files')
@@ -417,9 +425,10 @@ cmd_merges=(':INTO:_tla_revisions' '::FROM:_tla_revisions')
 local cmd_new_merges
 cmd_new_merges=('::version:_tla_versions')
 
-local cmd_tag cmd_tagrev
+local cmd_tag cmd_tagrev cmd_branch
 cmd_tag=(':SOURCE-REVISION:_tla_revisions' ':TAG-VERSION:_tla_versions')
 cmd_tagrev=($cmd_tag)
+cmd_branch=($cmd_tag)
 
 local cmd_star_merge
 cmd_star_merge=(':FROM:_tla_revisions')
@@ -441,8 +450,9 @@ cmd_add_pristine=(':revision:_tla_revisions')
 local cmd_find_pristine
 cmd_find_pristine=(':revision:_tla_revisions')
 
-local cmd_my_revision_library
+local cmd_my_revision_library cmd_library_dir
 cmd_my_revision_library=(':library:_tla_my_revision_library')
+cmd_library_dir=($my_revision_library)
 
 local cmd_library_find
 cmd_library_find=(':revision:_tla_revisions --library')
@@ -483,6 +493,12 @@ cmd_rm=('*:file:_files')
 local cmd_escape
 cmd_escape=(':string:')
 
+local cmd_diff
+cmd_diff=('::revision:_tla_revisions')
+
+local cmd_export
+cmd_export=(':revision:_tla_revisions' ':dir:_files -/')
+
 #mutually exclusive options
 
 local -A excludes