Mercurial > public > mercurial-scm > hg-stable
diff hgext/mq.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.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Wed, 18 Aug 2010 02:43:45 +0200 |
| parents | 4f9dfb54c8b5 |
| children | fca15617721c a4fbbe0fbc38 |
line wrap: on
line diff
--- a/hgext/mq.py Thu Aug 19 10:59:37 2010 +0200 +++ b/hgext/mq.py Wed Aug 18 02:43:45 2010 +0200 @@ -1487,8 +1487,11 @@ return True def qrepo(self, create=False): + ui = self.ui.copy() + ui.setconfig('paths', 'default', '', overlay=False) + ui.setconfig('paths', 'default-push', '', overlay=False) if create or os.path.isdir(self.join(".hg")): - return hg.repository(self.ui, path=self.path, create=create) + return hg.repository(ui, path=self.path, create=create) def restore(self, repo, rev, delete=None, qupdate=None): desc = repo[rev].description().strip()