thodg/libgit2/src/status.c

---

src/status.c

---

Log

Author	Commit	Date	CI	Message
	37ee70fa	2013-03-25T22:19:39		Implement GIT_STATUS_OPT_EXCLUDE_SUBMODULES This option has been sitting unimplemented for a while, so I finally went through and implemented it along with some tests. As part of this, I improved the implementation of GIT_DIFF_IGNORE_SUBMODULES so it be more diligent about avoiding extra work and about leaving off delta records for submodules to the greatest extent possible (though it may include them still if you are request TYPECHANGE records).
	0c289dd7	2013-03-25T16:40:16		Recursing into ignored dirs for diff and status This implements working versions of GIT_DIFF_RECURSE_IGNORED_DIRS and GIT_STATUS_OPT_RECURSE_IGNORED_DIRS along with some tests for the newly available behaviors. This is not turned on by default for status, but can be accessed via the options to the extended version of the command.
	25423d03	2013-01-09T16:07:54		Support case insensitive tree iterators and status This makes tree iterators directly support case insensitivity by using a secondary index that can be sorted by icase. Also, this fixes the ambiguity check in the git_status_file API to also be case insensitive. Lastly, this adds new test cases for case insensitive range boundary checking for all types of iterators. With this change, it should be possible to deprecate the spool and sort iterator, but I haven't done that yet.
	5c8bb98c	2013-01-08T13:45:06		Fix err msg for ambiguous path in git_status_file Returning GIT_EAMBIGUOUS from inside the status callback gets overridden with GIT_EUSER. `git_status_file` accounted for this via the callback payload, but was allowing the error message to be cleared. Move the `giterr_set` call outside the callback to where the EUSER case was being dealt with.
	359fc2d2	2013-01-08T17:07:25		update copyrights
	56c72b75	2012-12-17T11:00:53		Fix diff constructor name order confusion The diff constructor functions had some confusing names, where the "old" side of the diff was coming after the "new" side. This reverses the order in the function name to make it less confusing. Specifically... * git_diff_index_to_tree becomes git_diff_tree_to_index * git_diff_workdir_to_index becomes git_diff_index_to_workdir * git_diff_workdir_to_tree becomes git_diff_tree_to_workdir
	c7231c45	2012-11-30T16:31:42		Deploy GITERR_CHECK_VERSION
	79cfa20d	2012-11-29T20:12:59		Deploy GIT_STATUS_OPTIONS_INIT
	2f8d30be	2012-11-29T15:05:04		Deploy GIT_DIFF_OPTIONS_INIT
	d574de0e	2012-11-21T11:53:54		API updates for status.h
	793c4385	2012-11-20T16:36:06		Update diff callback param order This makes the diff functions that take callbacks both take the payload parameter after the callback function pointers and pass the payload as the last argument to the callback function instead of the first. This should make them consistent with other callbacks across the API.
	5cec896a	2012-11-22T18:51:06		repo: Make git_repository_head_tree() return error codes
	bbe6dbec	2012-11-14T23:29:48		Add explicit git_index ptr to diff and checkout A number of diff APIs and the `git_checkout_index` API take a `git_repository` object an operate on the index. This updates them to take a `git_index` pointer explicitly and only fall back on the `git_repository` index if the index input is NULL. This makes it easier to operate on a temporary index.
	5735bf5e	2012-11-13T13:58:29		Fix diff API to better parameter order The diff API is not in the parameter order one would expect from other libgit2 APIs. This fixes that.
	55cbd05b	2012-11-08T16:56:34		Some diff refactorings to help code reuse There are some diff functions that are useful in a rewritten checkout and this lays some groundwork for that. This contains three main things: 1. Share the function diff uses to calculate the OID for a file in the working directory (now named `git_diff__oid_for_file` 2. Add a `git_diff__paired_foreach` function to iterator over two diff lists concurrently. Convert status to use it. 3. Move all the string/prefix/index entry comparisons into function pointers inside the `git_diff_list` object so they can be switched between case sensitive and insensitive versions. This makes them easier to reuse in various functions without replicating logic. As part of this, move a couple of index functions out of diff.c and into index.c.
	b90500f0	2012-11-01T14:08:30		Improve docs, examples, warnings This improves docs in some of the public header files, cleans up and improves some of the example code, and fixes a couple of pedantic warnings in places.
	4c47a8bc	2012-10-17T14:14:51		Merge pull request #968 from arrbee/diff-support-typechange Support TYPECHANGE records in status and adjust checkout accordingly
	52032ae5	2012-10-15T12:48:43		Fix single-file ignore checks To answer if a single given file should be ignored, the path to that file has to be processed progressively checking that there are no intermediate ignored directories in getting to the file in question. This enables that, fixing the broken old behavior, and adds tests to exercise various ignore situations.
	0d64bef9	2012-10-05T15:56:57		Add complex checkout test and then fix checkout This started as a complex new test for checkout going through the "typechanges" test repository, but that revealed numerous issues with checkout, including: * complete failure with submodules * failure to create blobs with exec bits * problems when replacing a tree with a blob because the tree "example/" sorts after the blob "example" so the delete was being processed after the single file blob was created This fixes most of those problems and includes a number of other minor changes that made it easier to do that, including improving the TYPECHANGE support in diff/status, etc.
	bc16fd3e	2012-09-28T13:40:02		Introduce status/diff TYPECHANGE flags When I wrote the diff code, I based it on core git's diff output which tends to split a type change into an add and a delete. But core git's status has the notion of a T (typechange) flag for a file. This introduces that into our status APIs and modifies the diff code so it can be forced to not split type changes.
	ec40b7f9	2012-09-17T15:42:41		Support for core.ignorecase
	f335ecd6	2012-08-30T14:24:16		Diff iterators This refactors the diff output code so that an iterator object can be used to traverse and generate the diffs, instead of just the `foreach()` style with callbacks. The code has been rearranged so that the two styles can still share most functions. This also replaces `GIT_REVWALKOVER` with `GIT_ITEROVER` and uses that as a common error code for marking the end of iteration when using a iterator style of object.
	2fb4e9b3	2012-08-22T11:42:00		Wrap up ignore API and add tests This fills out the ignore API and adds tests.
	51e1d808	2012-08-06T12:41:08		Merge remote-tracking branch 'arrbee/tree-walk-fixes' into development Conflicts: src/notes.c src/transports/git.c src/transports/http.c src/transports/local.c tests-clar/odb/foreach.c
	5dca2010	2012-08-03T17:08:01		Update iterators for consistency across library This updates all the `foreach()` type functions across the library that take callbacks from the user to have a consistent behavior. The rules are: * A callback terminates the loop by returning any non-zero value * Once the callback returns non-zero, it will not be called again (i.e. the loop stops all iteration regardless of state) * If the callback returns non-zero, the parent fn returns GIT_EUSER * Although the parent returns GIT_EUSER, no error will be set in the library and `giterr_last()` will return NULL if called. This commit makes those changes across the library and adds tests for most of the iteration APIs to make sure that they follow the above rules.
	e25dda51	2012-08-02T01:38:30		Merge remote-tracking branch 'nulltoken/topic/amd64-compat' into development Conflicts: src/netops.c src/netops.h src/oid.c
	b8457baa	2012-07-24T07:57:58		portability: Improve x86/amd64 compatibility
	a1773f9d	2012-07-23T18:16:09		Add flag to turn off pathspec testing for diff and status
	ffbc689c	2012-07-18T16:26:55		Fix getting status of files containing brackets
	904b67e6	2012-05-18T01:48:50		errors: Rename error codes
	e172cf08	2012-05-18T01:21:06		errors: Rename the generic return codes
	41a82592	2012-05-15T14:17:39		Ranged iterators and rewritten git_status_file The goal of this work is to rewrite git_status_file to use the same underlying code as git_status_foreach. This is done in 3 phases: 1. Extend iterators to allow ranged iteration with start and end prefixes for the range of file names to be covered. 2. Improve diff so that when there is a pathspec and there is a common non-wildcard prefix of the pathspec, it will use ranged iterators to minimize excess iteration. 3. Rewrite git_status_file to call git_status_foreach_ext with a pathspec that covers just the one file being checked. Since ranged iterators underlie the status & diff implementation, this is actually fairly efficient. The workdir iterator does end up loading the contents of all the directories down to the single file, which should ideally be avoided, but it is pretty good.
	dc13f1f7	2012-05-10T11:08:59		Add cache busting to attribute cache This makes the git attributes and git ignores cache check stat information before using the file contents from the cache. For cached files from the index, it checks the SHA of the file instead. This should reduce the need to ever call `git_attr_cache_flush()` in most situations. This commit also fixes the `git_status_should_ignore` API to use the libgit2 standard parameter ordering.
	7e000ab2	2012-05-08T15:03:59		Add support for diffing index with no HEAD When a repo is first created, there is no HEAD yet and attempting to diff files in the index was showing nothing because a tree iterator could not be constructed. This adds an "empty" iterator and falls back on that when the head cannot be looked up.
	722c08af	2012-05-07T21:21:48		status: Prevent git_status_file() from returning ENOTFOUND when not applicable
	f917481e	2012-05-03T16:37:25		Support reading attributes from index Depending on the operation, we need to consider gitattributes in both the work dir and the index. This adds a parameter to all of the gitattributes related functions that allows user control of attribute reading behavior (i.e. prefer workdir, prefer index, only use index). This fix also covers allowing us to check attributes (and hence do diff and status) on bare repositories. This was a somewhat larger change that I hoped because it had to change the cache key used for gitattributes files.
	16b83019	2012-03-04T23:28:36		Fix usage of "new" for fieldname in public header This should restore the ability to include libgit2 headers in C++ projects. Cherry picked 2de60205dfea2c4a422b2108a5e8605f97c2e895 from development into new-error-handling.
	26515e73	2012-04-23T10:06:31		Rename to git_reference_name_to_oid
	f201d613	2012-04-13T10:33:14		Add git_reference_lookup_oid and lookup_resolved Adds a new public reference function `git_reference_lookup_oid` that directly resolved a reference name to an OID without returning the intermediate `git_reference` object (hence, no free needed). Internally, this adds a `git_reference_lookup_resolved` function that combines looking up and resolving a reference. This allows us to be more efficient with memory reallocation. The existing `git_reference_lookup` and `git_reference_resolve` are reimplmented on top of the new utility and a few places in the code are changed to use one of the two new functions.
	dbeca796	2012-04-13T10:43:47		Remove old status implementation This removes the code for the old status implementation.
	14a513e0	2012-04-13T15:00:29		Add support for pathspec to diff and status This adds preliminary support for pathspecs to diff and status. The implementation is not very optimized (it still looks at every single file and evaluated the the pathspec match against them), but it works.
	64b402f8	2012-04-11T19:19:12		status: Remove status_old This is Git yo. You can fetch stuff from the history if you need it.
	8e8b6b01	2012-04-04T13:13:43		Clean up valgrind warnings
	1db12b00	2012-03-25T23:04:26		Eliminate hairy COITERATE macro I decided that the COITERATE macro was, in the end causing more confusion that it would save and decided just to write out the loops that I needed for parallel diff list iteration. It is not that much code and this just feels less obfuscated.
	c8838ee9	2012-03-23T11:03:01		Restore default status recursion behavior This gives `git_status_foreach()` back its old behavior of emulating the "--untracked=all" behavior of git. You can get any of the various --untracked options by passing flags to `git_status_foreach_ext()` but the basic version will keep the behavior it has always had.
	4b136a94	2012-03-23T09:26:09		Fix crash in new status and add recurse option This fixes the bug that @nulltoken found (thank you!) where if there were untracked directories alphabetically after the last tracked item, the diff implementation would deref a NULL pointer. The fix involved the code which decides if it is necessary to recurse into a directory in the working dir, so it was easy to add a new option `GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS` to control if the contents of untracked directories should be included in status.
	66142ae0	2012-03-22T10:44:36		New status fixes This adds support for roughly-right tracking of submodules (although it does not recurse into submodules to detect internal modifications a la core git), and it adds support for including unmodified files in diff iteration if requested.
	a48ea31d	2012-03-21T12:33:09		Reimplment git_status_foreach using git diff This is an initial reimplementation of status using diff a la the way that core git does it.
	0d0fa7c3	2012-03-16T15:56:01		Convert attr, ignore, mwindow, status to new errors Also cleaned up some previously converted code that still had little things to polish.
	cb8a7961	2012-03-07T00:02:55		error-handling: Repository This also includes droping `git_buf_lasterror` because it makes no sense in the new system. Note that in most of the places were it has been dropped, the code needs cleanup. I.e. GIT_ENOMEM is going away, so instead it should return a generic `-1` and obviously not throw anything.
	1a481123	2012-02-17T00:13:34		error-handling: References Yes, this is error handling solely for `refs.c`, but some of the abstractions leak all ofer the code base.
	e1bcc191	2012-03-01T11:45:00		Revert GIT_STATUS constants to avoid issues This reverts the changes to the GIT_STATUS constants and adds a new enumeration to describe the type of change in a git_diff_delta. I don't love this solution, but it should prevent strange errors from occurring for now. Eventually, I would like to unify the various status constants, but it needs a larger plan and I just wanted to eliminate this breakage quickly.
	74fa4bfa	2012-02-28T16:14:47		Update diff to use iterators This is a major reorganization of the diff code. This changes the diff functions to use the iterators for traversing the content. This allowed a lot of code to be simplified. Also, this moved the functions relating to outputting a diff into a new file (diff_output.c). This includes a number of other changes - adding utility functions, extending iterators, etc. plus more tests for the diff code. This also takes the example diff.c program much further in terms of emulating git-diff command line options.
	5e0de328	2012-02-13T17:10:24		Update Copyright header Signed-off-by: schu <schu-github@schulog.org>
	4ea79a9d	2012-02-01T17:41:54		status: Document submodule TODOs
	adc9bdb3	2012-01-31T13:59:32		Fix attr path is_dir check When building an attr path object, the code that checks if the file is a directory was evaluating the file as a relative path to the current working directory, instead of using the repo root. This lead to inconsistent behavior.
	5d3cd4e3	2012-01-31T13:09:39		Convert status assert to skip file When status encounters a submodule, right now it is asserting. This changes it to just skip the file that it can't deal with.
	1744fafe	2012-01-17T15:49:47		Move path related functions from fileops to path This takes all of the functions that look up simple data about paths (such as `git_futils_isdir`) and moves them over to path.h (becoming `git_path_isdir`). This leaves fileops.h just with functions that actually manipulate the filesystem or look at the file contents in some way. As part of this, the dir.h header which is really just for win32 support was moved into win32 (with some minor changes).
	cfbc880d	2012-01-16T15:16:44		Patch cleanup for merge After reviewing the gitignore support with Vicent, we came up with a list of minor cleanups to prepare for merge, including: * checking git_repository_config error returns * renaming git_ignore_is_ignored and moving to status.h * fixing next_line skipping to include \r skips * commenting on where ignores are and are not included
	1dbcc9fc	2012-01-11T21:07:16		Fix several memory issues This contains fixes for several issues discovered by MSVC and by valgrind, including some bad data access, some memory leakage (in where certain files were not being successfully added to the cache), and some code simplification.
	df743c7d	2012-01-09T15:37:19		Initial implementation of gitignore support Adds support for .gitignore files to git_status_foreach() and git_status_file(). This includes refactoring the gitattributes code to share logic where possible. The GIT_STATUS_IGNORED flag will now be passed in for files that are ignored (provided they are not already in the index or the head of repo).
	d6cceddd	2011-12-14T10:52:28		Check error on path manipulations. This commit fixes #511.
	97769280	2011-11-30T11:27:15		Use git_buf for path storage instead of stack-based buffers This converts virtually all of the places that allocate GIT_PATH_MAX buffers on the stack for manipulating paths to use git_buf objects instead. The patch is pretty careful not to touch the public API for libgit2, so there are a few places that still use GIT_PATH_MAX. This extends and changes some details of the git_buf implementation to add a couple of extra functions and to make error handling easier. This includes serious alterations to all the path.c functions, and several of the fileops.c ones, too. Also, there are a number of new functions that parallel existing ones except that use a git_buf instead of a stack-based buffer (such as git_config_find_global_r that exists alongsize git_config_find_global). This also modifies the win32 version of p_realpath to allocate whatever buffer size is needed to accommodate the realpath instead of hardcoding a GIT_PATH_MAX limit, but that change needs to be tested still.
	89886d0b	2011-11-28T21:08:29		Plug a bunch of leaks
	45e79e37	2011-11-26T04:59:21		Rename all `_close` methods There's no difference between `_free` and `_close` semantics: keep everything with the same name to avoid confusions.
	9462c471	2011-11-25T08:16:26		repository: Change ownership semantics The ownership semantics have been changed all over the library to be consistent. There are no more "borrowed" or duplicated references. Main changes: - `git_repository_open2` and `3` have been dropped. - Added setters and getters to hotswap all the repository owned objects: `git_repository_index` `git_repository_set_index` `git_repository_odb` `git_repository_set_odb` `git_repository_config` `git_repository_set_config` `git_repository_workdir` `git_repository_set_workdir` Now working directories/index files/ODBs and so on can be hot-swapped after creating a repository and between operations. - All these objects now have proper ownership semantics with refcounting: they all require freeing after they are no longer needed (the repository always keeps its internal reference). - Repository open and initialization has been updated to keep in mind the configuration files. Bare repositories are now always detected, and a default config file is created on init. - All the tests affected by these changes have been dropped from the old test suite and ported to the new one.
	e3baa3cc	2011-10-29T17:45:01		status: Fix a sorting issue in the treewalker This ensures that entries from the working directory are retrieved according to the following rules: - The file "subdir" should appear before the file "subdir.txt" - The folder "subdir" should appear after the file "subdir.txt"
	d1db74bf	2011-10-29T17:40:04		status: Prevent segfaulting when determining the status of a repository Fixes #465
	3286c408	2011-10-28T14:51:13		global: Properly use `git__` memory wrappers Ensure that all memory related functions (malloc, calloc, strdup, free, etc) are using their respective `git__` wrappers.
	1ca715e0	2011-10-22T12:36:30		status: move GIT_STATUS_PATH_* into an enum Their actual values have no meaning, so pack them in an enum. Signed-off-by: Carlos Martín Nieto <carlos@cmartin.tk>
	68a26dfa	2011-10-22T12:33:49		status: reorder retrieve_head_tree error checks Signed-off-by: Carlos Martín Nieto <carlos@cmartin.tk>
	c2892d61	2011-10-22T11:46:22		status: remove git_tree_entry_bypos The only caller has been changed to treat a NULL tree as a special case and use the existing git_tree_entry_byindex. Signed-off-by: Carlos Martín Nieto <carlos@cmartin.tk>
	899cb7a8	2011-10-22T11:36:18		status: remove git_index_entry_bypos This function is already implemented (better) as git_index_get. Change the only caller to use that function. Signed-off-by: Carlos Martín Nieto <carlos@cmartin.tk>
	19d869bb	2011-09-19T06:31:54		Fix warning in `status.c`
	71b84c63	2011-09-18T19:55:48		Merge pull request #408 from schu/fixup-status Fixup status.c
	bb742ede	2011-09-19T01:54:32		Cleanup legal data 1. The license header is technically not valid if it doesn't have a copyright signature. 2. The COPYING file has been updated with the different licenses used in the project. 3. The full GPLv2 header in each file annoys me.
	855f0660	2011-09-17T17:28:39		status.c: add missing check for error dirent_cb() didn't check the return value of determine_status(). Signed-off-by: schu <schu-github@schulog.org>
	ef374890	2011-09-16T13:55:29		status.c: remove wrong address operator Signed-off-by: schu <schu-github@schulog.org>
	d8b903da	2011-09-11T18:46:08		status: enhance determination of statuses for a whole directory - Should increase performance through usage of a walker - No callback invocation for unaltered entries
	56453d34	2011-09-02T13:44:42		status: enhance determination of status for a single file - fix retrieval of a file status when working against a newly initialized repository - reduce memory pressure - prevents a directory from being tested
	8f643ce8	2011-08-03T13:44:28		Remove duplicated sort
	9d9e492d	2011-08-03T13:38:02		remove unused variable
	8cf077f4	2011-08-03T13:37:24		fix recurse_tree_entries, continue parsing tree after first subdirectory found
	1a8167af	2011-07-14T00:04:24		status: don't hide tree closing It's not obvious that recurse_tree_entries or recurse_tree_entry should free a resource that wasn't allocated by them. Do this explicitely and plug a leak while we're at it. Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
	75c2002f	2011-07-12T18:08:46		status: plug some leaks Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
	c52736fa	2011-07-09T15:05:14		status: Cleanup The `hashfile` function has been moved to ODB, next to `git_odb_hash`. Global state has been removed from the dirent call in `status.c`, because global state is killing the rainforest and causing global warming.
	205166d2	2011-06-22T18:19:46		status: get blob object id of file on disk Add git_status_hashfile() to get blob's object id for a file without adding it to the object database or needing a repository at all. This functionality is similar to `git hash-object` without '-w'.
	34dfea27	2011-06-24T20:36:53		status: handle subdirs for git_status_file
	3b2a423c	2011-07-09T00:08:52		status: nonexistent file with git_status_file() Throws GIT_ENOTFOUND error if given a filename that is not in HEAD, index, nor the work tree.
	20361b2f	2011-06-23T18:51:22		status: get status for single file Add git_status_file to be able to retrieve status of single file by supplying a path.
	3af6b34a	2011-06-22T18:31:20		status: get file statuses and run callback Add git_status_foreach() to run a callback on each file passing the path and a status value.