2006-09-08 08:05:34 +00:00
|
|
|
#ifndef STATUS_H
|
|
|
|
#define STATUS_H
|
|
|
|
|
2007-09-18 00:06:42 +00:00
|
|
|
#include <stdio.h>
|
2009-08-05 06:49:33 +00:00
|
|
|
#include "string-list.h"
|
2009-08-10 06:08:40 +00:00
|
|
|
#include "color.h"
|
2015-08-20 14:06:27 +00:00
|
|
|
#include "pathspec.h"
|
2018-01-09 18:50:16 +00:00
|
|
|
#include "remote.h"
|
2007-09-18 00:06:42 +00:00
|
|
|
|
2018-11-10 05:48:49 +00:00
|
|
|
struct repository;
|
2016-04-22 13:01:31 +00:00
|
|
|
struct worktree;
|
|
|
|
|
2006-09-08 08:05:34 +00:00
|
|
|
enum color_wt_status {
|
2009-08-10 06:08:40 +00:00
|
|
|
WT_STATUS_HEADER = 0,
|
2006-09-08 08:05:34 +00:00
|
|
|
WT_STATUS_UPDATED,
|
|
|
|
WT_STATUS_CHANGED,
|
|
|
|
WT_STATUS_UNTRACKED,
|
2008-05-22 12:50:02 +00:00
|
|
|
WT_STATUS_NOBRANCH,
|
2009-08-05 07:04:51 +00:00
|
|
|
WT_STATUS_UNMERGED,
|
2010-05-25 13:45:51 +00:00
|
|
|
WT_STATUS_LOCAL_BRANCH,
|
2010-11-17 23:40:05 +00:00
|
|
|
WT_STATUS_REMOTE_BRANCH,
|
|
|
|
WT_STATUS_ONBRANCH,
|
|
|
|
WT_STATUS_MAXSLOT
|
2006-09-08 08:05:34 +00:00
|
|
|
};
|
|
|
|
|
2008-06-05 08:31:19 +00:00
|
|
|
enum untracked_status_type {
|
2008-06-05 12:22:56 +00:00
|
|
|
SHOW_NO_UNTRACKED_FILES,
|
|
|
|
SHOW_NORMAL_UNTRACKED_FILES,
|
2008-06-05 08:31:19 +00:00
|
|
|
SHOW_ALL_UNTRACKED_FILES
|
|
|
|
};
|
|
|
|
|
status: add option to show ignored files differently
Teach the status command more flexibility in how ignored files are
reported. Currently, the reporting of ignored files and untracked
files are linked. You cannot control how ignored files are reported
independently of how untracked files are reported (i.e. `all` vs
`normal`). This makes it impossible to show untracked files with the
`all` option, but show ignored files with the `normal` option.
This work 1) adds the ability to control the reporting of ignored
files independently of untracked files and 2) introduces the concept
of status reporting ignored paths that explicitly match an ignored
pattern. There are 2 benefits to these changes: 1) if a consumer needs
all untracked files but not all ignored files, there is a performance
benefit to not scanning all contents of an ignored directory and 2)
returning ignored files that explicitly match a path allow a consumer
to make more informed decisions about when a status result might be
stale.
This commit implements --ignored=matching with --untracked-files=all.
The following commit will implement --ignored=matching with
--untracked=files=normal.
As an example of where this flexibility could be useful is that our
application (Visual Studio) runs the status command and presents the
output. It shows all untracked files individually (e.g. using the
'--untracked-files==all' option), and would like to know about which
paths are ignored. It uses information about ignored paths to make
decisions about when the status result might have changed.
Additionally, many projects place build output into directories inside
a repository's working directory (e.g. in "bin/" and "obj/"
directories). Normal usage is to explicitly ignore these 2 directory
names in the .gitignore file (rather than or in addition to the *.obj
pattern).If an application could know that these directories are
explicitly ignored, it could infer that all contents are ignored as
well and make better informed decisions about files in these
directories. It could infer that any changes under these paths would
not affect the output of status. Additionally, there can be a
significant performance benefit by avoiding scanning through ignored
directories.
When status is set to report matching ignored files, it has the
following behavior. Ignored files and directories that explicitly
match an exclude pattern are reported. If an ignored directory matches
an exclude pattern, then the path of the directory is returned. If a
directory does not match an exclude pattern, but all of its contents
are ignored, then the contained files are reported instead of the
directory.
Signed-off-by: Jameson Miller <jamill@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-10-30 17:21:37 +00:00
|
|
|
enum show_ignored_type {
|
|
|
|
SHOW_NO_IGNORED,
|
|
|
|
SHOW_TRADITIONAL_IGNORED,
|
|
|
|
SHOW_MATCHING_IGNORED,
|
|
|
|
};
|
|
|
|
|
2011-02-20 04:12:29 +00:00
|
|
|
/* from where does this commit originate */
|
|
|
|
enum commit_whence {
|
|
|
|
FROM_COMMIT, /* normal */
|
|
|
|
FROM_MERGE, /* commit came from merge */
|
|
|
|
FROM_CHERRY_PICK /* commit came from cherry-pick */
|
|
|
|
};
|
|
|
|
|
2009-08-05 06:49:33 +00:00
|
|
|
struct wt_status_change_data {
|
|
|
|
int worktree_status;
|
|
|
|
int index_status;
|
|
|
|
int stagemask;
|
2016-08-11 14:45:57 +00:00
|
|
|
int mode_head, mode_index, mode_worktree;
|
|
|
|
struct object_id oid_head, oid_index;
|
2017-12-27 10:18:38 +00:00
|
|
|
int rename_status;
|
|
|
|
int rename_score;
|
|
|
|
char *rename_source;
|
2010-03-08 12:53:19 +00:00
|
|
|
unsigned dirty_submodule : 2;
|
|
|
|
unsigned new_submodule_commits : 1;
|
2009-08-05 06:49:33 +00:00
|
|
|
};
|
|
|
|
|
2016-08-05 22:00:27 +00:00
|
|
|
enum wt_status_format {
|
|
|
|
STATUS_FORMAT_NONE = 0,
|
|
|
|
STATUS_FORMAT_LONG,
|
|
|
|
STATUS_FORMAT_SHORT,
|
|
|
|
STATUS_FORMAT_PORCELAIN,
|
2016-08-11 14:45:57 +00:00
|
|
|
STATUS_FORMAT_PORCELAIN_V2,
|
2016-08-05 22:00:27 +00:00
|
|
|
|
|
|
|
STATUS_FORMAT_UNSPECIFIED
|
|
|
|
};
|
|
|
|
|
2018-09-30 14:12:45 +00:00
|
|
|
struct wt_status_state {
|
|
|
|
int merge_in_progress;
|
|
|
|
int am_in_progress;
|
|
|
|
int am_empty_patch;
|
|
|
|
int rebase_in_progress;
|
|
|
|
int rebase_interactive_in_progress;
|
|
|
|
int cherry_pick_in_progress;
|
|
|
|
int bisect_in_progress;
|
|
|
|
int revert_in_progress;
|
|
|
|
int detached_at;
|
|
|
|
char *branch;
|
|
|
|
char *onto;
|
|
|
|
char *detached_from;
|
|
|
|
struct object_id detached_oid;
|
|
|
|
struct object_id revert_head_oid;
|
|
|
|
struct object_id cherry_pick_head_oid;
|
|
|
|
};
|
|
|
|
|
2006-09-08 08:05:34 +00:00
|
|
|
struct wt_status {
|
2018-11-10 05:48:49 +00:00
|
|
|
struct repository *repo;
|
2006-09-08 08:05:34 +00:00
|
|
|
int is_initial;
|
|
|
|
char *branch;
|
|
|
|
const char *reference;
|
2013-07-14 08:35:39 +00:00
|
|
|
struct pathspec pathspec;
|
2006-09-08 08:05:34 +00:00
|
|
|
int verbose;
|
|
|
|
int amend;
|
2011-02-20 04:12:29 +00:00
|
|
|
enum commit_whence whence;
|
2007-12-13 03:09:16 +00:00
|
|
|
int nowarn;
|
2009-08-10 04:59:30 +00:00
|
|
|
int use_color;
|
2014-03-20 12:12:41 +00:00
|
|
|
int no_gettext;
|
2013-09-06 17:43:07 +00:00
|
|
|
int display_comment_prefix;
|
2009-08-10 04:59:30 +00:00
|
|
|
int relative_paths;
|
|
|
|
int submodule_summary;
|
status: add option to show ignored files differently
Teach the status command more flexibility in how ignored files are
reported. Currently, the reporting of ignored files and untracked
files are linked. You cannot control how ignored files are reported
independently of how untracked files are reported (i.e. `all` vs
`normal`). This makes it impossible to show untracked files with the
`all` option, but show ignored files with the `normal` option.
This work 1) adds the ability to control the reporting of ignored
files independently of untracked files and 2) introduces the concept
of status reporting ignored paths that explicitly match an ignored
pattern. There are 2 benefits to these changes: 1) if a consumer needs
all untracked files but not all ignored files, there is a performance
benefit to not scanning all contents of an ignored directory and 2)
returning ignored files that explicitly match a path allow a consumer
to make more informed decisions about when a status result might be
stale.
This commit implements --ignored=matching with --untracked-files=all.
The following commit will implement --ignored=matching with
--untracked=files=normal.
As an example of where this flexibility could be useful is that our
application (Visual Studio) runs the status command and presents the
output. It shows all untracked files individually (e.g. using the
'--untracked-files==all' option), and would like to know about which
paths are ignored. It uses information about ignored paths to make
decisions about when the status result might have changed.
Additionally, many projects place build output into directories inside
a repository's working directory (e.g. in "bin/" and "obj/"
directories). Normal usage is to explicitly ignore these 2 directory
names in the .gitignore file (rather than or in addition to the *.obj
pattern).If an application could know that these directories are
explicitly ignored, it could infer that all contents are ignored as
well and make better informed decisions about files in these
directories. It could infer that any changes under these paths would
not affect the output of status. Additionally, there can be a
significant performance benefit by avoiding scanning through ignored
directories.
When status is set to report matching ignored files, it has the
following behavior. Ignored files and directories that explicitly
match an exclude pattern are reported. If an ignored directory matches
an exclude pattern, then the path of the directory is returned. If a
directory does not match an exclude pattern, but all of its contents
are ignored, then the contained files are reported instead of the
directory.
Signed-off-by: Jameson Miller <jamill@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-10-30 17:21:37 +00:00
|
|
|
enum show_ignored_type show_ignored_mode;
|
2009-08-10 04:59:30 +00:00
|
|
|
enum untracked_status_type show_untracked_files;
|
2010-06-25 14:56:47 +00:00
|
|
|
const char *ignore_submodule_arg;
|
2010-11-17 23:40:05 +00:00
|
|
|
char color_palette[WT_STATUS_MAXSLOT][COLOR_MAXLEN];
|
2012-05-07 19:35:03 +00:00
|
|
|
unsigned colopts;
|
2012-05-07 19:44:44 +00:00
|
|
|
int null_termination;
|
2017-06-21 18:16:14 +00:00
|
|
|
int commit_template;
|
2012-05-07 21:09:04 +00:00
|
|
|
int show_branch;
|
2017-06-17 22:30:51 +00:00
|
|
|
int show_stash;
|
2013-09-12 10:50:05 +00:00
|
|
|
int hints;
|
2018-01-09 18:50:16 +00:00
|
|
|
enum ahead_behind_flags ahead_behind_flags;
|
2018-05-11 15:38:58 +00:00
|
|
|
int detect_rename;
|
|
|
|
int rename_score;
|
|
|
|
int rename_limit;
|
2016-08-05 22:00:27 +00:00
|
|
|
enum wt_status_format status_format;
|
2018-09-30 14:12:45 +00:00
|
|
|
struct wt_status_state state;
|
2017-03-26 16:01:25 +00:00
|
|
|
unsigned char sha1_commit[GIT_MAX_RAWSZ]; /* when not Initial */
|
2016-08-05 22:00:27 +00:00
|
|
|
|
2007-01-10 22:25:03 +00:00
|
|
|
/* These are computed during processing of the individual sections */
|
2018-09-06 00:53:27 +00:00
|
|
|
int committable;
|
2007-01-10 22:25:03 +00:00
|
|
|
int workdir_dirty;
|
2007-09-18 00:06:43 +00:00
|
|
|
const char *index_file;
|
2007-09-18 00:06:42 +00:00
|
|
|
FILE *fp;
|
2007-11-11 17:35:41 +00:00
|
|
|
const char *prefix;
|
2009-08-05 06:49:33 +00:00
|
|
|
struct string_list change;
|
2009-08-10 07:36:33 +00:00
|
|
|
struct string_list untracked;
|
2010-04-10 07:11:53 +00:00
|
|
|
struct string_list ignored;
|
2013-03-13 12:59:16 +00:00
|
|
|
uint32_t untracked_in_ms;
|
2006-09-08 08:05:34 +00:00
|
|
|
};
|
|
|
|
|
interpret-trailers: honor the cut line
If a commit message is edited with the "verbose" option, the buffer
will have a cut line and diff after the log message, like so:
my subject
# ------------------------ >8 ------------------------
# Do not touch the line above.
# Everything below will be removed.
diff --git a/foo.txt b/foo.txt
index 5716ca5..7601807 100644
--- a/foo.txt
+++ b/foo.txt
@@ -1 +1 @@
-bar
+baz
"git interpret-trailers" is unaware of the cut line, and assumes the
trailer block would be at the end of the whole thing. This can easily
be seen with:
$ GIT_EDITOR='git interpret-trailers --in-place --trailer Acked-by:me' \
git commit --amend -v
Teach "git interpret-trailers" to notice the cut-line and ignore the
remainder of the input when looking for a place to add new trailer
block. This makes it consistent with how "git commit -v -s" inserts a
new Signed-off-by: line.
This can be done by the same logic as the existing helper function,
wt_status_truncate_message_at_cut_line(), uses, but it wants the caller
to pass a strbuf to it. Because the function ignore_non_trailer() used
by the command takes a <pointer, length> pair, not a strbuf, steal the
logic from wt_status_truncate_message_at_cut_line() to create a new
wt_status_locate_end() helper function that takes <pointer, length>
pair, and make ignore_non_trailer() call it to help "interpret-trailers".
Since there is only one caller of wt_status_truncate_message_at_cut_line()
in cmd_commit(), rewrite it to call wt_status_locate_end() helper instead
and remove the old helper that no longer has any caller.
Signed-off-by: Brian Malehorn <bmalehorn@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-16 06:06:49 +00:00
|
|
|
size_t wt_status_locate_end(const char *s, size_t len);
|
2019-04-17 10:23:27 +00:00
|
|
|
void wt_status_append_cut_line(struct strbuf *buf);
|
2014-02-17 12:15:31 +00:00
|
|
|
void wt_status_add_cut_line(FILE *fp);
|
2018-11-10 05:48:49 +00:00
|
|
|
void wt_status_prepare(struct repository *r, struct wt_status *s);
|
2016-08-05 22:00:27 +00:00
|
|
|
void wt_status_print(struct wt_status *s);
|
2009-08-10 07:36:33 +00:00
|
|
|
void wt_status_collect(struct wt_status *s);
|
2018-09-30 14:12:45 +00:00
|
|
|
void wt_status_collect_free_buffers(struct wt_status *s);
|
2018-11-10 05:48:50 +00:00
|
|
|
void wt_status_get_state(struct repository *repo,
|
|
|
|
struct wt_status_state *state,
|
|
|
|
int get_detached_from);
|
2016-04-22 13:01:31 +00:00
|
|
|
int wt_status_check_rebase(const struct worktree *wt,
|
|
|
|
struct wt_status_state *state);
|
2016-04-22 13:01:34 +00:00
|
|
|
int wt_status_check_bisect(const struct worktree *wt,
|
|
|
|
struct wt_status_state *state);
|
2006-09-08 08:05:34 +00:00
|
|
|
|
2013-07-10 00:23:28 +00:00
|
|
|
__attribute__((format (printf, 3, 4)))
|
|
|
|
void status_printf_ln(struct wt_status *s, const char *color, const char *fmt, ...);
|
|
|
|
__attribute__((format (printf, 3, 4)))
|
|
|
|
void status_printf(struct wt_status *s, const char *color, const char *fmt, ...);
|
2011-02-26 05:09:41 +00:00
|
|
|
|
2016-10-07 16:08:56 +00:00
|
|
|
/* The following functions expect that the caller took care of reading the index. */
|
2018-11-10 05:48:49 +00:00
|
|
|
int has_unstaged_changes(struct repository *repo,
|
|
|
|
int ignore_submodules);
|
|
|
|
int has_uncommitted_changes(struct repository *repo,
|
|
|
|
int ignore_submodules);
|
|
|
|
int require_clean_work_tree(struct repository *repo,
|
|
|
|
const char *action,
|
|
|
|
const char *hint,
|
|
|
|
int ignore_submodules,
|
|
|
|
int gently);
|
2016-10-07 16:08:38 +00:00
|
|
|
|
2006-09-08 08:05:34 +00:00
|
|
|
#endif /* STATUS_H */
|