kallithea Files · rhodecode/lib/vcs/backends/hg/workdir.py

Files @ c15c3430df74

Branch filter:

Location: kallithea/rhodecode/lib/vcs/backends/hg/workdir.py

c15c3430df74 657 B text/x-python Show Annotation Show as Raw Download as Raw

Marcin Kuzminski

fixed issue with git's `no new line..` messages inside diff block. It might sometimes happen that showed html diff was short one line because of this

from rhodecode.lib.vcs.backends.base import BaseWorkdir
from rhodecode.lib.vcs.exceptions import BranchDoesNotExistError

from ...utils.hgcompat import hg_merge


class MercurialWorkdir(BaseWorkdir):

    def get_branch(self):
        return self.repository._repo.dirstate.branch()

    def get_changeset(self):
        return self.repository.get_changeset()

    def checkout_branch(self, branch=None):
        if branch is None:
            branch = self.repository.DEFAULT_BRANCH_NAME
        if branch not in self.repository.branches:
            raise BranchDoesNotExistError

        hg_merge.update(self.repository._repo, branch, False, False, None)