diff options
| author | Ragnar Ouchterlony | 2009-09-14 20:19:02 +0200 |
|---|---|---|
| committer | Lars Hjemli | 2009-09-16 20:17:56 +0200 |
| commit | c358aa3dfebf4fc1f3005dd960aa5c1c020eed76 (patch) | |
| tree | 475fa421d673b270c7d1bde872b96425abfafce8 /cgit.c | |
| parent | 40e174d5364910750413d94b5417e57d108190ef (diff) | |
| download | cgit-c358aa3dfebf4fc1f3005dd960aa5c1c020eed76.tar.gz cgit-c358aa3dfebf4fc1f3005dd960aa5c1c020eed76.tar.bz2 cgit-c358aa3dfebf4fc1f3005dd960aa5c1c020eed76.zip | |
Add possibility to switch between unidiff and side-by-side-diff.
A new config option side-by-side-diffs added, defaulting to 0,
meaning unidiff. Also a query option (ss) is used toggle this.
In the commit page you can switch between the two diff formats by
clicking on the link on the "commit"-row, to the right of (patch).
In the diff page you can switch by using the link at the start
of the page.
All commit-links and diff-links will remember the choice.
Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'cgit.c')
| -rw-r--r-- | cgit.c | 5 |
1 files changed, 5 insertions, 0 deletions
| @@ -182,6 +182,8 @@ void config_cb(const char *name, const char *value) | |||
| 182 | ctx.cfg.summary_branches = atoi(value); | 182 | ctx.cfg.summary_branches = atoi(value); |
| 183 | else if (!strcmp(name, "summary-tags")) | 183 | else if (!strcmp(name, "summary-tags")) |
| 184 | ctx.cfg.summary_tags = atoi(value); | 184 | ctx.cfg.summary_tags = atoi(value); |
| 185 | else if (!strcmp(name, "side-by-side-diffs")) | ||
| 186 | ctx.cfg.ssdiff = atoi(value); | ||
| 185 | else if (!strcmp(name, "agefile")) | 187 | else if (!strcmp(name, "agefile")) |
| 186 | ctx.cfg.agefile = xstrdup(value); | 188 | ctx.cfg.agefile = xstrdup(value); |
| 187 | else if (!strcmp(name, "renamelimit")) | 189 | else if (!strcmp(name, "renamelimit")) |
| @@ -238,6 +240,8 @@ static void querystring_cb(const char *name, const char *value) | |||
| 238 | ctx.qry.showmsg = atoi(value); | 240 | ctx.qry.showmsg = atoi(value); |
| 239 | } else if (!strcmp(name, "period")) { | 241 | } else if (!strcmp(name, "period")) { |
| 240 | ctx.qry.period = xstrdup(value); | 242 | ctx.qry.period = xstrdup(value); |
| 243 | } else if (!strcmp(name, "ss")) { | ||
| 244 | ctx.qry.ssdiff = atoi(value); | ||
| 241 | } | 245 | } |
| 242 | } | 246 | } |
| 243 | 247 | ||
| @@ -279,6 +283,7 @@ static void prepare_context(struct cgit_context *ctx) | |||
| 279 | ctx->cfg.summary_branches = 10; | 283 | ctx->cfg.summary_branches = 10; |
| 280 | ctx->cfg.summary_log = 10; | 284 | ctx->cfg.summary_log = 10; |
| 281 | ctx->cfg.summary_tags = 10; | 285 | ctx->cfg.summary_tags = 10; |
| 286 | ctx->cfg.ssdiff = 0; | ||
| 282 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); | 287 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
| 283 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); | 288 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
| 284 | ctx->env.https = xstrdupn(getenv("HTTPS")); | 289 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
