##// END OF EJS Templates
merge: don't report progress for dr/rd actions...
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.

File last commit:

r17192:1ac628cd default
r23524:a1a7c94d default
Show More
notcapable
24 lines | 806 B | text/plain | TextLexer
Steven Brown
tests: add script to disable a selected wire protocol capability...
r14011 # Disable the $CAP wire protocol capability.
if test -z "$CAP"
then
echo "CAP environment variable not set."
fi
cat > notcapable-$CAP.py << EOF
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 from mercurial import extensions, peer, localrepo
Steven Brown
tests: add script to disable a selected wire protocol capability...
r14011 def extsetup():
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 extensions.wrapfunction(peer.peerrepository, 'capable', wrapcapable)
extensions.wrapfunction(localrepo.localrepository, 'peer', wrappeer)
def wrapcapable(orig, self, name, *args, **kwargs):
Peter Arrenbrecht
tests: support multiple caps in notcapable
r14409 if name in '$CAP'.split(' '):
Steven Brown
tests: add script to disable a selected wire protocol capability...
r14011 return False
return orig(self, name, *args, **kwargs)
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 def wrappeer(orig, self):
# Since we're disabling some newer features, we need to make sure local
# repos add in the legacy features again.
return localrepo.locallegacypeer(self)
Steven Brown
tests: add script to disable a selected wire protocol capability...
r14011 EOF
echo '[extensions]' >> $HGRCPATH
echo "notcapable-$CAP = `pwd`/notcapable-$CAP.py" >> $HGRCPATH