Files
@ a07296564f6b
Branch filter:
Location: kallithea/rhodecode/lib/__init__.py - annotation
a07296564f6b
862 B
text/x-python
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.
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.
70e646b2806a 70e646b2806a 70e646b2806a a9888895b60d 70e646b2806a 70e646b2806a 70e646b2806a cf51bbfb120e a9888895b60d 70e646b2806a 70e646b2806a 70e646b2806a 324ac367a4da 324ac367a4da 70e646b2806a 70e646b2806a 70e646b2806a 70e646b2806a 70e646b2806a 67168195a676 a9888895b60d b5a5a60608a7 b5a5a60608a7 b5a5a60608a7 70e646b2806a | import os
def get_current_revision(quiet=False):
"""
Returns tuple of (number, id) from repository containing this package
or None if repository could not be found.
:param quiet: prints error for fetching revision if True
"""
try:
from rhodecode.lib.vcs import get_repo
from rhodecode.lib.vcs.utils.helpers import get_scm
repopath = os.path.join(os.path.dirname(__file__), '..', '..')
scm = get_scm(repopath)[0]
repo = get_repo(path=repopath, alias=scm)
tip = repo.get_changeset()
return (tip.revision, tip.short_id)
except Exception, err:
if not quiet:
print ("WARNING: Cannot retrieve rhodecode's revision. "
"disregard this if you don't know what that means. "
"Original error was: %s" % err)
return None
|