##// END OF EJS Templates
paths: do not process default-push as pushurl of default path (issue5000)...
Yuya Nishihara -
r27563:56c2caff default
parent child Browse files
Show More
@@ -1097,23 +1097,9 b' class paths(dict):'
1097 # No location is the same as not existing.
1097 # No location is the same as not existing.
1098 if not loc:
1098 if not loc:
1099 continue
1099 continue
1100
1101 # TODO ignore default-push once all consumers stop referencing it
1102 # since it is handled specifically below.
1103
1104 loc, sub = ui.configsuboptions('paths', name)
1100 loc, sub = ui.configsuboptions('paths', name)
1105 self[name] = path(ui, name, rawloc=loc, suboptions=sub)
1101 self[name] = path(ui, name, rawloc=loc, suboptions=sub)
1106
1102
1107 # Handle default-push, which is a one-off that defines the push URL for
1108 # the "default" path.
1109 defaultpush = ui.config('paths', 'default-push')
1110 if defaultpush:
1111 # "default-push" can be defined without "default" entry. This is a
1112 # bit weird, but is allowed for backwards compatibility.
1113 if 'default' not in self:
1114 self['default'] = path(ui, 'default', rawloc=defaultpush)
1115 self['default'].pushloc = defaultpush
1116
1117 def getpath(self, name, default=None):
1103 def getpath(self, name, default=None):
1118 """Return a ``path`` from a string, falling back to default.
1104 """Return a ``path`` from a string, falling back to default.
1119
1105
General Comments 0
You need to be logged in to leave comments. Login now