kallithea: rhodecode/lib/vcs/backends/git/repository.py annotate

annotate rhodecode/lib/vcs/backends/git/repository.py @ 2762:ba4fb9c441c6 beta

new dulwich based implementation of added/modified/removed functions for GIT changeset. Much faster some test up to 70% speed improvements. Pure awesomeness !

author	Marcin Kuzminski <marcin@python-works.com>
date	Thu, 30 Aug 2012 01:47:09 +0200
parents	fd5f2b217488
children	57456b1c215b

rev	line source
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	1 # -- coding: utf-8 --
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	2 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	3 vcs.backends.git
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	4 ~~~~~~~~~~~~~~~~
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	5
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	6 Git backend implementation.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	7
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	8 :created_on: Apr 8, 2010
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	9 :copyright: (c) 2010-2011 by Marcin Kuzminski, Lukasz Balcerzak.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	10 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	11
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	12 import os
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	13 import re
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	14 import time
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	15 import posixpath
2676 1f4d4b8d72f5 switched git_command to subprocession for non-blocking Popen. Marcin Kuzminski <marcin@python-works.com> parents: 2616 diff changeset	16 import logging
1f4d4b8d72f5 switched git_command to subprocession for non-blocking Popen. Marcin Kuzminski <marcin@python-works.com> parents: 2616 diff changeset	17 import traceback
2704 959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	18 import urllib
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	19 import urllib2
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	20 from dulwich.repo import Repo, NotGitRepository
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	21 #from dulwich.config import ConfigFile
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	22 from string import Template
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	23 from subprocess import Popen, PIPE
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	24 from rhodecode.lib.vcs.backends.base import BaseRepository
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	25 from rhodecode.lib.vcs.exceptions import BranchDoesNotExistError
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	26 from rhodecode.lib.vcs.exceptions import ChangesetDoesNotExistError
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	27 from rhodecode.lib.vcs.exceptions import EmptyRepositoryError
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	28 from rhodecode.lib.vcs.exceptions import RepositoryError
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	29 from rhodecode.lib.vcs.exceptions import TagAlreadyExistError
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	30 from rhodecode.lib.vcs.exceptions import TagDoesNotExistError
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	31 from rhodecode.lib.vcs.utils import safe_unicode, makedate, date_fromtimestamp
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	32 from rhodecode.lib.vcs.utils.lazy import LazyProperty
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	33 from rhodecode.lib.vcs.utils.ordered_dict import OrderedDict
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	34 from rhodecode.lib.vcs.utils.paths import abspath
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	35 from rhodecode.lib.vcs.utils.paths import get_user_home
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	36 from .workdir import GitWorkdir
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	37 from .changeset import GitChangeset
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	38 from .inmemory import GitInMemoryChangeset
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	39 from .config import ConfigFile
2676 1f4d4b8d72f5 switched git_command to subprocession for non-blocking Popen. Marcin Kuzminski <marcin@python-works.com> parents: 2616 diff changeset	40 from rhodecode.lib import subprocessio
1f4d4b8d72f5 switched git_command to subprocession for non-blocking Popen. Marcin Kuzminski <marcin@python-works.com> parents: 2616 diff changeset	41
1f4d4b8d72f5 switched git_command to subprocession for non-blocking Popen. Marcin Kuzminski <marcin@python-works.com> parents: 2616 diff changeset	42
1f4d4b8d72f5 switched git_command to subprocession for non-blocking Popen. Marcin Kuzminski <marcin@python-works.com> parents: 2616 diff changeset	43 log = logging.getLogger(__name__)
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	44
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	45
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	46 class GitRepository(BaseRepository):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	47 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	48 Git repository backend.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	49 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	50 DEFAULT_BRANCH_NAME = 'master'
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	51 scm = 'git'
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	52
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	53 def __init__(self, repo_path, create=False, src_url=None,
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	54 update_after_clone=False, bare=False):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	55
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	56 self.path = abspath(repo_path)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	57 self._repo = self._get_repo(create, src_url, update_after_clone, bare)
2209 19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	58 #temporary set that to now at later we will move it to constructor
19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	59 baseui = None
19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	60 if baseui is None:
19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	61 from mercurial.ui import ui
19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	62 baseui = ui()
2235 b6adef467e23 changelog update + whitespace cleanup Marcin Kuzminski <marcin@python-works.com> parents: 2233 diff changeset	63 # patch the instance of GitRepo with an "FAKE" ui object to add
2209 19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	64 # compatibility layer with Mercurial
19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	65 setattr(self._repo, 'ui', baseui)
19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	66
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	67 try:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	68 self.head = self._repo.head()
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	69 except KeyError:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	70 self.head = None
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	71
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	72 self._config_files = [
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	73 bare and abspath(self.path, 'config') or abspath(self.path, '.git',
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	74 'config'),
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	75 abspath(get_user_home(), '.gitconfig'),
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	76 ]
2320 48d93ea1e245 fixed issues with support of bare-repos by vcs lib Marcin Kuzminski <marcin@python-works.com> parents: 2235 diff changeset	77 self.bare = self._repo.bare
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	78
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	79 @LazyProperty
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	80 def revisions(self):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	81 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	82 Returns list of revisions' ids, in ascending order. Being lazy
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	83 attribute allows external tools to inject shas from cache.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	84 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	85 return self._get_all_revisions()
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	86
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	87 def run_git_command(self, cmd):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	88 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	89 Runs given ``cmd`` as git command and returns tuple
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	90 (returncode, stdout, stderr).
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	91
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	92 .. note::
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	93 This method exists only until log/blame functionality is implemented
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	94 at Dulwich (see https://bugs.launchpad.net/bugs/645142). Parsing
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	95 os command's output is road to hell...
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	96
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	97 :param cmd: git command to be executed
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	98 """
2183 9d27481228a1 Extend GIT command wrapper with GIT_CONFIG_NOGLOBAL=1 to bypass gitconfig global Marcin Kuzminski <marcin@python-works.com> parents: 2047 diff changeset	99
2199 31ebf7010566 various fixes for git and mercurial with InMemoryCommit backend and non-ascii files Marcin Kuzminski <marcin@python-works.com> parents: 2198 diff changeset	100 _copts = ['-c', 'core.quotepath=false', ]
2200 d7a4c7e3528e fixed git-command wrapper Marcin Kuzminski <marcin@python-works.com> parents: 2199 diff changeset	101 _str_cmd = False
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	102 if isinstance(cmd, basestring):
2199 31ebf7010566 various fixes for git and mercurial with InMemoryCommit backend and non-ascii files Marcin Kuzminski <marcin@python-works.com> parents: 2198 diff changeset	103 cmd = [cmd]
2200 d7a4c7e3528e fixed git-command wrapper Marcin Kuzminski <marcin@python-works.com> parents: 2199 diff changeset	104 _str_cmd = True
2367 86aa4f1f130b white space cleanup Marcin Kuzminski <marcin@python-works.com> parents: 2325 diff changeset	105
2325 18d34a56a736 fix for issue #417, git execution was broken on windows for certain commands. Marcin Kuzminski <marcin@python-works.com> parents: 2320 diff changeset	106 gitenv = os.environ
2616 bab7eaa2cd7d Remove GIT_DIT from environ on calling git_command, it can break a lot of stuff Marcin Kuzminski <marcin@python-works.com> parents: 2539 diff changeset	107 # need to clean fix GIT_DIR !
bab7eaa2cd7d Remove GIT_DIT from environ on calling git_command, it can break a lot of stuff Marcin Kuzminski <marcin@python-works.com> parents: 2539 diff changeset	108 if 'GIT_DIR' in gitenv:
bab7eaa2cd7d Remove GIT_DIT from environ on calling git_command, it can break a lot of stuff Marcin Kuzminski <marcin@python-works.com> parents: 2539 diff changeset	109 del gitenv['GIT_DIR']
2325 18d34a56a736 fix for issue #417, git execution was broken on windows for certain commands. Marcin Kuzminski <marcin@python-works.com> parents: 2320 diff changeset	110 gitenv['GIT_CONFIG_NOGLOBAL'] = '1'
2199 31ebf7010566 various fixes for git and mercurial with InMemoryCommit backend and non-ascii files Marcin Kuzminski <marcin@python-works.com> parents: 2198 diff changeset	111
2325 18d34a56a736 fix for issue #417, git execution was broken on windows for certain commands. Marcin Kuzminski <marcin@python-works.com> parents: 2320 diff changeset	112 cmd = ['git'] + _copts + cmd
2200 d7a4c7e3528e fixed git-command wrapper Marcin Kuzminski <marcin@python-works.com> parents: 2199 diff changeset	113 if _str_cmd:
d7a4c7e3528e fixed git-command wrapper Marcin Kuzminski <marcin@python-works.com> parents: 2199 diff changeset	114 cmd = ' '.join(cmd)
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	115 try:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	116 opts = dict(
2325 18d34a56a736 fix for issue #417, git execution was broken on windows for certain commands. Marcin Kuzminski <marcin@python-works.com> parents: 2320 diff changeset	117 env=gitenv,
2760 fd5f2b217488 get stderr also for git commands, pass in shell = False Marcin Kuzminski <marcin@python-works.com> parents: 2706 diff changeset	118 shell=False,
2325 18d34a56a736 fix for issue #417, git execution was broken on windows for certain commands. Marcin Kuzminski <marcin@python-works.com> parents: 2320 diff changeset	119 )
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	120 if os.path.isdir(self.path):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	121 opts['cwd'] = self.path
2676 1f4d4b8d72f5 switched git_command to subprocession for non-blocking Popen. Marcin Kuzminski <marcin@python-works.com> parents: 2616 diff changeset	122 p = subprocessio.SubprocessIOChunker(cmd, **opts)
1f4d4b8d72f5 switched git_command to subprocession for non-blocking Popen. Marcin Kuzminski <marcin@python-works.com> parents: 2616 diff changeset	123 except (EnvironmentError, OSError), err:
1f4d4b8d72f5 switched git_command to subprocession for non-blocking Popen. Marcin Kuzminski <marcin@python-works.com> parents: 2616 diff changeset	124 log.error(traceback.format_exc())
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	125 raise RepositoryError("Couldn't run git command (%s).\n"
2676 1f4d4b8d72f5 switched git_command to subprocession for non-blocking Popen. Marcin Kuzminski <marcin@python-works.com> parents: 2616 diff changeset	126 "Original error was:%s" % (cmd, err))
1f4d4b8d72f5 switched git_command to subprocession for non-blocking Popen. Marcin Kuzminski <marcin@python-works.com> parents: 2616 diff changeset	127
2760 fd5f2b217488 get stderr also for git commands, pass in shell = False Marcin Kuzminski <marcin@python-works.com> parents: 2706 diff changeset	128 return ''.join(p.output), ''.join(p.error)
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	129
2704 959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	130 @classmethod
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	131 def _check_url(cls, url):
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	132 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	133 Functon will check given url and try to verify if it's a valid
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	134 link. Sometimes it may happened that mercurial will issue basic
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	135 auth request that can cause whole API to hang when used from python
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	136 or other external calls.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	137
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	138 On failures it'll raise urllib2.HTTPError
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	139 """
2704 959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	140 from mercurial.util import url as Url
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	141
2704 959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	142 # those authnadlers are patched for python 2.6.5 bug an
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	143 # infinit looping when given invalid resources
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	144 from mercurial.url import httpbasicauthhandler, httpdigestauthhandler
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	145
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	146 # check first if it's not an local url
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	147 if os.path.isdir(url) or url.startswith('file:'):
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	148 return True
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	149
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	150 if('+' in url[:url.find('://')]):
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	151 url = url[url.find('+') + 1:]
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	152
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	153 handlers = []
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	154 test_uri, authinfo = Url(url).authinfo()
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	155 if not test_uri.endswith('info/refs'):
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	156 test_uri = test_uri.rstrip('/') + '/info/refs'
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	157 if authinfo:
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	158 #create a password manager
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	159 passmgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	160 passmgr.add_password(*authinfo)
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	161
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	162 handlers.extend((httpbasicauthhandler(passmgr),
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	163 httpdigestauthhandler(passmgr)))
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	164
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	165 o = urllib2.build_opener(*handlers)
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	166 o.addheaders = [('User-Agent', 'git/1.7.8.0')] # fake some git
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	167
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	168 q = {"service": 'git-upload-pack'}
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	169 qs = '?%s' % urllib.urlencode(q)
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	170 cu = "%s%s" % (test_uri, qs)
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	171 req = urllib2.Request(cu, None, {})
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	172
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	173 try:
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	174 resp = o.open(req)
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	175 return resp.code == 200
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	176 except Exception, e:
959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	177 # means it cannot be cloned
2706 22f79562836c Fixed validators for remote repos Marcin Kuzminski <marcin@python-works.com> parents: 2704 diff changeset	178 raise urllib2.URLError("[%s] %s" % (url, e))
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	179
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	180 def _get_repo(self, create, src_url=None, update_after_clone=False,
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	181 bare=False):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	182 if create and os.path.exists(self.path):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	183 raise RepositoryError("Location already exist")
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	184 if src_url and not create:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	185 raise RepositoryError("Create should be set to True if src_url is "
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	186 "given (clone operation creates repository)")
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	187 try:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	188 if create and src_url:
2704 959d0daa44da Added url validator for git Marcin Kuzminski <marcin@python-works.com> parents: 2676 diff changeset	189 GitRepository._check_url(src_url)
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	190 self.clone(src_url, update_after_clone, bare)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	191 return Repo(self.path)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	192 elif create:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	193 os.mkdir(self.path)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	194 if bare:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	195 return Repo.init_bare(self.path)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	196 else:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	197 return Repo.init(self.path)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	198 else:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	199 return Repo(self.path)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	200 except (NotGitRepository, OSError), err:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	201 raise RepositoryError(err)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	202
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	203 def _get_all_revisions(self):
2676 1f4d4b8d72f5 switched git_command to subprocession for non-blocking Popen. Marcin Kuzminski <marcin@python-works.com> parents: 2616 diff changeset	204 # we must check if this repo is not empty, since later command
1f4d4b8d72f5 switched git_command to subprocession for non-blocking Popen. Marcin Kuzminski <marcin@python-works.com> parents: 2616 diff changeset	205 # fails if it is. And it's cheaper to ask than throw the subprocess
1f4d4b8d72f5 switched git_command to subprocession for non-blocking Popen. Marcin Kuzminski <marcin@python-works.com> parents: 2616 diff changeset	206 # errors
1f4d4b8d72f5 switched git_command to subprocession for non-blocking Popen. Marcin Kuzminski <marcin@python-works.com> parents: 2616 diff changeset	207 try:
1f4d4b8d72f5 switched git_command to subprocession for non-blocking Popen. Marcin Kuzminski <marcin@python-works.com> parents: 2616 diff changeset	208 self._repo.head()
1f4d4b8d72f5 switched git_command to subprocession for non-blocking Popen. Marcin Kuzminski <marcin@python-works.com> parents: 2616 diff changeset	209 except KeyError:
1f4d4b8d72f5 switched git_command to subprocession for non-blocking Popen. Marcin Kuzminski <marcin@python-works.com> parents: 2616 diff changeset	210 return []
2535 b24b1f0fa505 Get tags and branches using _parsed_refs Marcin Kuzminski <marcin@python-works.com> parents: 2453 diff changeset	211 cmd = 'rev-list --all --reverse --date-order'
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	212 try:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	213 so, se = self.run_git_command(cmd)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	214 except RepositoryError:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	215 # Can be raised for empty repositories
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	216 return []
2535 b24b1f0fa505 Get tags and branches using _parsed_refs Marcin Kuzminski <marcin@python-works.com> parents: 2453 diff changeset	217 return so.splitlines()
b24b1f0fa505 Get tags and branches using _parsed_refs Marcin Kuzminski <marcin@python-works.com> parents: 2453 diff changeset	218
b24b1f0fa505 Get tags and branches using _parsed_refs Marcin Kuzminski <marcin@python-works.com> parents: 2453 diff changeset	219 def _get_all_revisions2(self):
b24b1f0fa505 Get tags and branches using _parsed_refs Marcin Kuzminski <marcin@python-works.com> parents: 2453 diff changeset	220 #alternate implementation using dulwich
b24b1f0fa505 Get tags and branches using _parsed_refs Marcin Kuzminski <marcin@python-works.com> parents: 2453 diff changeset	221 includes = [x[1][0] for x in self._parsed_refs.iteritems()
b24b1f0fa505 Get tags and branches using _parsed_refs Marcin Kuzminski <marcin@python-works.com> parents: 2453 diff changeset	222 if x[1][1] != 'T']
b24b1f0fa505 Get tags and branches using _parsed_refs Marcin Kuzminski <marcin@python-works.com> parents: 2453 diff changeset	223 return [c.commit.id for c in self._repo.get_walker(include=includes)]
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	224
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	225 def _get_revision(self, revision):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	226 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	227 For git backend we always return integer here. This way we ensure
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	228 that changset's revision attribute would become integer.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	229 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	230 pattern = re.compile(r'^[[0-9a-fA-F]{12}\|[0-9a-fA-F]{40}]$')
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	231 is_bstr = lambda o: isinstance(o, (str, unicode))
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	232 is_null = lambda o: len(o) == revision.count('0')
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	233
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	234 if len(self.revisions) == 0:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	235 raise EmptyRepositoryError("There are no changesets yet")
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	236
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	237 if revision in (None, '', 'tip', 'HEAD', 'head', -1):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	238 revision = self.revisions[-1]
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	239
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	240 if ((is_bstr(revision) and revision.isdigit() and len(revision) < 12)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	241 or isinstance(revision, int) or is_null(revision)):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	242 try:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	243 revision = self.revisions[int(revision)]
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	244 except:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	245 raise ChangesetDoesNotExistError("Revision %r does not exist "
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	246 "for this repository %s" % (revision, self))
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	247
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	248 elif is_bstr(revision):
2536 aaa41736ae51 Fixed lookup by Tag sha in git backend Marcin Kuzminski <marcin@python-works.com> parents: 2535 diff changeset	249 # get by branch/tag name
2449 08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	250 _ref_revision = self._parsed_refs.get(revision)
2536 aaa41736ae51 Fixed lookup by Tag sha in git backend Marcin Kuzminski <marcin@python-works.com> parents: 2535 diff changeset	251 _tags_shas = self.tags.values()
2449 08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	252 if _ref_revision: # and _ref_revision[1] in ['H', 'RH', 'T']:
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	253 return _ref_revision[0]
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	254
2536 aaa41736ae51 Fixed lookup by Tag sha in git backend Marcin Kuzminski <marcin@python-works.com> parents: 2535 diff changeset	255 # maybe it's a tag ? we don't have them in self.revisions
aaa41736ae51 Fixed lookup by Tag sha in git backend Marcin Kuzminski <marcin@python-works.com> parents: 2535 diff changeset	256 elif revision in _tags_shas:
aaa41736ae51 Fixed lookup by Tag sha in git backend Marcin Kuzminski <marcin@python-works.com> parents: 2535 diff changeset	257 return _tags_shas[_tags_shas.index(revision)]
aaa41736ae51 Fixed lookup by Tag sha in git backend Marcin Kuzminski <marcin@python-works.com> parents: 2535 diff changeset	258
2449 08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	259 elif not pattern.match(revision) or revision not in self.revisions:
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	260 raise ChangesetDoesNotExistError("Revision %r does not exist "
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	261 "for this repository %s" % (revision, self))
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	262
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	263 # Ensure we return full id
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	264 if not pattern.match(str(revision)):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	265 raise ChangesetDoesNotExistError("Given revision %r not recognized"
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	266 % revision)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	267 return revision
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	268
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	269 def _get_archives(self, archive_name='tip'):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	270
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	271 for i in [('zip', '.zip'), ('gz', '.tar.gz'), ('bz2', '.tar.bz2')]:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	272 yield {"type": i[0], "extension": i[1], "node": archive_name}
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	273
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	274 def _get_url(self, url):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	275 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	276 Returns normalized url. If schema is not given, would fall to
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	277 filesystem (``file:///``) schema.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	278 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	279 url = str(url)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	280 if url != 'default' and not '://' in url:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	281 url = ':///'.join(('file', url))
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	282 return url
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	283
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	284 @LazyProperty
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	285 def name(self):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	286 return os.path.basename(self.path)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	287
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	288 @LazyProperty
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	289 def last_change(self):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	290 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	291 Returns last change made on this repository as datetime object
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	292 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	293 return date_fromtimestamp(self._get_mtime(), makedate()[1])
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	294
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	295 def _get_mtime(self):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	296 try:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	297 return time.mktime(self.get_changeset().date.timetuple())
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	298 except RepositoryError:
2320 48d93ea1e245 fixed issues with support of bare-repos by vcs lib Marcin Kuzminski <marcin@python-works.com> parents: 2235 diff changeset	299 idx_loc = '' if self.bare else '.git'
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	300 # fallback to filesystem
2320 48d93ea1e245 fixed issues with support of bare-repos by vcs lib Marcin Kuzminski <marcin@python-works.com> parents: 2235 diff changeset	301 in_path = os.path.join(self.path, idx_loc, "index")
48d93ea1e245 fixed issues with support of bare-repos by vcs lib Marcin Kuzminski <marcin@python-works.com> parents: 2235 diff changeset	302 he_path = os.path.join(self.path, idx_loc, "HEAD")
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	303 if os.path.exists(in_path):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	304 return os.stat(in_path).st_mtime
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	305 else:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	306 return os.stat(he_path).st_mtime
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	307
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	308 @LazyProperty
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	309 def description(self):
2320 48d93ea1e245 fixed issues with support of bare-repos by vcs lib Marcin Kuzminski <marcin@python-works.com> parents: 2235 diff changeset	310 idx_loc = '' if self.bare else '.git'
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	311 undefined_description = u'unknown'
2320 48d93ea1e245 fixed issues with support of bare-repos by vcs lib Marcin Kuzminski <marcin@python-works.com> parents: 2235 diff changeset	312 description_path = os.path.join(self.path, idx_loc, 'description')
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	313 if os.path.isfile(description_path):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	314 return safe_unicode(open(description_path).read())
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	315 else:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	316 return undefined_description
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	317
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	318 @LazyProperty
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	319 def contact(self):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	320 undefined_contact = u'Unknown'
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	321 return undefined_contact
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	322
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	323 @property
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	324 def branches(self):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	325 if not self.revisions:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	326 return {}
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	327 sortkey = lambda ctx: ctx[0]
2535 b24b1f0fa505 Get tags and branches using _parsed_refs Marcin Kuzminski <marcin@python-works.com> parents: 2453 diff changeset	328 _branches = [(x[0], x[1][0])
b24b1f0fa505 Get tags and branches using _parsed_refs Marcin Kuzminski <marcin@python-works.com> parents: 2453 diff changeset	329 for x in self._parsed_refs.iteritems() if x[1][1] == 'H']
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	330 return OrderedDict(sorted(_branches, key=sortkey, reverse=False))
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	331
2449 08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	332 @LazyProperty
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	333 def tags(self):
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	334 return self._get_tags()
2198 9784a54a0f5b display current heads of branches for git in changelog and shortlog Marcin Kuzminski <marcin@python-works.com> parents: 2183 diff changeset	335
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	336 def _get_tags(self):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	337 if not self.revisions:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	338 return {}
2535 b24b1f0fa505 Get tags and branches using _parsed_refs Marcin Kuzminski <marcin@python-works.com> parents: 2453 diff changeset	339
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	340 sortkey = lambda ctx: ctx[0]
2535 b24b1f0fa505 Get tags and branches using _parsed_refs Marcin Kuzminski <marcin@python-works.com> parents: 2453 diff changeset	341 _tags = [(x[0], x[1][0])
b24b1f0fa505 Get tags and branches using _parsed_refs Marcin Kuzminski <marcin@python-works.com> parents: 2453 diff changeset	342 for x in self._parsed_refs.iteritems() if x[1][1] == 'T']
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	343 return OrderedDict(sorted(_tags, key=sortkey, reverse=True))
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	344
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	345 def tag(self, name, user, revision=None, message=None, date=None,
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	346 **kwargs):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	347 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	348 Creates and returns a tag for the given ``revision``.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	349
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	350 :param name: name for new tag
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	351 :param user: full username, i.e.: "Joe Doe <joe.doe@example.com>"
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	352 :param revision: changeset id for which new tag would be created
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	353 :param message: message of the tag's commit
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	354 :param date: date of tag's commit
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	355
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	356 :raises TagAlreadyExistError: if tag with same name already exists
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	357 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	358 if name in self.tags:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	359 raise TagAlreadyExistError("Tag %s already exists" % name)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	360 changeset = self.get_changeset(revision)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	361 message = message or "Added tag %s for commit %s" % (name,
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	362 changeset.raw_id)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	363 self._repo.refs["refs/tags/%s" % name] = changeset._commit.id
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	364
2539 da18c423b100 Invalidate gits parsed_refs cache after commit, tagging or tag remove Marcin Kuzminski <marcin@python-works.com> parents: 2536 diff changeset	365 self._parsed_refs = self._get_parsed_refs()
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	366 self.tags = self._get_tags()
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	367 return changeset
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	368
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	369 def remove_tag(self, name, user, message=None, date=None):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	370 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	371 Removes tag with the given ``name``.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	372
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	373 :param name: name of the tag to be removed
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	374 :param user: full username, i.e.: "Joe Doe <joe.doe@example.com>"
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	375 :param message: message of the tag's removal commit
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	376 :param date: date of tag's removal commit
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	377
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	378 :raises TagDoesNotExistError: if tag with given name does not exists
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	379 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	380 if name not in self.tags:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	381 raise TagDoesNotExistError("Tag %s does not exist" % name)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	382 tagpath = posixpath.join(self._repo.refs.path, 'refs', 'tags', name)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	383 try:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	384 os.remove(tagpath)
2539 da18c423b100 Invalidate gits parsed_refs cache after commit, tagging or tag remove Marcin Kuzminski <marcin@python-works.com> parents: 2536 diff changeset	385 self._parsed_refs = self._get_parsed_refs()
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	386 self.tags = self._get_tags()
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	387 except OSError, e:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	388 raise RepositoryError(e.strerror)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	389
2449 08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	390 @LazyProperty
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	391 def _parsed_refs(self):
2539 da18c423b100 Invalidate gits parsed_refs cache after commit, tagging or tag remove Marcin Kuzminski <marcin@python-works.com> parents: 2536 diff changeset	392 return self._get_parsed_refs()
da18c423b100 Invalidate gits parsed_refs cache after commit, tagging or tag remove Marcin Kuzminski <marcin@python-works.com> parents: 2536 diff changeset	393
da18c423b100 Invalidate gits parsed_refs cache after commit, tagging or tag remove Marcin Kuzminski <marcin@python-works.com> parents: 2536 diff changeset	394 def _get_parsed_refs(self):
2449 08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	395 refs = self._repo.get_refs()
2453 d2a528b60e50 whitespace cleanup Marcin Kuzminski <marcin@python-works.com> parents: 2449 diff changeset	396 keys = [('refs/heads/', 'H'),
2449 08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	397 ('refs/remotes/origin/', 'RH'),
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	398 ('refs/tags/', 'T')]
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	399 _refs = {}
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	400 for ref, sha in refs.iteritems():
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	401 for k, type_ in keys:
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	402 if ref.startswith(k):
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	403 _key = ref[len(k):]
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	404 _refs[_key] = [sha, type_]
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	405 break
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	406 return _refs
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	407
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	408 def _heads(self, reverse=False):
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	409 refs = self._repo.get_refs()
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	410 heads = {}
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	411
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	412 for key, val in refs.items():
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	413 for ref_key in ['refs/heads/', 'refs/remotes/origin/']:
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	414 if key.startswith(ref_key):
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	415 n = key[len(ref_key):]
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	416 if n not in ['HEAD']:
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	417 heads[n] = val
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	418
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	419 return heads if reverse else dict((y, x) for x, y in heads.iteritems())
08fc67c1c948 added discovery by branches and tags for git Marcin Kuzminski <marcin@python-works.com> parents: 2384 diff changeset	420
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	421 def get_changeset(self, revision=None):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	422 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	423 Returns ``GitChangeset`` object representing commit from git repository
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	424 at the given revision or head (most recent commit) if None given.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	425 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	426 if isinstance(revision, GitChangeset):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	427 return revision
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	428 revision = self._get_revision(revision)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	429 changeset = GitChangeset(repository=self, revision=revision)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	430 return changeset
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	431
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	432 def get_changesets(self, start=None, end=None, start_date=None,
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	433 end_date=None, branch_name=None, reverse=False):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	434 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	435 Returns iterator of ``GitChangeset`` objects from start to end (both
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	436 are inclusive), in ascending date order (unless ``reverse`` is set).
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	437
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	438 :param start: changeset ID, as str; first returned changeset
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	439 :param end: changeset ID, as str; last returned changeset
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	440 :param start_date: if specified, changesets with commit date less than
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	441 ``start_date`` would be filtered out from returned set
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	442 :param end_date: if specified, changesets with commit date greater than
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	443 ``end_date`` would be filtered out from returned set
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	444 :param branch_name: if specified, changesets not reachable from given
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	445 branch would be filtered out from returned set
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	446 :param reverse: if ``True``, returned generator would be reversed
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	447 (meaning that returned changesets would have descending date order)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	448
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	449 :raise BranchDoesNotExistError: If given ``branch_name`` does not
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	450 exist.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	451 :raise ChangesetDoesNotExistError: If changeset for given ``start`` or
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	452 ``end`` could not be found.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	453
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	454 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	455 if branch_name and branch_name not in self.branches:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	456 raise BranchDoesNotExistError("Branch '%s' not found" \
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	457 % branch_name)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	458 # %H at format means (full) commit hash, initial hashes are retrieved
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	459 # in ascending date order
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	460 cmd_template = 'log --date-order --reverse --pretty=format:"%H"'
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	461 cmd_params = {}
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	462 if start_date:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	463 cmd_template += ' --since "$since"'
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	464 cmd_params['since'] = start_date.strftime('%m/%d/%y %H:%M:%S')
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	465 if end_date:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	466 cmd_template += ' --until "$until"'
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	467 cmd_params['until'] = end_date.strftime('%m/%d/%y %H:%M:%S')
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	468 if branch_name:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	469 cmd_template += ' $branch_name'
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	470 cmd_params['branch_name'] = branch_name
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	471 else:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	472 cmd_template += ' --all'
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	473
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	474 cmd = Template(cmd_template).safe_substitute(**cmd_params)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	475 revs = self.run_git_command(cmd)[0].splitlines()
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	476 start_pos = 0
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	477 end_pos = len(revs)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	478 if start:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	479 _start = self._get_revision(start)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	480 try:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	481 start_pos = revs.index(_start)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	482 except ValueError:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	483 pass
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	484
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	485 if end is not None:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	486 _end = self._get_revision(end)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	487 try:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	488 end_pos = revs.index(_end)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	489 except ValueError:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	490 pass
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	491
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	492 if None not in [start, end] and start_pos > end_pos:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	493 raise RepositoryError('start cannot be after end')
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	494
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	495 if end_pos is not None:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	496 end_pos += 1
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	497
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	498 revs = revs[start_pos:end_pos]
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	499 if reverse:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	500 revs = reversed(revs)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	501 for rev in revs:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	502 yield self.get_changeset(rev)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	503
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	504 def get_diff(self, rev1, rev2, path=None, ignore_whitespace=False,
2233 07fce1930417 fixed issues with gitsubmodule diffs Marcin Kuzminski <marcin@python-works.com> parents: 2210 diff changeset	505 context=3):
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	506 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	507 Returns (git like) diff, as plain text. Shows changes introduced by
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	508 ``rev2`` since ``rev1``.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	509
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	510 :param rev1: Entry point from which diff is shown. Can be
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	511 ``self.EMPTY_CHANGESET`` - in this case, patch showing all
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	512 the changes since empty state of the repository until ``rev2``
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	513 :param rev2: Until which revision changes should be shown.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	514 :param ignore_whitespace: If set to ``True``, would not show whitespace
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	515 changes. Defaults to ``False``.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	516 :param context: How many lines before/after changed lines should be
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	517 shown. Defaults to ``3``.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	518 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	519 flags = ['-U%s' % context]
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	520 if ignore_whitespace:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	521 flags.append('-w')
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	522
2384 5563af834d92 Added diff option into git and hg changeset objects, representing git formated patch against parent1 Marcin Kuzminski <marcin@python-works.com> parents: 2383 diff changeset	523 if hasattr(rev1, 'raw_id'):
5563af834d92 Added diff option into git and hg changeset objects, representing git formated patch against parent1 Marcin Kuzminski <marcin@python-works.com> parents: 2383 diff changeset	524 rev1 = getattr(rev1, 'raw_id')
5563af834d92 Added diff option into git and hg changeset objects, representing git formated patch against parent1 Marcin Kuzminski <marcin@python-works.com> parents: 2383 diff changeset	525
5563af834d92 Added diff option into git and hg changeset objects, representing git formated patch against parent1 Marcin Kuzminski <marcin@python-works.com> parents: 2383 diff changeset	526 if hasattr(rev2, 'raw_id'):
5563af834d92 Added diff option into git and hg changeset objects, representing git formated patch against parent1 Marcin Kuzminski <marcin@python-works.com> parents: 2383 diff changeset	527 rev2 = getattr(rev2, 'raw_id')
5563af834d92 Added diff option into git and hg changeset objects, representing git formated patch against parent1 Marcin Kuzminski <marcin@python-works.com> parents: 2383 diff changeset	528
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	529 if rev1 == self.EMPTY_CHANGESET:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	530 rev2 = self.get_changeset(rev2).raw_id
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	531 cmd = ' '.join(['show'] + flags + [rev2])
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	532 else:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	533 rev1 = self.get_changeset(rev1).raw_id
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	534 rev2 = self.get_changeset(rev2).raw_id
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	535 cmd = ' '.join(['diff'] + flags + [rev1, rev2])
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	536
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	537 if path:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	538 cmd += ' -- "%s"' % path
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	539 stdout, stderr = self.run_git_command(cmd)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	540 # If we used 'show' command, strip first few lines (until actual diff
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	541 # starts)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	542 if rev1 == self.EMPTY_CHANGESET:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	543 lines = stdout.splitlines()
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	544 x = 0
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	545 for line in lines:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	546 if line.startswith('diff'):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	547 break
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	548 x += 1
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	549 # Append new line just like 'diff' command do
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	550 stdout = '\n'.join(lines[x:]) + '\n'
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	551 return stdout
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	552
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	553 @LazyProperty
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	554 def in_memory_changeset(self):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	555 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	556 Returns ``GitInMemoryChangeset`` object for this repository.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	557 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	558 return GitInMemoryChangeset(self)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	559
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	560 def clone(self, url, update_after_clone=True, bare=False):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	561 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	562 Tries to clone changes from external location.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	563
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	564 :param update_after_clone: If set to ``False``, git won't checkout
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	565 working directory
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	566 :param bare: If set to ``True``, repository would be cloned into
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	567 bare git repository (no working directory at all).
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	568 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	569 url = self._get_url(url)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	570 cmd = ['clone']
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	571 if bare:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	572 cmd.append('--bare')
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	573 elif not update_after_clone:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	574 cmd.append('--no-checkout')
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	575 cmd += ['--', '"%s"' % url, '"%s"' % self.path]
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	576 cmd = ' '.join(cmd)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	577 # If error occurs run_git_command raises RepositoryError already
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	578 self.run_git_command(cmd)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	579
2209 19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	580 def pull(self, url):
19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	581 """
19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	582 Tries to pull changes from external location.
19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	583 """
19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	584 url = self._get_url(url)
19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	585 cmd = ['pull']
19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	586 cmd.append("--ff-only")
2210 7b458dd6f40d pass in url for remote pull in git Marcin Kuzminski <marcin@python-works.com> parents: 2209 diff changeset	587 cmd.append(url)
2209 19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	588 cmd = ' '.join(cmd)
19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	589 # If error occurs run_git_command raises RepositoryError already
19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	590 self.run_git_command(cmd)
19a6c23af14b Implemented pull command for remote repos for git Marcin Kuzminski <marcin@python-works.com> parents: 2200 diff changeset	591
2383 e576410f911d Don't do git pull on remote repos since they are bare now, we need to use git fetch on them Marcin Kuzminski <marcin@python-works.com> parents: 2367 diff changeset	592 def fetch(self, url):
e576410f911d Don't do git pull on remote repos since they are bare now, we need to use git fetch on them Marcin Kuzminski <marcin@python-works.com> parents: 2367 diff changeset	593 """
e576410f911d Don't do git pull on remote repos since they are bare now, we need to use git fetch on them Marcin Kuzminski <marcin@python-works.com> parents: 2367 diff changeset	594 Tries to pull changes from external location.
e576410f911d Don't do git pull on remote repos since they are bare now, we need to use git fetch on them Marcin Kuzminski <marcin@python-works.com> parents: 2367 diff changeset	595 """
e576410f911d Don't do git pull on remote repos since they are bare now, we need to use git fetch on them Marcin Kuzminski <marcin@python-works.com> parents: 2367 diff changeset	596 url = self._get_url(url)
e576410f911d Don't do git pull on remote repos since they are bare now, we need to use git fetch on them Marcin Kuzminski <marcin@python-works.com> parents: 2367 diff changeset	597 cmd = ['fetch']
e576410f911d Don't do git pull on remote repos since they are bare now, we need to use git fetch on them Marcin Kuzminski <marcin@python-works.com> parents: 2367 diff changeset	598 cmd.append(url)
e576410f911d Don't do git pull on remote repos since they are bare now, we need to use git fetch on them Marcin Kuzminski <marcin@python-works.com> parents: 2367 diff changeset	599 cmd = ' '.join(cmd)
e576410f911d Don't do git pull on remote repos since they are bare now, we need to use git fetch on them Marcin Kuzminski <marcin@python-works.com> parents: 2367 diff changeset	600 # If error occurs run_git_command raises RepositoryError already
e576410f911d Don't do git pull on remote repos since they are bare now, we need to use git fetch on them Marcin Kuzminski <marcin@python-works.com> parents: 2367 diff changeset	601 self.run_git_command(cmd)
e576410f911d Don't do git pull on remote repos since they are bare now, we need to use git fetch on them Marcin Kuzminski <marcin@python-works.com> parents: 2367 diff changeset	602
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	603 @LazyProperty
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	604 def workdir(self):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	605 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	606 Returns ``Workdir`` instance for this repository.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	607 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	608 return GitWorkdir(self)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	609
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	610 def get_config_value(self, section, name, config_file=None):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	611 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	612 Returns configuration value for a given [``section``] and ``name``.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	613
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	614 :param section: Section we want to retrieve value from
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	615 :param name: Name of configuration we want to retrieve
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	616 :param config_file: A path to file which should be used to retrieve
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	617 configuration from (might also be a list of file paths)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	618 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	619 if config_file is None:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	620 config_file = []
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	621 elif isinstance(config_file, basestring):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	622 config_file = [config_file]
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	623
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	624 def gen_configs():
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	625 for path in config_file + self._config_files:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	626 try:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	627 yield ConfigFile.from_path(path)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	628 except (IOError, OSError, ValueError):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	629 continue
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	630
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	631 for config in gen_configs():
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	632 try:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	633 return config.get(section, name)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	634 except KeyError:
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	635 continue
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	636 return None
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	637
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	638 def get_user_name(self, config_file=None):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	639 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	640 Returns user's name from global configuration file.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	641
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	642 :param config_file: A path to file which should be used to retrieve
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	643 configuration from (might also be a list of file paths)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	644 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	645 return self.get_config_value('user', 'name', config_file)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	646
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	647 def get_user_email(self, config_file=None):
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	648 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	649 Returns user's email from global configuration file.
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	650
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	651 :param config_file: A path to file which should be used to retrieve
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	652 configuration from (might also be a list of file paths)
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	653 """
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: diff changeset	654 return self.get_config_value('user', 'email', config_file)

Mercurial > kallithea

annotate rhodecode/lib/vcs/backends/git/repository.py @ 2762:ba4fb9c441c6 beta