view contrib/tcsh_completion @ 29774:a7f8939641aa

merge: use labels in prompts to the user

Now that we persist the labels, we can consistently use the labels in
prompts for the user without risk of confusion. This changes a huge amount
of command output:

This means that merge prompts like:
  no tool found to merge a
  keep (l)ocal, take (o)ther, or leave (u)nresolved? u
and
  remote changed a which local deleted
  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
become:
  no tool found to merge a
  keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved? u
and
  remote [source] changed a which local [dest] deleted
  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
where "working copy" and "destination" were supplied by the command that
requested the merge as labels for conflict markers, and thus should be
human-friendly.

#
# tcsh completion for Mercurial
#
# This file has been auto-generated by tcsh_completion_build.sh for
# Mercurial Distributed SCM (version 1.7.5+157-8a220ae0b2ba)
#
# Copyright (C) 2005 TK Soh.
#
# This is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation; either version 2 of the License, or (at your
# option) any later version.
#

complete hg \
  'n/--cwd/d/' 'n/-R/d/' 'n/--repository/d/' \
  'C/-/( -R --repository \
    --cwd \
    -y --noninteractive \
    -q --quiet \
    -v --verbose \
    --config \
    --debug \
    --debugger \
    --encoding \
    --encodingmode \
    --traceback \
    --time \
    --profile \
    --version \
    -h --help)/' \
  'p/1/(add addremove annotate blame archive \
    backout bisect bookmarks branch branches \
    bundle cat clone commit ci \
    copy cp debugancestor debugbuilddag debugcheckstate \
    debugcommands debugcomplete debugdag debugdata debugdate \
    debugfsinfo debugignore debugindex debugindexdot debuginstall \
    debugpushkey debugrebuildstate debugrename debugrevspec debugsetparents \
    debugstate debugsub debugwalk diff export \
    forget grep heads help identify \
    id import patch incoming in \
    init locate log history manifest \
    merge outgoing out parents paths \
    pull push recover remove rm \
    rename move mv resolve revert \
    rollback root serve showconfig debugconfig \
    status st summary sum tag \
    tags tip unbundle update up \
    checkout co verify version)/'