Mercurial > public > mercurial-scm > hg

comparison mercurial/context.py @ 18036:8b846dbc57b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: support calculating merge actions against non-working contexts This is not currently used. It is instead a pre-requisite to performing non-conflicting grafts in memory, which a subsequent patch will do.
author David Schleimer <dschleimer@fb.com>
date Tue, 04 Dec 2012 12:54:18 -0800
parents aba3c161bcc6
children 03604f46d48a
comparison
equal deleted inserted replaced
18035:5881d5b7552f 18036:8b846dbc57b6
353 return dirs 353 return dirs
354 354
355 def dirs(self): 355 def dirs(self):
356 return self._dirs 356 return self._dirs
357 357
358 def dirty(self):
359 return False
360
358 class filectx(object): 361 class filectx(object):
359 """A filecontext object makes access to data related to a particular 362 """A filecontext object makes access to data related to a particular
360 filerevision convenient.""" 363 filerevision convenient."""
361 def __init__(self, repo, path, changeid=None, fileid=None, 364 def __init__(self, repo, path, changeid=None, fileid=None,
362 filelog=None, changectx=None): 365 filelog=None, changectx=None):