##// END OF EJS Templates
ui: drop the deprecated `expandpath()`...
Matt Harbison -
r50737:dcf983a5 default
parent child Browse files
Show More
@@ -1099,27 +1099,6 class ui:
1099 user = stringutil.shortuser(user)
1099 user = stringutil.shortuser(user)
1100 return user
1100 return user
1101
1101
1102 def expandpath(self, loc, default=None):
1103 """Return repository location relative to cwd or from [paths]"""
1104 msg = b'ui.expandpath is deprecated, use `get_*` functions from urlutil'
1105 self.deprecwarn(msg, b'6.0')
1106 try:
1107 p = self.getpath(loc)
1108 if p:
1109 return p.rawloc
1110 except error.RepoError:
1111 pass
1112
1113 if default:
1114 try:
1115 p = self.getpath(default)
1116 if p:
1117 return p.rawloc
1118 except error.RepoError:
1119 pass
1120
1121 return loc
1122
1123 @util.propertycache
1102 @util.propertycache
1124 def paths(self):
1103 def paths(self):
1125 return urlutil.paths(self)
1104 return urlutil.paths(self)
General Comments 0
You need to be logged in to leave comments. Login now