Changeset - 6ce04fd9efd4
[Not reviewed]
default
0 1 0
Mads Kiilerich - 7 years ago 2018-08-08 02:21:31
mads@kiilerich.com
hg: fix 4.7 compatibility in checkout_branch

Test coverage by workdir tests.
1 file changed with 2 insertions and 1 deletions:
0 comments (0 inline, 0 general)
kallithea/lib/vcs/backends/hg/workdir.py
Show inline comments
 
from kallithea.lib.vcs.backends.base import BaseWorkdir
 
from kallithea.lib.vcs.exceptions import BranchDoesNotExistError
 

	
 
from kallithea.lib.vcs.utils.hgcompat import hg_merge
 

	
 

	
 
class MercurialWorkdir(BaseWorkdir):
 

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

	
 
    def get_changeset(self):
 
        wk_dir_id = self.repository._repo[None].parents()[0].hex()
 
        return self.repository.get_changeset(wk_dir_id)
 

	
 
    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)
 
        raw_id = self.repository.branches[branch]
 
        hg_merge.update(self.repository._repo, raw_id, False, False, None)
0 comments (0 inline, 0 general)