upstream/kallithea Files · rhodecode/lib/vcs/utils/compat.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:

r2007:324ac367 beta


                r3323:a0729656

beta

Download file

             compat.py
        
                    13 lines
            
             | 266 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / rhodecode / lib / vcs / utils / compat.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      """

      Various utilities to work with Python < 2.7.

      Those utilities may be deleted once ``vcs`` stops support for older Python

      versions.

      """

      import sys

      if sys.version_info >= (2, 7):

          unittest = __import__('unittest')

      else:

          unittest = __import__('unittest2')

	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

				"""
				Various utilities to work with Python < 2.7.

				Those utilities may be deleted once ``vcs`` stops support for older Python
				versions.
				"""
				import sys


				if sys.version_info >= (2, 7):
				unittest = __import__('unittest')
				else:
				unittest = __import__('unittest2')