Skip to content

fix for issue #106#107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
marcinkuzminski wants to merge 1 commit into from
Closed

fix for issue #106 #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions vcs/backends/git/workdir.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand Down
3 changes: 2 additions & 1 deletion vcs/backends/hg/workdir.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand Down