mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-06 23:26:39 +00:00
b4f5bb0747
This implements the basis for diff rename and copy detection, although it is based on simple SHA comparison right now instead of using a matching algortihm. Just as `git_diff_merge` can be used as a post-pass on diffs to emulate certain command line behaviors, there is a new API `git_diff_detect` which will update a diff list in-place, adjusting some deltas to RENAMED or COPIED state (and also, eventually, splitting MODIFIED deltas where the change is too large into DELETED/ADDED pairs). This also adds a new test repo that will hold rename/copy/split scenarios. Right now, it just has exact-match rename and copy, but the tests are written to use tree diffs, so we should be able to add new test scenarios easily without breaking tests.
56 lines
1.4 KiB
C
56 lines
1.4 KiB
C
/*
|
|
* Copyright (C) 2009-2012 the libgit2 contributors
|
|
*
|
|
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
|
* a Linking Exception. For full terms see the included COPYING file.
|
|
*/
|
|
#ifndef INCLUDE_diff_h__
|
|
#define INCLUDE_diff_h__
|
|
|
|
#include "git2/diff.h"
|
|
#include "git2/oid.h"
|
|
|
|
#include <stdio.h>
|
|
#include "vector.h"
|
|
#include "buffer.h"
|
|
#include "iterator.h"
|
|
#include "repository.h"
|
|
#include "pool.h"
|
|
|
|
#define DIFF_OLD_PREFIX_DEFAULT "a/"
|
|
#define DIFF_NEW_PREFIX_DEFAULT "b/"
|
|
|
|
enum {
|
|
GIT_DIFFCAPS_HAS_SYMLINKS = (1 << 0), /* symlinks on platform? */
|
|
GIT_DIFFCAPS_ASSUME_UNCHANGED = (1 << 1), /* use stat? */
|
|
GIT_DIFFCAPS_TRUST_MODE_BITS = (1 << 2), /* use st_mode? */
|
|
GIT_DIFFCAPS_TRUST_CTIME = (1 << 3), /* use st_ctime? */
|
|
GIT_DIFFCAPS_USE_DEV = (1 << 4), /* use st_dev? */
|
|
};
|
|
|
|
#define GIT_DELTA__TO_DELETE 10
|
|
#define GIT_DELTA__TO_SPLIT 11
|
|
|
|
struct git_diff_list {
|
|
git_refcount rc;
|
|
git_repository *repo;
|
|
git_diff_options opts;
|
|
git_vector pathspec;
|
|
git_vector deltas; /* vector of git_diff_delta */
|
|
git_pool pool;
|
|
git_iterator_type_t old_src;
|
|
git_iterator_type_t new_src;
|
|
uint32_t diffcaps;
|
|
};
|
|
|
|
extern void git_diff__cleanup_modes(
|
|
uint32_t diffcaps, uint32_t *omode, uint32_t *nmode);
|
|
|
|
extern void git_diff_list_addref(git_diff_list *diff);
|
|
|
|
extern bool git_diff_delta__should_skip(
|
|
const git_diff_options *opts, const git_diff_delta *delta);
|
|
|
|
#endif
|
|
|