comparison mercurial/localrepo.py @ 3240:8d4855fd9d7b

merge: use new working context object in update
author Matt Mackall <mpm@selenic.com>
date Tue, 03 Oct 2006 01:21:46 -0500
parents ff15ba23c1cf
children a184cd0c2db9
comparison
equal deleted inserted replaced
3239:6d98149d70fe 3240:8d4855fd9d7b
318 f = f[1:] 318 f = f[1:]
319 return filelog.filelog(self.opener, f, self.revlogversion) 319 return filelog.filelog(self.opener, f, self.revlogversion)
320 320
321 def changectx(self, changeid=None): 321 def changectx(self, changeid=None):
322 return context.changectx(self, changeid) 322 return context.changectx(self, changeid)
323
324 def workingctx(self):
325 return context.workingctx(self)
323 326
324 def parents(self, changeid=None): 327 def parents(self, changeid=None):
325 ''' 328 '''
326 get list of changectxs for parents of changeid or working directory 329 get list of changectxs for parents of changeid or working directory
327 ''' 330 '''