Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/ui.py @ 1440:bf109779f48b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix relative pull in a subdir
author tonfa@arakou.lan
date Mon, 24 Oct 2005 17:41:45 -0700
parents 9d2c2e6b32b5
children 7d66ce9895fa
comparison
equal deleted inserted replaced
1439:65cbe22b03fa 1440:bf109779f48b
87 f = user.find('<') 87 f = user.find('<')
88 if f >= 0: 88 if f >= 0:
89 user = user[f+1:] 89 user = user[f+1:]
90 return user 90 return user
91 91
92 def expandpath(self, loc): 92 def expandpath(self, loc, root=""):
93 paths = {} 93 paths = {}
94 for name, path in self.configitems("paths"): 94 for name, path in self.configitems("paths"):
95 m = path.find("://")
96 if m == -1:
97 path = os.path.join(root, path)
95 paths[name] = path 98 paths[name] = path
96 99
97 return paths.get(loc, loc) 100 return paths.get(loc, loc)
98 101
99 def write(self, *args): 102 def write(self, *args):