annotate mercurial/demandload.py @ 1772:b1a7fd503a29
hgmerge: logic changes
Details:
- keep automatic merge conflicts in $LOCAL
- do not assume that $EDITOR returns proper error code
- fix a slight mistake in diff+patch merge success detection
(it could succeed if the $EDITOR failed to run)
author |
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
date |
Tue, 21 Feb 2006 15:48:16 -0600 |
parents |
3db700146536 |
children |
f3abe0bdccdd |
rev |
line source |
262
|
1 def demandload(scope, modules):
|
|
2 class d:
|
|
3 def __getattr__(self, name):
|
|
4 mod = self.__dict__["mod"]
|
|
5 scope = self.__dict__["scope"]
|
|
6 scope[mod] = __import__(mod, scope, scope, [])
|
|
7 return getattr(scope[mod], name)
|
|
8
|
|
9 for m in modules.split():
|
|
10 dl = d()
|
|
11 dl.mod = m
|
|
12 dl.scope = scope
|
|
13 scope[m] = dl
|
|
14
|
|
15
|