985 else: |
985 else: |
986 lui = ui.copy() |
986 lui = ui.copy() |
987 if rcutil.use_repo_hgrc(): |
987 if rcutil.use_repo_hgrc(): |
988 _readsharedsourceconfig(lui, path) |
988 _readsharedsourceconfig(lui, path) |
989 lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path) |
989 lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path) |
|
990 lui.readconfig(os.path.join(path, b".hg", b"hgrc-not-shared"), path) |
990 |
991 |
991 if rpath: |
992 if rpath: |
992 path = lui.expandpath(rpath) |
993 path = lui.expandpath(rpath) |
993 lui = ui.copy() |
994 lui = ui.copy() |
994 if rcutil.use_repo_hgrc(): |
995 if rcutil.use_repo_hgrc(): |
995 _readsharedsourceconfig(lui, path) |
996 _readsharedsourceconfig(lui, path) |
996 lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path) |
997 lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path) |
|
998 lui.readconfig(os.path.join(path, b".hg", b"hgrc-not-shared"), path) |
997 |
999 |
998 return path, lui |
1000 return path, lui |
999 |
1001 |
1000 |
1002 |
1001 def _checkshellalias(lui, ui, args): |
1003 def _checkshellalias(lui, ui, args): |