kallithea Changeset - 5563af834d92

Changeset - 5563af834d92

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 13 years ago 2012-06-04 17:26:34
marcin@python-works.com

Added diff option into git and hg changeset objects, representing git formated patch against parent1

3 files changed with 16 insertions and 0 deletions:

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

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

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

0 comments (0 inline, 0 general)

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

➞

Show inline comments

@@ @@ -185,24 +185,29 @@ class GitChangeset(BaseChangeset): @@
             except IndexError:
                 raise ChangesetDoesNotExistError
             cs = changeset.repository.get_changeset(prev_rev)
             if branch and branch != cs.branch:
                 return _prev(cs, branch)
             return cs
         return _prev(self, branch)
     def diff(self, ignore_whitespace=True, context=3):
         return ''.join(self.repository.get_diff(self, self.parents[0],
                                     ignore_whitespace=ignore_whitespace,
                                     context=context))
     def get_file_mode(self, path):
         """
         Returns stat mode of the file at the given ``path``.
         """
         # ensure path is traversed
         self._get_id_for_path(path)
         return self._stat_modes[path]
     def get_file_content(self, path):
         """
         Returns content of the file at given ``path``.
         """

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

➞

Show inline comments

@@ @@ -428,24 +428,30 @@ class GitRepository(BaseRepository): @@
           ``self.EMPTY_CHANGESET`` - in this case, patch showing all
           the changes since empty state of the repository until ``rev2``
         :param rev2: Until which revision changes should be shown.
         :param ignore_whitespace: If set to ``True``, would not show whitespace
           changes. Defaults to ``False``.
         :param context: How many lines before/after changed lines should be
           shown. Defaults to ``3``.
         """
         flags = ['-U%s' % context]
         if ignore_whitespace:
             flags.append('-w')
         if hasattr(rev1, 'raw_id'):
             rev1 = getattr(rev1, 'raw_id')
         if hasattr(rev2, 'raw_id'):
             rev2 = getattr(rev2, 'raw_id')
         if rev1 == self.EMPTY_CHANGESET:
             rev2 = self.get_changeset(rev2).raw_id
             cmd = ' '.join(['show'] + flags + [rev2])
         else:
             rev1 = self.get_changeset(rev1).raw_id
             rev2 = self.get_changeset(rev2).raw_id
             cmd = ' '.join(['diff'] + flags + [rev1, rev2])
         if path:
             cmd += ' -- "%s"' % path
         stdout, stderr = self.run_git_command(cmd)
         # If we used 'show' command, strip first few lines (until actual diff

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

➞

Show inline comments

@@ @@ -127,24 +127,29 @@ class MercurialChangeset(BaseChangeset): @@
             except IndexError:
                 raise ChangesetDoesNotExistError
             cs = changeset.repository.get_changeset(prev_rev)
             if branch and branch != cs.branch:
                 return _prev(cs, branch)
             return cs
         return _prev(self, branch)
     def diff(self, ignore_whitespace=True, context=3):
         return ''.join(self._ctx.diff(git=True,
                                       ignore_whitespace=ignore_whitespace,
                                       context=context))
     def _fix_path(self, path):
         """
         Paths are stored without trailing slash so we need to get rid off it if
         needed. Also mercurial keeps filenodes as str so we need to decode
         from unicode to str
         """
         if path.endswith('/'):
             path = path.rstrip('/')
         return safe_str(path)
     def _get_kind(self, path):

0 comments (0 inline, 0 general)