comparison mercurial/scmutil.py @ 14527:5867bd6e7cf5

scmutil: improve path calculation for install-relative RC files (issue2841)

This code was ugly and might do the wrong thing with symlinks.

14526:4276e3202585

    def systemrcpath():
        path = []
        # old mod_python does not set sys.argv
        if len(getattr(sys, 'argv', [])) > 0:
            path.extend(rcfiles(os.path.dirname(sys.argv[0]) +
                                  '/../etc/mercurial'))
        path.extend(rcfiles('/etc/mercurial'))
        return path

    def userrcpath():
        return [os.path.expanduser('~/.hgrc')]

14527:5867bd6e7cf5

    def systemrcpath():
        path = []
        # old mod_python does not set sys.argv
        if len(getattr(sys, 'argv', [])) > 0:
            p = os.path.dirname(os.path.dirname(sys.argv[0]))
            path.extend(rcfiles(os.path.join(p, 'etc/mercurial')))
        path.extend(rcfiles('/etc/mercurial'))
        return path

    def userrcpath():
        return [os.path.expanduser('~/.hgrc')]