Mercurial > kallithea

comparison rhodecode/lib/vcs/backends/git/repository.py @ 2384:5563af834d92 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added diff option into git and hg changeset objects, representing git formated patch against parent1
author Marcin Kuzminski <marcin@python-works.com>
date Mon, 04 Jun 2012 17:26:34 +0200
parents e576410f911d
children 08fc67c1c948
comparison
equal deleted inserted replaced
2383:e576410f911d 2384:5563af834d92
435 """ 435 """
436 flags = ['-U%s' % context] 436 flags = ['-U%s' % context]
437 if ignore_whitespace: 437 if ignore_whitespace:
438 flags.append('-w') 438 flags.append('-w')
439 439
440 if hasattr(rev1, 'raw_id'):
441 rev1 = getattr(rev1, 'raw_id')
442
443 if hasattr(rev2, 'raw_id'):
444 rev2 = getattr(rev2, 'raw_id')
445
440 if rev1 == self.EMPTY_CHANGESET: 446 if rev1 == self.EMPTY_CHANGESET:
441 rev2 = self.get_changeset(rev2).raw_id 447 rev2 = self.get_changeset(rev2).raw_id
442 cmd = ' '.join(['show'] + flags + [rev2]) 448 cmd = ' '.join(['show'] + flags + [rev2])
443 else: 449 else:
444 rev1 = self.get_changeset(rev1).raw_id 450 rev1 = self.get_changeset(rev1).raw_id