Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/ui.py @ 1938:36c6e4c3ff43
merge with crew.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Mon, 13 Mar 2006 08:25:33 -0800 |
parents | b7cc0f323a4c acce3f7e1779 |
children | 696230e52e4d |
comparison
equal
deleted
inserted
replaced
1937:3f6be77eda58 | 1938:36c6e4c3ff43 |
---|---|
58 raise util.Abort(_("Failed to parse %s\n%s") % (f, inst)) | 58 raise util.Abort(_("Failed to parse %s\n%s") % (f, inst)) |
59 # translate paths relative to root (or home) into absolute paths | 59 # translate paths relative to root (or home) into absolute paths |
60 if root is None: | 60 if root is None: |
61 root = os.path.expanduser('~') | 61 root = os.path.expanduser('~') |
62 for name, path in self.configitems("paths"): | 62 for name, path in self.configitems("paths"): |
63 if path.find("://") == -1 and not os.path.isabs(path): | 63 if path and path.find("://") == -1 and not os.path.isabs(path): |
64 self.cdata.set("paths", name, os.path.join(root, path)) | 64 self.cdata.set("paths", name, os.path.join(root, path)) |
65 | 65 |
66 def setconfig(self, section, name, val): | 66 def setconfig(self, section, name, val): |
67 self.overlay[(section, name)] = val | 67 self.overlay[(section, name)] = val |
68 | 68 |