kallithea Files · rhodecode/lib/dbmigrate/migrate/versioning/templates/manage/default.py

Files @ a07296564f6b

Branch filter:

Location: kallithea/rhodecode/lib/dbmigrate/migrate/versioning/templates/manage/default.py_tmpl

a07296564f6b 286 B text/plain Show Annotation Show as Raw Download as Raw

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.

#!/usr/bin/env python
from migrate.versioning.shell import main

{{py:
_vars = locals().copy()
del _vars['__template_name__']
_vars.pop('repository_name', None)
defaults = ", ".join(["%s='%s'" % var for var in _vars.iteritems()])
}}

if __name__ == '__main__':
    main({{ defaults }})