Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cmdutil.py @ 20790:49f2d5644f04
config: set a 'source' in most cases where config don't come from file but code
Some extensions set configuration settings that showed up in 'hg showconfig
--debug' with 'none' as source. That was confusing.
Instead, they will now tell which extension they come from.
This change tries to be consistent and specify a source everywhere - also where
it perhaps is less relevant.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 19 Mar 2014 02:45:14 +0100 |
| parents | efbf15979538 |
| children | 7731a2281cf0 |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Wed Mar 19 02:45:14 2014 +0100 +++ b/mercurial/cmdutil.py Wed Mar 19 02:45:14 2014 +0100 @@ -1982,10 +1982,10 @@ commitphase = 'secret' else: commitphase = old.phase() - repo.ui.setconfig('phases', 'new-commit', commitphase) + repo.ui.setconfig('phases', 'new-commit', commitphase, 'amend') newid = repo.commitctx(new) finally: - repo.ui.setconfig('phases', 'new-commit', ph) + repo.ui.setconfig('phases', 'new-commit', ph, 'amend') if newid != old.node(): # Reroute the working copy parent to the new changeset repo.setparents(newid, nullid)