i18n-ja: synchronized with
87d37aceb5e3
i18n-pt_BR: synchronized with
60101427d618
setup.py: don't call splitlines twice on the output of xcodebuild (
issue3277)
merge with stable
mercurial/filemerge.py in the default branch does not need the additional
unlink calls, because the unlink calls at the end of filemerge.filemerge()
are called for internal:dump, too.
Added signature for changeset
53e2cd303ecf
Added tag 2.1.1 for changeset
53e2cd303ecf
dirstate: filecacheify _ignore (
issue3278)
This still doesn't handle the case where a command is run with
--config ui.ignore=path since we only look for changes in .hgignore.
dirstate: filecacheify _branch
The opener is relative to .hg, use it in a subclass of filecache to compute
the final path.
scmutil: add join method to opener to construct path relative to base
Useful when we only have the opener without the base path used when it was
constructed.
filecache: refactor path join logic to a function
New users of filecache use different names for the function used to compute
the runtime path of the cached file.
Users should subclass filecache and provide their own version of this
function to call the appropriate join function on 'obj' (an instance
of the class that its member function was decorated).