Mercurial > hg-stable
diff mercurial/commands.py @ 22837:2be7d5ebd4d0
config: use the same hgrc for a cloned repo as for an uninitted repo
This just copies the same local sample hgrc, except it sets the
default path to the repo it was cloned from.
This is cut-and-paste from the local sample hgrc, but I think it's
acceptable, since the two pieces of code are right next to each other
and they're small. There is danger of them going out of synch, but it
would complicate the code too much to get rid of this C&P.
I also add ui as an import to hg.py, but with demandimport, this
should not be a noticeable performance hit.
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Mon, 06 Oct 2014 16:35:02 -0400 |
parents | 9271630f4720 |
children | 40f46fd7c50e |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Oct 08 07:45:51 2014 -0400 +++ b/mercurial/commands.py Mon Oct 06 16:35:02 2014 -0400 @@ -22,6 +22,7 @@ import random import setdiscovery, treediscovery, dagutil, pvec, localrepo import phases, obsolete, exchange +import ui as uimod table = {} @@ -1558,14 +1559,12 @@ if os.path.exists(f): break else: - from ui import samplehgrcs - if opts.get('global'): - samplehgrc = samplehgrcs['global'] + samplehgrc = uimod.samplehgrcs['global'] elif opts.get('local'): - samplehgrc = samplehgrcs['local'] + samplehgrc = uimod.samplehgrcs['local'] else: - samplehgrc = samplehgrcs['user'] + samplehgrc = uimod.samplehgrcs['user'] f = paths[0] fp = open(f, "w")