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

Files @ b19b1723ff10

Branch filter:

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

b19b1723ff10 672 B text/x-python Show Source Show as Raw Download as Raw

Mads Kiilerich

pullrequest: pullrequest from changelog view

It seems like it didn't work ... perhaps because I broke it. But now we clean
it up and make it work:

Use rev_end as the revision to merge. We don't know where to merge ... but
start_rev cannot be used for that.

This might to some extent have been working before ... but we prefer to clean
it up and start over again when the normal merge workflow is fully working.

324ac367a4da
324ac367a4da
324ac367a4da
03a770980b55
324ac367a4da
324ac367a4da
324ac367a4da
324ac367a4da
324ac367a4da
324ac367a4da
324ac367a4da
324ac367a4da
324ac367a4da
324ac367a4da
324ac367a4da
324ac367a4da
324ac367a4da
324ac367a4da
324ac367a4da
324ac367a4da
324ac367a4da

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)