kallithea Changeset - 03a770980b55

Changeset - 03a770980b55

Parent rev.

Child rev.

[Not reviewed]

beta

0 8 0

Marcin Kuzminski - 13 years ago 2012-07-04 11:42:16
marcin@python-works.com

Synced vcs with upstream

8 files changed with 15 insertions and 9 deletions:

rhodecode/lib/vcs/__init__.py

rhodecode/lib/vcs/backends/git/changeset.py

rhodecode/lib/vcs/backends/hg/changeset.py

rhodecode/lib/vcs/backends/hg/inmemory.py

rhodecode/lib/vcs/backends/hg/repository.py

rhodecode/lib/vcs/backends/hg/workdir.py

rhodecode/lib/vcs/nodes.py

rhodecode/tests/vcs/test_changesets.py

0 comments (0 inline, 0 general)

rhodecode/lib/vcs/__init__.py

➞

Show inline comments

@@ @@ -7,13 +7,13 @@ @@
     Python.
     :created_on: Apr 8, 2010
     :copyright: (c) 2010-2011 by Marcin Kuzminski, Lukasz Balcerzak.
 """
-VERSION = (0, 2, 3, 'dev')
+VERSION = (0, 3, 0, 'dev')
 __version__ = '.'.join((str(each) for each in VERSION[:4]))
 __all__ = [
     'get_version', 'get_repo', 'get_backend',
     'VCSError', 'RepositoryError', 'ChangesetError']

rhodecode/lib/vcs/backends/git/changeset.py

➞

Show inline comments

@@ @@ -12,13 +12,12 @@ from rhodecode.lib.vcs.exceptions import @@
 from rhodecode.lib.vcs.backends.base import BaseChangeset
 from rhodecode.lib.vcs.nodes import FileNode, DirNode, NodeKind, RootNode, \
     RemovedFileNode, SubModuleNode
 from rhodecode.lib.vcs.utils import safe_unicode
 from rhodecode.lib.vcs.utils import date_fromtimestamp
 from rhodecode.lib.vcs.utils.lazy import LazyProperty
 from dulwich.objects import Commit, Tag
 class GitChangeset(BaseChangeset):
     """
     Represents state of the repository at single revision.
     """
@@ @@ -26,13 +25,13 @@ class GitChangeset(BaseChangeset): @@
     def __init__(self, repository, revision):
         self._stat_modes = {}
         self.repository = repository
         try:
             commit = self.repository._repo.get_object(revision)
             if isinstance(commit, Tag):
+            if isinstance(commit, objects.Tag):
                 revision = commit.object[1]
                 commit = self.repository._repo.get_object(commit.object[1])
         except KeyError:
             raise RepositoryError("Cannot get object with id %s" % revision)
         self.raw_id = revision
         self.id = self.raw_id

rhodecode/lib/vcs/backends/hg/changeset.py

➞

Show inline comments

@@ @@ -9,14 +9,13 @@ from rhodecode.lib.vcs.nodes import Adde @@
     ChangedFileNodesGenerator, DirNode, FileNode, NodeKind, \
     RemovedFileNodesGenerator, RootNode, SubModuleNode
 from rhodecode.lib.vcs.utils import safe_str, safe_unicode, date_fromtimestamp
 from rhodecode.lib.vcs.utils.lazy import LazyProperty
 from rhodecode.lib.vcs.utils.paths import get_dirs_for_path
 from ...utils.hgcompat import archival, hex
 from rhodecode.lib.vcs.utils.hgcompat import archival, hex
 class MercurialChangeset(BaseChangeset):
     """
     Represents state of the repository at the single revision.
     """

rhodecode/lib/vcs/backends/hg/inmemory.py

➞

Show inline comments

 import datetime
 import errno
 from rhodecode.lib.vcs.backends.base import BaseInMemoryChangeset
 from rhodecode.lib.vcs.exceptions import RepositoryError
 from ...utils.hgcompat import memfilectx, memctx, hex, tolocal
+from rhodecode.lib.vcs.utils.hgcompat import memfilectx, memctx, hex, tolocal
 class MercurialInMemoryChangeset(BaseInMemoryChangeset):
     def commit(self, message, author, parents=None, branch=None, date=None,
             **kwargs):

rhodecode/lib/vcs/backends/hg/repository.py

➞

Show inline comments

@@ @@ -15,13 +15,13 @@ from rhodecode.lib.vcs.exceptions import @@
 from rhodecode.lib.vcs.utils import author_email, author_name, date_fromtimestamp, \
     makedate, safe_unicode
 from rhodecode.lib.vcs.utils.lazy import LazyProperty
 from rhodecode.lib.vcs.utils.ordered_dict import OrderedDict
 from rhodecode.lib.vcs.utils.paths import abspath
 from ...utils.hgcompat import ui, nullid, match, patch, diffopts, clone, \
+from rhodecode.lib.vcs.utils.hgcompat import ui, nullid, match, patch, diffopts, clone, \
     get_contact, pull, localrepository, RepoLookupError, Abort, RepoError, hex
 class MercurialRepository(BaseRepository):
     """
     Mercurial repository backend

rhodecode/lib/vcs/backends/hg/workdir.py

➞

Show inline comments

 from rhodecode.lib.vcs.backends.base import BaseWorkdir
 from rhodecode.lib.vcs.exceptions import BranchDoesNotExistError
 from ...utils.hgcompat import hg_merge
+from rhodecode.lib.vcs.utils.hgcompat import hg_merge
 class MercurialWorkdir(BaseWorkdir):
     def get_branch(self):
         return self.repository._repo.dirstate.branch()

rhodecode/lib/vcs/nodes.py

➞

Show inline comments

@@ @@ -13,13 +13,13 @@ import stat @@
 import posixpath
 import mimetypes
 from pygments import lexers
 from rhodecode.lib.vcs.utils.lazy import LazyProperty
-from rhodecode.lib.vcs.utils import safe_unicode, safe_str
 from rhodecode.lib.vcs.utils import safe_unicode
 from rhodecode.lib.vcs.exceptions import NodeError
 from rhodecode.lib.vcs.exceptions import RemovedFileNodeError
 from rhodecode.lib.vcs.backends.base import EmptyChangeset
 class NodeKind:

rhodecode/tests/vcs/test_changesets.py

➞

Show inline comments

@@ @@ -116,12 +116,20 @@ class ChangesetsWithCommitsTestCaseixin( @@
             parents=[tip],
+        )
         default_branch_changesets = self.repo.get_changesets(
             branch_name=self.repo.DEFAULT_BRANCH_NAME)
         self.assertNotIn(doc_changeset, default_branch_changesets)
     def test_get_changeset_by_branch(self):
         for branch, sha in self.repo.branches.iteritems():
             self.assertEqual(sha, self.repo.get_changeset(branch).raw_id)
     def test_get_changeset_by_tag(self):
         for tag, sha in self.repo.tags.iteritems():
             self.assertEqual(sha, self.repo.get_changeset(tag).raw_id)
 class ChangesetsTestCaseMixin(BackendTestMixin):
     recreate_repo_per_test = False
     @classmethod
     def _get_commits(cls):

0 comments (0 inline, 0 general)