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

Files @ a64e663abda3

Branch filter:

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

a64e663abda3 672 B text/x-python Show Annotation Show as Raw Download as Raw

Marcin Kuzminski

fixed bad merge on git fetch fix

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

from rhodecode.lib.vcs.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)