commit 119bf4ed2468c843d715e157d9e233282253f16d from: Tracey Emery date: Wed Jan 15 22:10:31 2020 UTC blame css commit - 2e676fc58edb32cc6d77979ca7f7f7a253bd03f4 commit + 119bf4ed2468c843d715e157d9e233282253f16d blob - 07895374f3a60def01d080e35d800e01125ae793 blob + eecd321da5ab5335eee50eef2c98ad64e4a941c2 --- .gitignore +++ .gitignore @@ -1,3 +1 @@ **/obj -libexec/** -gotweb/** blob - 36e91d38a462f406fa51d2311ffd2601ef72ded1 blob + 92bb0fe0dfb2d9c4a0c0a77e31b6e0b719a28fbf --- Makefile.inc +++ Makefile.inc @@ -1,5 +1,5 @@ CPPFLAGS += -DGOT_LIBEXECDIR=${LIBEXECDIR} -DGOT_VERSION=${GOT_VERSION} -#CFLAGS += -Werror -Wall -Wstrict-prototypes -Wunused-variable +CFLAGS += -Werror -Wall -Wstrict-prototypes -Wunused-variable #CFLAGS += -DGOT_PACK_NO_MMAP #CFLAGS += -DGOT_NO_OBJ_CACHE #CFLAGS += -DGOT_OBJ_CACHE_DEBUG blob - 3886de76a12769233bfc3613dada6faeb26425cd blob + b78b527080051a7069ad50a643490667f4c6e85b --- gotweb/files/htdocs/gotweb/gotweb.css +++ gotweb/files/htdocs/gotweb/gotweb.css @@ -577,20 +577,38 @@ body { padding: 20px; font-family: monospace; white-space: pre; + overflow: auto; } #blame_wrapper { clear: left; float: left; width: 100%; } -#blame_id { +#blame_number { float: left; - padding: 2px; + width: 3em; + overflow: hidden; } -#blame { - float:left ; - padding: 2px; +#blame_hash { + float: left; + width: 6em; + overflow: auto; +} +#blame_date { + float: left; + width: 7em; + overflow: auto; } +#blame_author { + float: left; + width: 6em; + overflow: hidden; +} +#blame_code { + float:left; + width: 50%; + overflow: visible; +} /* tree.tmpl */ blob - 3fb7a261e289cdd221f1b2035e46140be60f72ba blob + b48c564d711082196e6cfe4e6a4bdb88ac4052fc --- gotweb/gotweb.c +++ gotweb/gotweb.c @@ -202,16 +202,12 @@ static const struct got_error* match_logmsg(int *, st struct got_commit_object *, regex_t *); static const struct got_error* gw_blame(struct trans *); -static const struct got_error* gw_blob(struct trans *); -static const struct got_error* gw_blobdiff(struct trans *); static const struct got_error* gw_commit(struct trans *); static const struct got_error* gw_commitdiff(struct trans *); -static const struct got_error* gw_history(struct trans *); static const struct got_error* gw_index(struct trans *); static const struct got_error* gw_log(struct trans *); static const struct got_error* gw_raw(struct trans *); static const struct got_error* gw_logbriefs(struct trans *); -static const struct got_error* gw_snapshot(struct trans *); static const struct got_error* gw_summary(struct trans *); static const struct got_error* gw_tag(struct trans *); static const struct got_error* gw_tree(struct trans *); @@ -225,17 +221,13 @@ struct gw_query_action { enum gw_query_actions { GW_BLAME, - GW_BLOB, - GW_BLOBDIFF, GW_COMMIT, GW_COMMITDIFF, GW_ERR, - GW_HISTORY, GW_INDEX, GW_LOG, GW_RAW, GW_LOGBRIEFS, - GW_SNAPSHOT, GW_SUMMARY, GW_TAG, GW_TREE, @@ -243,17 +235,13 @@ enum gw_query_actions { static struct gw_query_action gw_query_funcs[] = { { GW_BLAME, "blame", gw_blame, "gw_tmpl/index.tmpl" }, - { GW_BLOB, "blob", gw_blob, "gw_tmpl/index.tmpl" }, - { GW_BLOBDIFF, "blobdiff", gw_blobdiff, "gw_tmpl/index.tmpl" }, { GW_COMMIT, "commit", gw_commit, "gw_tmpl/index.tmpl" }, { GW_COMMITDIFF, "commitdiff", gw_commitdiff, "gw_tmpl/index.tmpl" }, { GW_ERR, NULL, NULL, "gw_tmpl/index.tmpl" }, - { GW_HISTORY, "history", gw_history, "gw_tmpl/index.tmpl" }, { GW_INDEX, "index", gw_index, "gw_tmpl/index.tmpl" }, { GW_LOG, "log", gw_log, "gw_tmpl/index.tmpl" }, { GW_RAW, "raw", gw_raw, "gw_tmpl/index.tmpl" }, { GW_LOGBRIEFS, "logbriefs", gw_logbriefs, "gw_tmpl/index.tmpl" }, - { GW_SNAPSHOT, "snapshot", gw_snapshot, "gw_tmpl/index.tmpl" }, { GW_SUMMARY, "summary", gw_summary, "gw_tmpl/index.tmpl" }, { GW_TAG, "tag", gw_tag, "gw_tmpl/index.tmpl" }, { GW_TREE, "tree", gw_tree, "gw_tmpl/index.tmpl" }, @@ -584,22 +572,6 @@ gw_blame(struct trans *gw_trans) free(log_html); free(log); } - return error; -} - -static const struct got_error * -gw_blob(struct trans *gw_trans) -{ - const struct got_error *error = NULL; - - return error; -} - -static const struct got_error * -gw_blobdiff(struct trans *gw_trans) -{ - const struct got_error *error = NULL; - return error; } @@ -648,14 +620,6 @@ gw_commitdiff(struct trans *gw_trans) } static const struct got_error * -gw_history(struct trans *gw_trans) -{ - const struct got_error *error = NULL; - - return error; -} - -static const struct got_error * gw_index(struct trans *gw_trans) { const struct got_error *error = NULL; @@ -799,14 +763,6 @@ gw_logbriefs(struct trans *gw_trans) free(log_html); free(log); } - return error; -} - -static const struct got_error * -gw_snapshot(struct trans *gw_trans) -{ - const struct got_error *error = NULL; - return error; } @@ -2441,9 +2397,9 @@ gw_get_file_blame(struct trans *gw_trans, char *commit struct got_object_id *commit_id = NULL; struct got_blob_object *blob = NULL; char *blame_html = NULL, *path = NULL, *in_repo_path = NULL, - *blame_row = NULL, *id_str, *folder = NULL; + *folder = NULL; struct blame_cb_args bca; - int nentries, i, obj_type; + int i, obj_type; size_t filesize; error = got_repo_open(&repo, gw_trans->repo_path, NULL); blob - d598d707d14357bb26b7fa3e9fba9da1ab3d7e17 blob + 15583f4aab01f67ca646c83fe31fb9e51b055923 --- gotweb/gotweb_ui.h +++ gotweb/gotweb_ui.h @@ -247,11 +247,11 @@ char *log_blame_navs = char *log_blame_line = "
" \ - "
%.*d
" \ - "
%.8s
" \ - "
%s
" \ - "
%-8s
" \ - "
%s
" \ + "
%.*d
" \ + "
%.8s
" \ + "
%s
" \ + "
%-8s
" \ + "
%s
" \ "
"; /* tree.tmpl */