From e8ae8003572d19984bd5246e77898c180e24fbaa Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Sat, 27 Apr 2013 18:05:17 +0200 Subject: [PATCH] Fixed workdir get_changeset method for mercurial - the workdir get_changeset method should return currently checked out revision and not the latest one in repository --HG-- extra : rebase_source : 5b344e89bd23c7b78bfba940ab2a73fcab17a321 extra : amend_source : bd8e25c55c5cfc737765c7a9b6fdd8c8f4ea7212 --- vcs/backends/git/workdir.py | 4 ++-- vcs/backends/hg/workdir.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/vcs/backends/git/workdir.py b/vcs/backends/git/workdir.py index b53e943..7766f30 100644 --- a/vcs/backends/git/workdir.py +++ b/vcs/backends/git/workdir.py @@ -20,8 +20,8 @@ def get_branch(self): raise RepositoryError("Couldn't compute workdir's branch") def get_changeset(self): - return self.repository.get_changeset( - self.repository._repo.refs.as_dict().get('HEAD')) + wk_dir_id = self.repository._repo.refs.as_dict().get('HEAD') + return self.repository.get_changeset(wk_dir_id) def checkout_branch(self, branch=None): if branch is None: diff --git a/vcs/backends/hg/workdir.py b/vcs/backends/hg/workdir.py index 5754c46..44e672b 100644 --- a/vcs/backends/hg/workdir.py +++ b/vcs/backends/hg/workdir.py @@ -10,7 +10,8 @@ def get_branch(self): return self.repository._repo.dirstate.branch() def get_changeset(self): - return self.repository.get_changeset() + 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: