comparison mercurial/manifest.py @ 3887:79e5a6e7c451

Merge with main
author Brendan Cully <brendan@kublai.com>
date Thu, 14 Dec 2006 13:49:33 -0800
parents abaee83ce0a6
children 6b4127c7d52a
comparison
equal deleted inserted replaced
3884:d83b125b7d7e 3887:79e5a6e7c451
5 # This software may be used and distributed according to the terms 5 # This software may be used and distributed according to the terms
6 # of the GNU General Public License, incorporated herein by reference. 6 # of the GNU General Public License, incorporated herein by reference.
7 7
8 from revlog import * 8 from revlog import *
9 from i18n import gettext as _ 9 from i18n import gettext as _
10 from demandload import * 10 import array, bisect, struct, mdiff
11 demandload(globals(), "array bisect struct")
12 demandload(globals(), "mdiff")
13 11
14 class manifestdict(dict): 12 class manifestdict(dict):
15 def __init__(self, mapping=None, flags=None): 13 def __init__(self, mapping=None, flags=None):
16 if mapping is None: mapping = {} 14 if mapping is None: mapping = {}
17 if flags is None: flags = {} 15 if flags is None: flags = {}