##// END OF EJS Templates
merge close celery branch
r4113:18e4ecdb merge default
Show More
workdir.py
22 lines | 748 B | text/x-python | PythonLexer
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 from rhodecode.lib.vcs.backends.base import BaseWorkdir
from rhodecode.lib.vcs.exceptions import BranchDoesNotExistError
Synced vcs with upstream
r2543 from rhodecode.lib.vcs.utils.hgcompat import hg_merge
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
class MercurialWorkdir(BaseWorkdir):
def get_branch(self):
return self.repository._repo.dirstate.branch()
def get_changeset(self):
current revision will show workdir state, not the latest revision
r3796 wk_dir_id = self.repository._repo[None].parents()[0].hex()
return self.repository.get_changeset(wk_dir_id)
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
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)