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

@@ @@ -191,12 +191,17 @@ class GitChangeset(BaseChangeset): @@
                 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)

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

➞

Show inline comments

@@ @@ -434,12 +434,18 @@ class GitRepository(BaseRepository): @@
           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

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

➞

Show inline comments

@@ @@ -133,12 +133,17 @@ class MercurialChangeset(BaseChangeset): @@
                 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
         """

0 comments (0 inline, 0 general)