30304d8156
Teach the "log" UI to behave in the same way as "git log --follow", when
given a suitable instruction by the user. The default behaviour remains
to show the log without following renames, but the follow behaviour can
be activated by following a link in the page header.
Follow is not the default because outputting merges in follow mode is
tricky ("git log --follow" will not show merges). We also disable the
graph in follow mode because the commit graph is not simplified so we
end up with frequent gaps in the graph and many lines that do not
connect with any commits we're actually showing.
We also teach the "diff" and "commit" UIs to respect the follow flag on
URLs, causing the single-file version of these UIs to detect renames.
This feature is needed only for commits that rename the path we're
interested in.
For commits before the file has been renamed (i.e. that appear later in
the log list) we change the file path in the links from the log to point
to the old name; this means that links to commits always limit by the
path known to that commit. If we didn't do this we would need to walk
down the log diff'ing every commit whenever we want to show a commit.
The drawback is that the "Log" link in the top bar of such a page links
to the log limited by the old name, so it will only show pre-rename
commits. I consider this a reasonable trade-off since the "Back" button
still works and the log matches the path displayed in the top bar.
Since following renames requires running diff on every commit we
consider, I've added a knob to the configuration file to globally
enable/disable this feature. Note that we may consider a large number
of commits the revision walking machinery no longer performs any path
limitation so we have to examine every commit until we find a page full
of commits that affect the target path or something related to it.
Suggested-by: René Neumann <necoro@necoro.eu>
Signed-off-by: John Keeping <john@keeping.me.uk>
390 sor
8.7 KiB
C
390 sor
8.7 KiB
C
#ifndef CGIT_H
|
|
#define CGIT_H
|
|
|
|
|
|
#include <git-compat-util.h>
|
|
#include <cache.h>
|
|
#include <grep.h>
|
|
#include <object.h>
|
|
#include <tree.h>
|
|
#include <commit.h>
|
|
#include <tag.h>
|
|
#include <diff.h>
|
|
#include <diffcore.h>
|
|
#include <argv-array.h>
|
|
#include <refs.h>
|
|
#include <revision.h>
|
|
#include <log-tree.h>
|
|
#include <archive.h>
|
|
#include <string-list.h>
|
|
#include <xdiff-interface.h>
|
|
#include <xdiff/xdiff.h>
|
|
#include <utf8.h>
|
|
#include <notes.h>
|
|
#include <graph.h>
|
|
|
|
|
|
/*
|
|
* Dateformats used on misc. pages
|
|
*/
|
|
#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)"
|
|
#define FMT_SHORTDATE "%Y-%m-%d"
|
|
#define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ"
|
|
|
|
|
|
/*
|
|
* Limits used for relative dates
|
|
*/
|
|
#define TM_MIN 60
|
|
#define TM_HOUR (TM_MIN * 60)
|
|
#define TM_DAY (TM_HOUR * 24)
|
|
#define TM_WEEK (TM_DAY * 7)
|
|
#define TM_YEAR (TM_DAY * 365)
|
|
#define TM_MONTH (TM_YEAR / 12.0)
|
|
|
|
|
|
/*
|
|
* Default encoding
|
|
*/
|
|
#define PAGE_ENCODING "UTF-8"
|
|
|
|
typedef void (*configfn)(const char *name, const char *value);
|
|
typedef void (*filepair_fn)(struct diff_filepair *pair);
|
|
typedef void (*linediff_fn)(char *line, int len);
|
|
|
|
typedef enum {
|
|
DIFF_UNIFIED, DIFF_SSDIFF, DIFF_STATONLY
|
|
} diff_type;
|
|
|
|
typedef enum {
|
|
ABOUT, COMMIT, SOURCE, EMAIL, AUTH, OWNER
|
|
} filter_type;
|
|
|
|
struct cgit_filter {
|
|
int (*open)(struct cgit_filter *, va_list ap);
|
|
int (*close)(struct cgit_filter *);
|
|
void (*fprintf)(struct cgit_filter *, FILE *, const char *prefix);
|
|
void (*cleanup)(struct cgit_filter *);
|
|
int argument_count;
|
|
};
|
|
|
|
struct cgit_exec_filter {
|
|
struct cgit_filter base;
|
|
char *cmd;
|
|
char **argv;
|
|
int old_stdout;
|
|
int pipe_fh[2];
|
|
int pid;
|
|
};
|
|
|
|
struct cgit_repo {
|
|
char *url;
|
|
char *name;
|
|
char *path;
|
|
char *desc;
|
|
char *owner;
|
|
char *defbranch;
|
|
char *module_link;
|
|
struct string_list readme;
|
|
char *section;
|
|
char *clone_url;
|
|
char *logo;
|
|
char *logo_link;
|
|
int snapshots;
|
|
int enable_commit_graph;
|
|
int enable_log_filecount;
|
|
int enable_log_linecount;
|
|
int enable_remote_branches;
|
|
int enable_subject_links;
|
|
int max_stats;
|
|
int branch_sort;
|
|
int commit_sort;
|
|
time_t mtime;
|
|
struct cgit_filter *about_filter;
|
|
struct cgit_filter *commit_filter;
|
|
struct cgit_filter *source_filter;
|
|
struct cgit_filter *email_filter;
|
|
struct cgit_filter *owner_filter;
|
|
struct string_list submodules;
|
|
int hide;
|
|
int ignore;
|
|
};
|
|
|
|
typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,
|
|
const char *value);
|
|
|
|
struct cgit_repolist {
|
|
int length;
|
|
int count;
|
|
struct cgit_repo *repos;
|
|
};
|
|
|
|
struct commitinfo {
|
|
struct commit *commit;
|
|
char *author;
|
|
char *author_email;
|
|
unsigned long author_date;
|
|
char *committer;
|
|
char *committer_email;
|
|
unsigned long committer_date;
|
|
char *subject;
|
|
char *msg;
|
|
char *msg_encoding;
|
|
};
|
|
|
|
struct taginfo {
|
|
char *tagger;
|
|
char *tagger_email;
|
|
unsigned long tagger_date;
|
|
char *msg;
|
|
};
|
|
|
|
struct refinfo {
|
|
const char *refname;
|
|
struct object *object;
|
|
union {
|
|
struct taginfo *tag;
|
|
struct commitinfo *commit;
|
|
};
|
|
};
|
|
|
|
struct reflist {
|
|
struct refinfo **refs;
|
|
int alloc;
|
|
int count;
|
|
};
|
|
|
|
struct cgit_query {
|
|
int has_symref;
|
|
int has_sha1;
|
|
int has_difftype;
|
|
char *raw;
|
|
char *repo;
|
|
char *page;
|
|
char *search;
|
|
char *grep;
|
|
char *head;
|
|
char *sha1;
|
|
char *sha2;
|
|
char *path;
|
|
char *name;
|
|
char *mimetype;
|
|
char *url;
|
|
char *period;
|
|
int ofs;
|
|
int nohead;
|
|
char *sort;
|
|
int showmsg;
|
|
diff_type difftype;
|
|
int show_all;
|
|
int context;
|
|
int ignorews;
|
|
int follow;
|
|
char *vpath;
|
|
};
|
|
|
|
struct cgit_config {
|
|
char *agefile;
|
|
char *cache_root;
|
|
char *clone_prefix;
|
|
char *clone_url;
|
|
char *css;
|
|
char *favicon;
|
|
char *footer;
|
|
char *head_include;
|
|
char *header;
|
|
char *index_header;
|
|
char *index_info;
|
|
char *logo;
|
|
char *logo_link;
|
|
char *mimetype_file;
|
|
char *module_link;
|
|
char *project_list;
|
|
struct string_list readme;
|
|
char *robots;
|
|
char *root_title;
|
|
char *root_desc;
|
|
char *root_readme;
|
|
char *script_name;
|
|
char *section;
|
|
char *repository_sort;
|
|
char *virtual_root; /* Always ends with '/'. */
|
|
char *strict_export;
|
|
int cache_size;
|
|
int cache_dynamic_ttl;
|
|
int cache_max_create_time;
|
|
int cache_repo_ttl;
|
|
int cache_root_ttl;
|
|
int cache_scanrc_ttl;
|
|
int cache_static_ttl;
|
|
int cache_about_ttl;
|
|
int cache_snapshot_ttl;
|
|
int case_sensitive_sort;
|
|
int embedded;
|
|
int enable_filter_overrides;
|
|
int enable_follow_links;
|
|
int enable_http_clone;
|
|
int enable_index_links;
|
|
int enable_index_owner;
|
|
int enable_commit_graph;
|
|
int enable_log_filecount;
|
|
int enable_log_linecount;
|
|
int enable_remote_branches;
|
|
int enable_subject_links;
|
|
int enable_tree_linenumbers;
|
|
int enable_git_config;
|
|
int local_time;
|
|
int max_atom_items;
|
|
int max_repo_count;
|
|
int max_commit_count;
|
|
int max_lock_attempts;
|
|
int max_msg_len;
|
|
int max_repodesc_len;
|
|
int max_blob_size;
|
|
int max_stats;
|
|
int nocache;
|
|
int noplainemail;
|
|
int noheader;
|
|
int renamelimit;
|
|
int remove_suffix;
|
|
int scan_hidden_path;
|
|
int section_from_path;
|
|
int snapshots;
|
|
int section_sort;
|
|
int summary_branches;
|
|
int summary_log;
|
|
int summary_tags;
|
|
diff_type difftype;
|
|
int branch_sort;
|
|
int commit_sort;
|
|
struct string_list mimetypes;
|
|
struct cgit_filter *about_filter;
|
|
struct cgit_filter *commit_filter;
|
|
struct cgit_filter *source_filter;
|
|
struct cgit_filter *email_filter;
|
|
struct cgit_filter *owner_filter;
|
|
struct cgit_filter *auth_filter;
|
|
};
|
|
|
|
struct cgit_page {
|
|
time_t modified;
|
|
time_t expires;
|
|
size_t size;
|
|
const char *mimetype;
|
|
const char *charset;
|
|
const char *filename;
|
|
const char *etag;
|
|
const char *title;
|
|
int status;
|
|
const char *statusmsg;
|
|
};
|
|
|
|
struct cgit_environment {
|
|
const char *cgit_config;
|
|
const char *http_host;
|
|
const char *https;
|
|
const char *no_http;
|
|
const char *path_info;
|
|
const char *query_string;
|
|
const char *request_method;
|
|
const char *script_name;
|
|
const char *server_name;
|
|
const char *server_port;
|
|
const char *http_cookie;
|
|
const char *http_referer;
|
|
unsigned int content_length;
|
|
int authenticated;
|
|
};
|
|
|
|
struct cgit_context {
|
|
struct cgit_environment env;
|
|
struct cgit_query qry;
|
|
struct cgit_config cfg;
|
|
struct cgit_repo *repo;
|
|
struct cgit_page page;
|
|
};
|
|
|
|
typedef int (*write_archive_fn_t)(const char *, const char *);
|
|
|
|
struct cgit_snapshot_format {
|
|
const char *suffix;
|
|
const char *mimetype;
|
|
write_archive_fn_t write_func;
|
|
int bit;
|
|
};
|
|
|
|
extern const char *cgit_version;
|
|
|
|
extern struct cgit_repolist cgit_repolist;
|
|
extern struct cgit_context ctx;
|
|
extern const struct cgit_snapshot_format cgit_snapshot_formats[];
|
|
|
|
extern char *cgit_default_repo_desc;
|
|
extern struct cgit_repo *cgit_add_repo(const char *url);
|
|
extern struct cgit_repo *cgit_get_repoinfo(const char *url);
|
|
extern void cgit_repo_config_cb(const char *name, const char *value);
|
|
|
|
extern int chk_zero(int result, char *msg);
|
|
extern int chk_positive(int result, char *msg);
|
|
extern int chk_non_negative(int result, char *msg);
|
|
|
|
extern char *trim_end(const char *str, char c);
|
|
extern char *ensure_end(const char *str, char c);
|
|
extern char *strlpart(char *txt, int maxlen);
|
|
extern char *strrpart(char *txt, int maxlen);
|
|
|
|
extern void strbuf_ensure_end(struct strbuf *sb, char c);
|
|
|
|
extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
|
|
extern void cgit_free_reflist_inner(struct reflist *list);
|
|
extern int cgit_refs_cb(const char *refname, const struct object_id *oid,
|
|
int flags, void *cb_data);
|
|
|
|
extern void *cgit_free_commitinfo(struct commitinfo *info);
|
|
|
|
void cgit_diff_tree_cb(struct diff_queue_struct *q,
|
|
struct diff_options *options, void *data);
|
|
|
|
extern int cgit_diff_files(const unsigned char *old_sha1,
|
|
const unsigned char *new_sha1,
|
|
unsigned long *old_size, unsigned long *new_size,
|
|
int *binary, int context, int ignorews,
|
|
linediff_fn fn);
|
|
|
|
extern void cgit_diff_tree(const unsigned char *old_sha1,
|
|
const unsigned char *new_sha1,
|
|
filepair_fn fn, const char *prefix, int ignorews);
|
|
|
|
extern void cgit_diff_commit(struct commit *commit, filepair_fn fn,
|
|
const char *prefix);
|
|
|
|
__attribute__((format (printf,1,2)))
|
|
extern char *fmt(const char *format,...);
|
|
|
|
__attribute__((format (printf,1,2)))
|
|
extern char *fmtalloc(const char *format,...);
|
|
|
|
extern struct commitinfo *cgit_parse_commit(struct commit *commit);
|
|
extern struct taginfo *cgit_parse_tag(struct tag *tag);
|
|
extern void cgit_parse_url(const char *url);
|
|
|
|
extern const char *cgit_repobasename(const char *reponame);
|
|
|
|
extern int cgit_parse_snapshots_mask(const char *str);
|
|
|
|
extern int cgit_open_filter(struct cgit_filter *filter, ...);
|
|
extern int cgit_close_filter(struct cgit_filter *filter);
|
|
extern void cgit_fprintf_filter(struct cgit_filter *filter, FILE *f, const char *prefix);
|
|
extern void cgit_exec_filter_init(struct cgit_exec_filter *filter, char *cmd, char **argv);
|
|
extern struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype);
|
|
extern void cgit_cleanup_filters(void);
|
|
extern void cgit_init_filters(void);
|
|
|
|
extern void cgit_prepare_repo_env(struct cgit_repo * repo);
|
|
|
|
extern int readfile(const char *path, char **buf, size_t *size);
|
|
|
|
extern char *expand_macros(const char *txt);
|
|
|
|
#endif /* CGIT_H */
|