comparison mercurial/ui.py @ 11965:77f1f206e135 stable

mq: don't inherit default and default-push paths with --mq (issue2333)

Configuration from the outer repo is inherited to the patches repo when --mq is
used.

In case the patches repo only has paths.default configured but the outer repo
has paths.default-push then the inherited default-push will win. Very
confusing.

Inheriting the default paths is however wrong in all sane cases, so now we
explicitly remove them.

11960:df95b31bbdd7

        # update trust information
        self._trustusers.update(self.configlist('trusted', 'users'))
        self._trustgroups.update(self.configlist('trusted', 'groups'))

    def setconfig(self, section, name, value):
        for cfg in (self._ocfg, self._tcfg, self._ucfg):
            cfg.set(section, name, value)
        self.fixconfig()

    def _data(self, untrusted):
        return untrusted and self._ucfg or self._tcfg

11965:77f1f206e135

        # update trust information
        self._trustusers.update(self.configlist('trusted', 'users'))
        self._trustgroups.update(self.configlist('trusted', 'groups'))

    def setconfig(self, section, name, value, overlay=True):
        if overlay:
            self._ocfg.set(section, name, value)
        self._tcfg.set(section, name, value)
        self._ucfg.set(section, name, value)
        self.fixconfig()

    def _data(self, untrusted):
        return untrusted and self._ucfg or self._tcfg