equal
deleted
inserted
replaced
418 path = cmdutil.findrepo(wd) or "" |
418 path = cmdutil.findrepo(wd) or "" |
419 if not path: |
419 if not path: |
420 lui = ui |
420 lui = ui |
421 else: |
421 else: |
422 lui = ui.copy() |
422 lui = ui.copy() |
423 lui.readconfig(os.path.join(path, ".hg", "hgrc")) |
423 lui.readconfig(os.path.join(path, ".hg", "hgrc"), path) |
424 |
424 |
425 if rpath: |
425 if rpath: |
426 path = lui.expandpath(rpath[-1]) |
426 path = lui.expandpath(rpath[-1]) |
427 lui = ui.copy() |
427 lui = ui.copy() |
428 lui.readconfig(os.path.join(path, ".hg", "hgrc")) |
428 lui.readconfig(os.path.join(path, ".hg", "hgrc"), path) |
429 |
429 |
430 return path, lui |
430 return path, lui |
431 |
431 |
432 def _checkshellalias(ui, args): |
432 def _checkshellalias(ui, args): |
433 cwd = os.getcwd() |
433 cwd = os.getcwd() |