Mercurial > hg
view contrib/tcsh_completion @ 23524:a1a7c94def6d
merge: don't report progress for dr/rd actions
It is easier to reason about certain algorithms in terms of a
file->action mapping than the current action->list-of-files. Bid merge
is already written this way (but with a list of actions per file), and
largefiles' overridecalculateupdates() will also benefit. However,
that requires us to have at most one action per file. That requirement
is currently violated by 'dr' (divergent rename) and 'rd' (rename and
delete) actions, which can exist for the same file as some other
action.
These actions are only used for displaying warnings to the user; they
don't change anything in the working copy or the dirstate. In this
way, they are similar to the 'k' (keep) action. However, they are even
less action-like than 'k' is: 'k' at least describes what to do with
the file ("do nothing"), while 'dr' and 'rd' or only annotations for
files for which there may exist other, "real" actions.
As a first step towards separating these acitons out, stop including
them in the progress output, just like we already exclude the 'k'
action.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 05 Dec 2014 16:13:26 -0800 |
parents | 2616325766e3 |
children |
line wrap: on
line source
# # 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)/'