--- 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")