Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 31330:a3a2382b2e1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: directly use repo.vfs.join The 'repo.join' method is about to be deprecated.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Wed, 08 Mar 2017 16:53:17 -0800
parents f59b6cf663a9
children dd49a6c166f7
comparison
equal deleted inserted replaced
31329:1b0db28dadf1 31330:a3a2382b2e1b
1770 raise error.Abort(_("can't use --local and --global together")) 1770 raise error.Abort(_("can't use --local and --global together"))
1771 1771
1772 if opts.get('local'): 1772 if opts.get('local'):
1773 if not repo: 1773 if not repo:
1774 raise error.Abort(_("can't use --local outside a repository")) 1774 raise error.Abort(_("can't use --local outside a repository"))
1775 paths = [repo.join('hgrc')] 1775 paths = [repo.vfs.join('hgrc')]
1776 elif opts.get('global'): 1776 elif opts.get('global'):
1777 paths = scmutil.systemrcpath() 1777 paths = scmutil.systemrcpath()
1778 else: 1778 else:
1779 paths = scmutil.userrcpath() 1779 paths = scmutil.userrcpath()
1780 1780