annotate mercurial/demandload.py @ 275:61d45b0ba8fb
various merge improvements
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
various merge improvements
add -C flag: force update and overwrite local changes
add -m flag: allow merges with conflicts
we no longer do merge by default
and we print a warning message when the merge fails
fix bug in printing merge failure message
fix bug diffing files in 'm' state
manifest hash: 75545a6db45d1e371082343d01c9f177df0f9db3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpm6tywK+sNU5EO8RAvb+AJ0euC3YkUYA944hds3ooPxbw6NpVwCfc1dj
TiNsPIds560S5jgw44eWNto=
=GPXN
-----END PGP SIGNATURE-----
| author |
mpm@selenic.com |
| date |
Tue, 07 Jun 2005 20:06:05 -0800 |
| 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
|
