equal
deleted
inserted
replaced
477 |
477 |
478 def mergestate(self, clean=False): |
478 def mergestate(self, clean=False): |
479 """Get a mergestate object for this context.""" |
479 """Get a mergestate object for this context.""" |
480 raise NotImplementedError( |
480 raise NotImplementedError( |
481 '%s does not implement mergestate()' % self.__class__ |
481 '%s does not implement mergestate()' % self.__class__ |
|
482 ) |
|
483 |
|
484 def isempty(self): |
|
485 return not ( |
|
486 len(self.parents()) > 1 |
|
487 or self.branch() != self.p1().branch() |
|
488 or self.closesbranch() |
|
489 or self.files() |
482 ) |
490 ) |
483 |
491 |
484 |
492 |
485 class changectx(basectx): |
493 class changectx(basectx): |
486 """A changecontext object makes access to data related to a particular |
494 """A changecontext object makes access to data related to a particular |