comparison mercurial/subrepo.py @ 30755:0fbb3a5c188e

rebase: provide detailed hint to abort message if working dir is not clean

Detailed hint message is now provided when 'pull --rebase' operation detects
unclean working dir, for example:
  abort: uncommitted changes
  (cannot pull with rebase: please commit or shelve your changes first)

Added tests for uncommitted merge, and for subrepo support verifying that same
hint is also passed to subrepo state check.

30754:26209cb7184e

        """
        if self.dirty(ignoreupdate=ignoreupdate):
            return _("uncommitted changes in subrepository '%s'"
                     ) % subrelpath(self)

    def bailifchanged(self, ignoreupdate=False):
        """raise Abort if subrepository is ``dirty()``
        """
        dirtyreason = self.dirtyreason(ignoreupdate=ignoreupdate)
        if dirtyreason:
            raise error.Abort(dirtyreason)

    def basestate(self):
        """current working directory base state, disregarding .hgsubstate
        state and working directory modifications"""
        raise NotImplementedError

30755:0fbb3a5c188e

        """
        if self.dirty(ignoreupdate=ignoreupdate):
            return _("uncommitted changes in subrepository '%s'"
                     ) % subrelpath(self)

    def bailifchanged(self, ignoreupdate=False, hint=None):
        """raise Abort if subrepository is ``dirty()``
        """
        dirtyreason = self.dirtyreason(ignoreupdate=ignoreupdate)
        if dirtyreason:
            raise error.Abort(dirtyreason, hint=hint)

    def basestate(self):
        """current working directory base state, disregarding .hgsubstate
        state and working directory modifications"""
        raise NotImplementedError