diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 16:15:48 +0200 | 
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 16:15:48 +0200 | 
| commit | 37a24e4e39737edaa5cdde501346a65eeb280e63 (patch) | |
| tree | ff23eb0d57edf108edd1aa3e64a8d6cf70062954 /cmd.c | |
| parent | Fix style of commit-filter links in commit-subject. (diff) | |
| parent | ui-shared.c: path-limit style nitpick (diff) | |
| download | cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.gz cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.bz2 cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.zip  | |
Merge branch 'jh/path-limit'
Conflicts:
	cgit.h
	ui-commit.c
Diffstat (limited to '')
| -rw-r--r-- | cmd.c | 46 | 
1 files changed, 23 insertions, 23 deletions
@@ -51,7 +51,7 @@ static void blob_fn(struct cgit_context *ctx)  static void commit_fn(struct cgit_context *ctx)  { -	cgit_print_commit(ctx->qry.sha1); +	cgit_print_commit(ctx->qry.sha1, ctx->qry.path);  }  static void diff_fn(struct cgit_context *ctx) @@ -90,7 +90,7 @@ static void repolist_fn(struct cgit_context *ctx)  static void patch_fn(struct cgit_context *ctx)  { -	cgit_print_patch(ctx->qry.sha1); +	cgit_print_patch(ctx->qry.sha1, ctx->qry.path);  }  static void plain_fn(struct cgit_context *ctx) @@ -129,31 +129,31 @@ static void tree_fn(struct cgit_context *ctx)  	cgit_print_tree(ctx->qry.sha1, ctx->qry.path);  } -#define def_cmd(name, want_repo, want_layout) \ -	{#name, name##_fn, want_repo, want_layout} +#define def_cmd(name, want_repo, want_layout, want_vpath) \ +	{#name, name##_fn, want_repo, want_layout, want_vpath}  struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)  {  	static struct cgit_cmd cmds[] = { -		def_cmd(HEAD, 1, 0), -		def_cmd(atom, 1, 0), -		def_cmd(about, 0, 1), -		def_cmd(blob, 1, 0), -		def_cmd(commit, 1, 1), -		def_cmd(diff, 1, 1), -		def_cmd(info, 1, 0), -		def_cmd(log, 1, 1), -		def_cmd(ls_cache, 0, 0), -		def_cmd(objects, 1, 0), -		def_cmd(patch, 1, 0), -		def_cmd(plain, 1, 0), -		def_cmd(refs, 1, 1), -		def_cmd(repolist, 0, 0), -		def_cmd(snapshot, 1, 0), -		def_cmd(stats, 1, 1), -		def_cmd(summary, 1, 1), -		def_cmd(tag, 1, 1), -		def_cmd(tree, 1, 1), +		def_cmd(HEAD, 1, 0, 0), +		def_cmd(atom, 1, 0, 0), +		def_cmd(about, 0, 1, 0), +		def_cmd(blob, 1, 0, 0), +		def_cmd(commit, 1, 1, 1), +		def_cmd(diff, 1, 1, 1), +		def_cmd(info, 1, 0, 0), +		def_cmd(log, 1, 1, 1), +		def_cmd(ls_cache, 0, 0, 0), +		def_cmd(objects, 1, 0, 0), +		def_cmd(patch, 1, 0, 1), +		def_cmd(plain, 1, 0, 0), +		def_cmd(refs, 1, 1, 0), +		def_cmd(repolist, 0, 0, 0), +		def_cmd(snapshot, 1, 0, 0), +		def_cmd(stats, 1, 1, 1), +		def_cmd(summary, 1, 1, 0), +		def_cmd(tag, 1, 1, 0), +		def_cmd(tree, 1, 1, 1),  	};  	int i;  |