##// END OF EJS Templates
mq: don't inherit default and default-push paths with --mq (issue2333)...
Mads Kiilerich -
r11965:77f1f206 stable
parent child Browse files
Show More
@@ -1487,8 +1487,11 b' class queue(object):'
1487 return True
1487 return True
1488
1488
1489 def qrepo(self, create=False):
1489 def qrepo(self, create=False):
1490 ui = self.ui.copy()
1491 ui.setconfig('paths', 'default', '', overlay=False)
1492 ui.setconfig('paths', 'default-push', '', overlay=False)
1490 if create or os.path.isdir(self.join(".hg")):
1493 if create or os.path.isdir(self.join(".hg")):
1491 return hg.repository(self.ui, path=self.path, create=create)
1494 return hg.repository(ui, path=self.path, create=create)
1492
1495
1493 def restore(self, repo, rev, delete=None, qupdate=None):
1496 def restore(self, repo, rev, delete=None, qupdate=None):
1494 desc = repo[rev].description().strip()
1497 desc = repo[rev].description().strip()
@@ -121,9 +121,11 b' class ui(object):'
121 self._trustusers.update(self.configlist('trusted', 'users'))
121 self._trustusers.update(self.configlist('trusted', 'users'))
122 self._trustgroups.update(self.configlist('trusted', 'groups'))
122 self._trustgroups.update(self.configlist('trusted', 'groups'))
123
123
124 def setconfig(self, section, name, value):
124 def setconfig(self, section, name, value, overlay=True):
125 for cfg in (self._ocfg, self._tcfg, self._ucfg):
125 if overlay:
126 cfg.set(section, name, value)
126 self._ocfg.set(section, name, value)
127 self._tcfg.set(section, name, value)
128 self._ucfg.set(section, name, value)
127 self.fixconfig()
129 self.fixconfig()
128
130
129 def _data(self, untrusted):
131 def _data(self, untrusted):
General Comments 0
You need to be logged in to leave comments. Login now