Files @ a07296564f6b
Branch filter:

Location: kallithea/rhodecode/lib/dbmigrate/migrate/versioning/script/__init__.py - annotation

Mads Kiilerich
compare: show aggregated diff of what will be merged to other repo, using merge ancestor

pull_request.get_compare_data will also now return the ancestor that would be
used for actual merging. Showing a diff from that ancestor instead of the first
'new' changeset will give a more realistic diff that doesn't include merges.
1
2
3
4
5
6
#!/usr/bin/env python
# -*- coding: utf-8 -*-

from rhodecode.lib.dbmigrate.migrate.versioning.script.base import BaseScript
from rhodecode.lib.dbmigrate.migrate.versioning.script.py import PythonScript
from rhodecode.lib.dbmigrate.migrate.versioning.script.sql import SqlScript