equal
deleted
inserted
replaced
462 """ |
462 """ |
463 if self.dirty(ignoreupdate=ignoreupdate): |
463 if self.dirty(ignoreupdate=ignoreupdate): |
464 return _("uncommitted changes in subrepository '%s'" |
464 return _("uncommitted changes in subrepository '%s'" |
465 ) % subrelpath(self) |
465 ) % subrelpath(self) |
466 |
466 |
467 def bailifchanged(self, ignoreupdate=False): |
467 def bailifchanged(self, ignoreupdate=False, hint=None): |
468 """raise Abort if subrepository is ``dirty()`` |
468 """raise Abort if subrepository is ``dirty()`` |
469 """ |
469 """ |
470 dirtyreason = self.dirtyreason(ignoreupdate=ignoreupdate) |
470 dirtyreason = self.dirtyreason(ignoreupdate=ignoreupdate) |
471 if dirtyreason: |
471 if dirtyreason: |
472 raise error.Abort(dirtyreason) |
472 raise error.Abort(dirtyreason, hint=hint) |
473 |
473 |
474 def basestate(self): |
474 def basestate(self): |
475 """current working directory base state, disregarding .hgsubstate |
475 """current working directory base state, disregarding .hgsubstate |
476 state and working directory modifications""" |
476 state and working directory modifications""" |
477 raise NotImplementedError |
477 raise NotImplementedError |