Exemplo n.º 1
0
def diff(repository, ref, from_ref=None, **kwargs):
    """git diff command, pygit2 wrapper
    :param ref:
    :param from_ref:
    :param flags:
    :param context_lines:
    :param paths:
    """

    _diff = {}
    ref = ref.strip()
    sha = resolve_version(repository, ref)
    if not sha:
        raise JagareError("%s...%s" % (from_ref, ref))
    commit = get_commit_by_sha(repository, sha)
    from_commit = None
    if from_ref:
        from_ref = from_ref.strip()
        from_sha = resolve_version(repository, from_ref)
        if not from_sha:
            raise JagareError("%s...%s" % (from_ref, ref))
        from_commit = get_commit_by_sha(repository, from_sha)

    # get pygit2 diff
    if from_commit:
        diff, _diff['old_sha'] = diff_commits(repository, commit, from_commit,
                                              **kwargs)
    else:
        diff, _diff['old_sha'] = diff_commit(repository, commit, **kwargs)

    _diff['new_sha'] = commit.hex
    _diff['diff'] = diff

    return _diff
Exemplo n.º 2
0
Arquivo: diff.py Projeto: imom0/ellen
def diff(repository, ref, from_ref=None, **kwargs):
    """git diff command, pygit2 wrapper
    :param ref:
    :param from_ref:
    :param flags:
    :param context_lines:
    :param paths:
    """

    _diff = {}
    ref = ref.strip()
    sha = resolve_version(repository, ref)
    if not sha:
        raise JagareError("%s...%s" % (from_ref, ref))
    commit = get_commit_by_sha(repository, sha)
    from_commit = None
    if from_ref:
        from_ref = from_ref.strip()
        from_sha = resolve_version(repository, from_ref)
        if not from_sha:
            raise JagareError("%s...%s" % (from_ref, ref))
        from_commit = get_commit_by_sha(repository, from_sha)

    # get pygit2 diff
    if from_commit:
        diff, _diff['old_sha'] = diff_commits(repository, commit, from_commit,
                                              **kwargs)
    else:
        diff, _diff['old_sha'] = diff_commit(repository, commit, **kwargs)

    _diff['new_sha'] = commit.hex
    _diff['diff'] = diff

    return _diff
Exemplo n.º 3
0
 def resolve_commit(self, version):
     version = version.strip() if version else ''
     return resolve_version(self.repository, version)
Exemplo n.º 4
0
 def resolve_commit(self, version):
     version = version.strip() if version else ''
     return resolve_version(self.repository, version)