kallithea Files · rhodecode/lib/vcs/utils/hgcompat.py

Files @ a07296564f6b

Branch filter:

Location: kallithea/rhodecode/lib/vcs/utils/hgcompat.py

a07296564f6b 642 B text/x-python 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.

"""
Mercurial libs compatibility
"""

from mercurial import archival, merge as hg_merge, patch, ui
from mercurial.commands import clone, nullid, pull
from mercurial.context import memctx, memfilectx
from mercurial.error import RepoError, RepoLookupError, Abort
from mercurial.hgweb.common import get_contact
from mercurial.localrepo import localrepository
from mercurial.match import match
from mercurial.mdiff import diffopts
from mercurial.node import hex
from mercurial.encoding import tolocal
from mercurial import discovery
from mercurial import localrepo
from mercurial import scmutil
from mercurial.discovery import findcommonoutgoing