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

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

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.

marcink - - Load All Authors

File last commit:

r2815:acc05c33 beta


                r3323:a0729656

beta

Download file

             hgcompat.py
        
                    18 lines
            
             | 642 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / rhodecode / lib / vcs / utils / hgcompat.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      """

      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

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				"""
				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