comparison mercurial/ui.py @ 27563:56c2caffde3d

paths: do not process default-push as pushurl of default path (issue5000)

It didn't work because "default-push" and "default" are independent named
items. Without this patch, "hg push default" would push to "default-push"
because paths["default"].pushloc was overwritten by "default-push".

Also, we shouldn't ban a user from doing "hg push default-push" so long as
"default-push" item is defined, not "default:pushurl". Otherwise, he would
be confused by missing "default-push" path.

Tests are included in a patch for stable branch.

27562:cb0cfa9fd340

        for name, loc in ui.configitems('paths', ignoresub=True):
            # No location is the same as not existing.
            if not loc:
                continue

            # TODO ignore default-push once all consumers stop referencing it
            # since it is handled specifically below.

            loc, sub = ui.configsuboptions('paths', name)
            self[name] = path(ui, name, rawloc=loc, suboptions=sub)

        # Handle default-push, which is a one-off that defines the push URL for
        # the "default" path.
        defaultpush = ui.config('paths', 'default-push')
        if defaultpush:
            # "default-push" can be defined without "default" entry. This is a
            # bit weird, but is allowed for backwards compatibility.
            if 'default' not in self:
                self['default'] = path(ui, 'default', rawloc=defaultpush)
            self['default'].pushloc = defaultpush

    def getpath(self, name, default=None):
        """Return a ``path`` from a string, falling back to default.

        ``name`` can be a named path or locations. Locations are filesystem

27563:56c2caffde3d

        for name, loc in ui.configitems('paths', ignoresub=True):
            # No location is the same as not existing.
            if not loc:
                continue
            loc, sub = ui.configsuboptions('paths', name)
            self[name] = path(ui, name, rawloc=loc, suboptions=sub)

    def getpath(self, name, default=None):
        """Return a ``path`` from a string, falling back to default.

        ``name`` can be a named path or locations. Locations are filesystem