upstream/kallithea Files · rhodecode/lib/vcs/backends/git/workdir.py

diff_block: fix link to file revisions...

diff_block: fix link to file revisions Pull requests would link to file revisions in the wrong repo. That was obviously only visible when merging between different repos - but then it would link to a non-existing revision. diff_block is apparently used pull-request-style with the 'b' revision of the diff shown first. It thus also has to point at the 'other' repo which is where the other revision can be found.

marcink - - Load All Authors

File last commit:

r2007:324ac367 beta


                r3517:f8daaaf1

beta

Download file

             workdir.py
        
                    31 lines
            
             | 1.1 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / rhodecode / lib / vcs / backends / git / workdir.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      import re

      from rhodecode.lib.vcs.backends.base import BaseWorkdir

      from rhodecode.lib.vcs.exceptions import RepositoryError

      from rhodecode.lib.vcs.exceptions import BranchDoesNotExistError

      class GitWorkdir(BaseWorkdir):

          def get_branch(self):

              headpath = self.repository._repo.refs.refpath('HEAD')

              try:

                  content = open(headpath).read()

                  match = re.match(r'^ref: refs/heads/(?P<branch>.+)\n$', content)

                  if match:

                      return match.groupdict()['branch']

                  else:

                      raise RepositoryError("Couldn't compute workdir's branch")

              except IOError:

                  # Try naive way...

                  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'))

          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

              self.repository.run_git_command(['checkout', branch])

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				import re
				from rhodecode.lib.vcs.backends.base import BaseWorkdir
				from rhodecode.lib.vcs.exceptions import RepositoryError
				from rhodecode.lib.vcs.exceptions import BranchDoesNotExistError


				class GitWorkdir(BaseWorkdir):

				def get_branch(self):
				headpath = self.repository._repo.refs.refpath('HEAD')
				try:
				content = open(headpath).read()
				match = re.match(r'^ref: refs/heads/(?P<branch>.+)\n$', content)
				if match:
				return match.groupdict()['branch']
				else:
				raise RepositoryError("Couldn't compute workdir's branch")
				except IOError:
				# Try naive way...
				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'))

				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
				self.repository.run_git_command(['checkout', branch])