##// END OF EJS Templates
diff parser: match the header order of hg diff --git patches...
diff parser: match the header order of hg diff --git patches The output might look like: diff --git a/A b/B old mode 100644 new mode 100755 rename from A rename to B --- a/A +++ b/B Such files were shown as 'modified binary file chmod 100644 => 100755' without diff. Now the chmod and diff will be shown ... but still not the rename. Correct parsing of headers do require a better parser - one do not just use a regexp.

File last commit:

r2543:03a77098 beta
r3817:631e8000 beta
Show More
inmemory.py
113 lines | 4.3 KiB | text/x-python | PythonLexer
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 import datetime
import errno
from rhodecode.lib.vcs.backends.base import BaseInMemoryChangeset
from rhodecode.lib.vcs.exceptions import RepositoryError
Synced vcs with upstream
r2543 from rhodecode.lib.vcs.utils.hgcompat import memfilectx, memctx, hex, tolocal
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
class MercurialInMemoryChangeset(BaseInMemoryChangeset):
def commit(self, message, author, parents=None, branch=None, date=None,
**kwargs):
"""
Performs in-memory commit (doesn't check workdir in any way) and
returns newly created ``Changeset``. Updates repository's
``revisions``.
:param message: message of the commit
:param author: full username, i.e. "Joe Doe <joe.doe@example.com>"
:param parents: single parent or sequence of parents from which commit
would be derieved
:param date: ``datetime.datetime`` instance. Defaults to
``datetime.datetime.now()``.
:param branch: branch name, as string. If none given, default backend's
branch would be used.
:raises ``CommitError``: if any error occurs while committing
"""
self.check_integrity(parents)
from .repository import MercurialRepository
various fixes for git and mercurial with InMemoryCommit backend and non-ascii files...
r2199 if not isinstance(message, unicode) or not isinstance(author, unicode):
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 raise RepositoryError('Given message and author needs to be '
Added vcs testsuite for better integration tests + added fetching...
r2451 'an <unicode> instance got %r & %r instead'
% (type(message), type(author)))
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
if branch is None:
branch = MercurialRepository.DEFAULT_BRANCH_NAME
kwargs['branch'] = branch
def filectxfn(_repo, memctx, path):
"""
Marks given path as added/changed/removed in a given _repo. This is
for internal mercurial commit function.
"""
# check if this path is removed
if path in (node.path for node in self.removed):
# Raising exception is a way to mark node for removal
raise IOError(errno.ENOENT, '%s is deleted' % path)
# check if this path is added
for node in self.added:
if node.path == path:
return memfilectx(path=node.path,
data=(node.content.encode('utf8')
if not node.is_binary else node.content),
islink=False,
isexec=node.is_executable,
copied=False)
# or changed
for node in self.changed:
if node.path == path:
return memfilectx(path=node.path,
data=(node.content.encode('utf8')
if not node.is_binary else node.content),
islink=False,
isexec=node.is_executable,
copied=False)
raise RepositoryError("Given path haven't been marked as added,"
various fixes for git and mercurial with InMemoryCommit backend and non-ascii files...
r2199 "changed or removed (%s)" % path)
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
parents = [None, None]
for i, parent in enumerate(self.parents):
if parent is not None:
parents[i] = parent._ctx.node()
if date and isinstance(date, datetime.datetime):
date = date.ctime()
commit_ctx = memctx(repo=self.repository._repo,
parents=parents,
text='',
files=self.get_paths(),
filectxfn=filectxfn,
user=author,
date=date,
extra=kwargs)
various fixes for git and mercurial with InMemoryCommit backend and non-ascii files...
r2199 loc = lambda u: tolocal(u.encode('utf-8'))
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 # injecting given _repo params
various fixes for git and mercurial with InMemoryCommit backend and non-ascii files...
r2199 commit_ctx._text = loc(message)
commit_ctx._user = loc(author)
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 commit_ctx._date = date
# TODO: Catch exceptions!
n = self.repository._repo.commitctx(commit_ctx)
# Returns mercurial node
self._commit_ctx = commit_ctx # For reference
# Update vcs repository object & recreate mercurial _repo
# new_ctx = self.repository._repo[node]
# new_tip = self.repository.get_changeset(new_ctx.hex())
new_id = hex(n)
self.repository.revisions.append(new_id)
self._repo = self.repository._get_repo(create=False)
self.repository.branches = self.repository._get_branches()
tip = self.repository.get_changeset()
self.reset()
return tip