comparison mercurial/transaction.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
9 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> 9 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
10 # 10 #
11 # This software may be used and distributed according to the terms 11 # This software may be used and distributed according to the terms
12 # of the GNU General Public License, incorporated herein by reference. 12 # of the GNU General Public License, incorporated herein by reference.
13 13
14 from demandload import demandload
15 from i18n import gettext as _ 14 from i18n import gettext as _
16 demandload(globals(), 'os') 15 import os
17 16
18 class transaction(object): 17 class transaction(object):
19 def __init__(self, report, opener, journal, after=None): 18 def __init__(self, report, opener, journal, after=None):
20 self.journal = None 19 self.journal = None
21 20