comparison tests/test-merge1.t @ 23579:e1c39f207719

subrepo: drop the 'ui' parameter to revert() This no longer needs to be explicitly passed because the subrepo object tracks the 'ui' reference since fcbc66b5da6a. See the change to 'archive' for details about the differences between the output level in the root repo and subrepo 'ui' object. The only use for 'ui' in revert is to emit status and warning messages, and to check the verbose flag prior to printing the action to be performed on a file. The local repo's ui was already being used to print a warning message in wctx.forget() and for 'ui.slash' when walking dirstate in the repo.status() call. Unlike other methods where the matcher is passed along and narrowed, a new matcher is created in each repo, and therefore the bad() method already used the local repo's ui.
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 13 Dec 2014 19:44:55 -0500
parents 94c394653b2a
children 1ef96a3b8b89
comparison
equal deleted inserted replaced
23578:d0546e8e1def 23579:e1c39f207719