Files
@ a07296564f6b
Branch filter:
Location: kallithea/rhodecode/tests/vcs/conf.py - annotation
a07296564f6b
2.0 KiB
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.
402a96fcfa22 402a96fcfa22 402a96fcfa22 9492ab68331f 402a96fcfa22 402a96fcfa22 402a96fcfa22 402a96fcfa22 402a96fcfa22 9492ab68331f 402a96fcfa22 402a96fcfa22 402a96fcfa22 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 402a96fcfa22 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 9492ab68331f 402a96fcfa22 402a96fcfa22 402a96fcfa22 402a96fcfa22 402a96fcfa22 | """
Unit tests configuration module for vcs.
"""
import os
import time
import hashlib
import tempfile
import datetime
from rhodecode.tests import *
from utils import get_normalized_path
from os.path import join as jn
TEST_TMP_PATH = TESTS_TMP_PATH
#__all__ = (
# 'TEST_HG_REPO', 'TEST_GIT_REPO', 'HG_REMOTE_REPO', 'GIT_REMOTE_REPO',
# 'SCM_TESTS',
#)
#
#SCM_TESTS = ['hg', 'git']
#uniq_suffix = str(int(time.mktime(datetime.datetime.now().timetuple())))
#
THIS = os.path.abspath(os.path.dirname(__file__))
#
#GIT_REMOTE_REPO = 'git://github.com/codeinn/vcs.git'
#
#TEST_TMP_PATH = os.environ.get('VCS_TEST_ROOT', '/tmp')
#TEST_GIT_REPO = os.environ.get('VCS_TEST_GIT_REPO',
# jn(TEST_TMP_PATH, 'vcs-git'))
#TEST_GIT_REPO_CLONE = os.environ.get('VCS_TEST_GIT_REPO_CLONE',
# jn(TEST_TMP_PATH, 'vcsgitclone%s' % uniq_suffix))
#TEST_GIT_REPO_PULL = os.environ.get('VCS_TEST_GIT_REPO_PULL',
# jn(TEST_TMP_PATH, 'vcsgitpull%s' % uniq_suffix))
#
#HG_REMOTE_REPO = 'http://bitbucket.org/marcinkuzminski/vcs'
#TEST_HG_REPO = os.environ.get('VCS_TEST_HG_REPO',
# jn(TEST_TMP_PATH, 'vcs-hg'))
#TEST_HG_REPO_CLONE = os.environ.get('VCS_TEST_HG_REPO_CLONE',
# jn(TEST_TMP_PATH, 'vcshgclone%s' % uniq_suffix))
#TEST_HG_REPO_PULL = os.environ.get('VCS_TEST_HG_REPO_PULL',
# jn(TEST_TMP_PATH, 'vcshgpull%s' % uniq_suffix))
#
#TEST_DIR = os.environ.get('VCS_TEST_ROOT', tempfile.gettempdir())
#TEST_REPO_PREFIX = 'vcs-test'
#
#
#def get_new_dir(title):
# """
# Returns always new directory path.
# """
# name = TEST_REPO_PREFIX
# if title:
# name = '-'.join((name, title))
# hex = hashlib.sha1(str(time.time())).hexdigest()
# name = '-'.join((name, hex))
# path = os.path.join(TEST_DIR, name)
# return get_normalized_path(path)
PACKAGE_DIR = os.path.abspath(os.path.join(
os.path.dirname(__file__), '..'))
TEST_USER_CONFIG_FILE = jn(THIS, 'aconfig')
|