Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Difference From 0.7 To 0.6
2022-01-08 13:33 | Bump version number: 0.8 (check-in: 9918bb8dab user: mark tags: trunk) | |
2022-01-08 13:30 | CHANGES for 0.7 (check-in: 2c45034580 user: mark tags: trunk, 0.7) | |
2022-01-08 13:10 | Bump year in license headers (check-in: 277b68b64f user: mark tags: trunk) | |
2021-11-21 15:32 | Bump version number: 0.7 (check-in: f3d6c2ff7b user: mark tags: trunk) | |
2021-11-21 15:28 | CHANGES for 0.6 (check-in: bbf8590008 user: mark tags: trunk, 0.6) | |
2021-11-21 14:40 | Add user-defined colour support to the branch view. (check-in: 3d1f3389a3 user: mark tags: trunk) | |
Changes to CHANGES.md.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 1 2 3 4 5 6 7 | **fnc 0.6** 2021-11-22 - implement support for user-defined colours in tl, diff, tree and blame views - make branch view accessible from all other views - optimise colour scheme initialisation - implement new 'fnc config' interface to configure per-project settings - improve build by making make file make(1) compatible |
︙ | ︙ |
Changes to GNUmakefile.
1 | # | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 | # # FNC Makefile # # CONFIGUGRAION CC ?= cc PREFIX ?= /usr/local MANDIR ?= /share/man VERSION ?= 0.6 # USED BELOW FOR PLATFORM SPECIFIC LDFLAGS UNAME := $(shell uname -s) # FLAGS NEEDED TO BUILD SQLITE3 SQLITE_CFLAGS = ${CFLAGS} -Wall -Werror -Wno-sign-compare -pedantic -std=c99 \ -DNDEBUG=1 \ -DSQLITE_DQS=0 \ -DSQLITE_THREADSAFE=0 \ -DSQLITE_DEFAULT_MEMSTATUS=0 \ -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 \ -DSQLITE_LIKE_DOESNT_MATCH_BLOBS \ -DSQLITE_OMIT_DECLTYPE \ -DSQLITE_OMIT_PROGRESS_CALLBACK \ -DSQLITE_OMIT_SHARED_CACHE \ -DSQLITE_OMIT_LOAD_EXTENSION \ -DSQLITE_MAX_EXPR_DEPTH=0 \ -DSQLITE_USE_ALLOCA \ -DSQLITE_ENABLE_LOCKING_STYLE=0 \ -DSQLITE_DEFAULT_FILE_FORMAT=4 \ -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ -DSQLITE_ENABLE_FTS4 \ -DSQLITE_ENABLE_DBSTAT_VTAB \ -DSQLITE_ENABLE_JSON1 \ -DSQLITE_ENABLE_FTS5 \ -DSQLITE_ENABLE_STMTVTAB \ -DSQLITE_HAVE_ZLIB \ -DSQLITE_INTROSPECTION_PRAGMAS \ -DSQLITE_ENABLE_DBPAGE_VTAB \ -DSQLITE_TRUSTED_SCHEMA=0 # This makefile MAKEFILE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) # FLAGS NEEDED TO BUILD LIBFOSSIL FOSSIL_CFLAGS = ${CFLAGS} -Wall -Werror -Wsign-compare -pedantic -std=c99 # On SOME Linux (e.g., Ubuntu 18.04.6), we have to include wchar curses from # I/.../ncursesw, but linking to -lncursesw (w/ no special -L path) works fine. # FLAGS NEEDED TO BUILD FNC FNC_CFLAGS = ${CFLAGS} -Wall -Werror -Wsign-compare -pedantic -std=c99 \ -I./lib -I./include -I/usr/include/ncursesw \ -D_XOPEN_SOURCE_EXTENDED -DVERSION=${VERSION} FNC_LDFLAGS = ${LDFLAGS} -lm -lutil -lz -lpthread -fPIC # OSX has ncursesw, and needs iconv. ifeq ($(UNAME),Darwin) # OSX FNC_LDFLAGS += -lncurses -lpanel -liconv else # Linux (tested on Debian), OpenBSD, FreeBSD FNC_LDFLAGS += -lncursesw -lpanelw endif all: bin bin: lib/sqlite3.o lib/libfossil.o src/fnc.o src/fnc lib/sqlite3.o: lib/sqlite3.c lib/sqlite3.h $(MAKEFILE) ${CC} ${SQLITE_CFLAGS} -c $< -o $@ lib/libfossil.o: lib/libfossil.c lib/libfossil.h $(MAKEFILE) ${CC} ${FOSSIL_CFLAGS} -c $< -o $@ src/fnc.o: src/fnc.c include/settings.h $(MAKEFILE) ${CC} ${FNC_CFLAGS} -c $< -o $@ src/fnc: src/fnc.o lib/libfossil.o lib/sqlite3.o $(MAKEFILE) ${CC} -o $@ src/fnc.o lib/libfossil.o lib/sqlite3.o ${FNC_LDFLAGS} install: install -s -m 0755 src/fnc ${PREFIX}/bin/fnc install -m 0644 src/fnc.1 ${PREFIX}${MANDIR}/man1/fnc.1 uninstall: rm -f ${PREFIX}/bin/fnc ${PREFIX}${MANDIR}/man1/fnc.1 clean: rm -f lib/*.o src/*.o src/fnc release: clean tar czvf ../fnc-${VERSION}.tgz -C .. fnc-${VERSION} .PHONY: clean release |
Changes to LICENSE.
|
| | | 1 2 3 4 5 6 7 8 9 10 11 12 13 | Copyright (c) 2021 Mark Jamsek <mark@jamsek.com> Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
Changes to Makefile.
1 2 3 4 | # # FNC Makefile # | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | # # FNC Makefile # # CONFIGUGRAION CC ?= cc PREFIX ?= /usr/local MANDIR ?= /share/man VERSION ?= 0.6 # USED BELOW FOR PLATFORM SPECIFIC LDFLAGS UNAME != uname -s # FLAGS NEEDED TO BUILD SQLITE3 SQLITE_CFLAGS = ${CFLAGS} -Wall -Werror -Wno-sign-compare -pedantic -std=c99 \ -DNDEBUG=1 \ -DSQLITE_DQS=0 \ -DSQLITE_THREADSAFE=0 \ -DSQLITE_DEFAULT_MEMSTATUS=0 \ -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 \ -DSQLITE_LIKE_DOESNT_MATCH_BLOBS \ -DSQLITE_OMIT_DECLTYPE \ -DSQLITE_OMIT_PROGRESS_CALLBACK \ -DSQLITE_OMIT_SHARED_CACHE \ -DSQLITE_OMIT_LOAD_EXTENSION \ -DSQLITE_MAX_EXPR_DEPTH=0 \ -DSQLITE_USE_ALLOCA \ -DSQLITE_ENABLE_LOCKING_STYLE=0 \ -DSQLITE_DEFAULT_FILE_FORMAT=4 \ -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ -DSQLITE_ENABLE_FTS4 \ -DSQLITE_ENABLE_DBSTAT_VTAB \ -DSQLITE_ENABLE_JSON1 \ -DSQLITE_ENABLE_FTS5 \ -DSQLITE_ENABLE_STMTVTAB \ -DSQLITE_HAVE_ZLIB \ -DSQLITE_INTROSPECTION_PRAGMAS \ -DSQLITE_ENABLE_DBPAGE_VTAB \ -DSQLITE_TRUSTED_SCHEMA=0 # FLAGS NEEDED TO BUILD LIBFOSSIL FOSSIL_CFLAGS = ${CFLAGS} -Wall -Werror -Wsign-compare -pedantic -std=c99 # On SOME Linux (e.g., Ubuntu 18.04.6), we have to include wchar curses from # I/.../ncursesw, but linking to -lncursesw (w/ no special -L path) works fine. # FLAGS NEEDED TO BUILD FNC FNC_CFLAGS = ${CFLAGS} -Wall -Werror -Wsign-compare -pedantic -std=c99 \ -I./lib -I./include -I/usr/include/ncursesw \ -D_XOPEN_SOURCE_EXTENDED -DVERSION=${VERSION} FNC_LDFLAGS = ${LDFLAGS} -lm -lutil -lz -lpthread -fPIC # OSX has ncursesw, and needs iconv. .if $(UNAME) == Darwin # OSX FNC_LDFLAGS += -lncurses -lpanel -liconv .else # Linux (tested on Debian), OpenBSD, FreeBSD FNC_LDFLAGS += -lncursesw -lpanelw .endif all: bin bin: lib/sqlite3.o lib/libfossil.o src/fnc.o src/fnc lib/sqlite3.o: lib/sqlite3.c lib/sqlite3.h ${CC} ${SQLITE_CFLAGS} -c $< -o $@ lib/libfossil.o: lib/libfossil.c lib/libfossil.h ${CC} ${FOSSIL_CFLAGS} -c $< -o $@ src/fnc.o: src/fnc.c include/settings.h ${CC} ${FNC_CFLAGS} -c $< -o $@ src/fnc: src/fnc.o lib/libfossil.o lib/sqlite3.o Makefile ${CC} -o $@ src/fnc.o lib/libfossil.o lib/sqlite3.o ${FNC_LDFLAGS} install: install -s -m 0755 src/fnc ${PREFIX}/bin/fnc install -m 0644 src/fnc.1 ${PREFIX}${MANDIR}/man1/fnc.1 uninstall: rm -f ${PREFIX}/bin/fnc ${PREFIX}${MANDIR}/man1/fnc.1 clean: rm -f lib/*.o src/*.o src/fnc release: clean tar czvf ../fnc-${VERSION}.tgz -C .. fnc-${VERSION} .PHONY: clean release |
Changes to README.md.
1 2 | # README | | | 1 2 3 4 5 6 7 8 9 10 | # README # fnc 0.5 ## An ncurses browser for [Fossil][0] repositories in the terminal. `fnc` uses [libfossil][1] to create a [`fossil ui`][2] experience in the terminal. Tested and confirmed to run on the following amd64 systems (additional platforms |
︙ | ︙ | |||
79 80 81 82 83 84 85 | ![diff removed file](https://fnc.bsdbox.org/uv/resources/img/fnc-diff-split-file-removed.png "fnc diff file removed") ![blame split screen](https://fnc.bsdbox.org/uv/resources/img/fnc-blame-splitscreen.png "fnc blame split screen") ![tree split screen](https://fnc.bsdbox.org/uv/resources/img/fnc-tree-splitscreen.png "fnc tree split screen") ![branch split screen](https://fnc.bsdbox.org/uv/resources/img/fnc-branch-splitscreen.png "fnc branch split screen") ![in-app help](https://fnc.bsdbox.org/uv/resources/img/fnc-inapp_help.png "fnc in-app help") ![timeline help](https://fnc.bsdbox.org/uv/resources/img/fnc-timeline-help.png "fnc timeline help") | < < < < < < < < < < | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | ![diff removed file](https://fnc.bsdbox.org/uv/resources/img/fnc-diff-split-file-removed.png "fnc diff file removed") ![blame split screen](https://fnc.bsdbox.org/uv/resources/img/fnc-blame-splitscreen.png "fnc blame split screen") ![tree split screen](https://fnc.bsdbox.org/uv/resources/img/fnc-tree-splitscreen.png "fnc tree split screen") ![branch split screen](https://fnc.bsdbox.org/uv/resources/img/fnc-branch-splitscreen.png "fnc branch split screen") ![in-app help](https://fnc.bsdbox.org/uv/resources/img/fnc-inapp_help.png "fnc in-app help") ![timeline help](https://fnc.bsdbox.org/uv/resources/img/fnc-timeline-help.png "fnc timeline help") [0]: https://fossil-scm.org [1]: https://fossil.wanderinghorse.net/r/libfossil [2]: https://fossil-scm.org/home/help?cmd=ui [3]: https://fnc.bsdbox.org/uv/download.html [4]: https://fnc.bsdbox.org/uv/resources/doc/fnc.1.html [5]: https://fnc.bsdbox.org/uv/resources/img/fnc-timeline-fullscreen.png [6]: https://itac.bsdbox.org/fnc-demo.mp4 |
︙ | ︙ |
Deleted fnc.bld.mk.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Changes to include/settings.h.
︙ | ︙ | |||
10 11 12 13 14 15 16 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ | < < < < < < < < | > > > > | | | | | | | | | | | | | | | | | < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < > > | < < < | | < | < < < < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /* * All configurable fnc settings, which can be stored in either the fossil(1) * repository (e.g., repo.fossil) or global (i.e., $HOME/.fossil) db. Note that * each setting _MAY_ be mapped to a valid enum, in which case its index here * _MUST_ be mapped to the index/value of its enum counterpart (i.e., either * explicitly set equivalent values in the enum, or use offsets when indexing * them). */ #define SETTINGS(SET) \ SET(FNC_START_SETTINGS) /* 0 */ \ SET(FNC_COLOUR_COMMIT) /* 1 */ \ SET(FNC_COLOUR_USER) /* 2 */ \ SET(FNC_COLOUR_DATE) /* 3 */ \ SET(FNC_COLOUR_DIFF_META) /* 4 */ \ SET(FNC_COLOUR_DIFF_MINUS) /* 5 */ \ SET(FNC_COLOUR_DIFF_PLUS) /* 6 */ \ SET(FNC_COLOUR_DIFF_CHUNK) /* 7 */ \ SET(FNC_COLOUR_DIFF_TAGS) /* 8 */ \ SET(FNC_COLOUR_TREE_LINK) /* 9 */ \ SET(FNC_COLOUR_TREE_DIR) /* 10 */ \ SET(FNC_COLOUR_TREE_EXEC) /* 11 */ \ SET(FNC_COLOUR_BRANCH_OPEN) /* 12 */ \ SET(FNC_COLOUR_BRANCH_CLOSED) /* 13 */ \ SET(FNC_COLOUR_BRANCH_CURRENT) /* 14 */ \ SET(FNC_COLOUR_BRANCH_PRIVATE) /* 15 */ \ SET(FNC_EOF_SETTINGS) /* 16 */ /* * To construct the string array and enum: * static const char *fnc_settings[] = { SETTINGS(GEN_STR) }; * enum settings { SETTINGS(GEN_ENUM) }; */ #define GEN_ENUM(_id) _id, #define GEN_STR(_str) #_str, |
Changes to lib/libfossil-config.h.
︙ | ︙ | |||
51 52 53 54 55 56 57 | #if !defined(HAVE_STDINT_H) # define HAVE_STDINT_H 1 #endif #if !defined(_DEFAULT_SOURCE) # define _DEFAULT_SOURCE 1 #endif #if !defined(_XOPEN_SOURCE) | | | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | #if !defined(HAVE_STDINT_H) # define HAVE_STDINT_H 1 #endif #if !defined(_DEFAULT_SOURCE) # define _DEFAULT_SOURCE 1 #endif #if !defined(_XOPEN_SOURCE) # define _XOPEN_SOURCE 500 #endif #else #if !defined(HAVE_LSTAT) # define HAVE_LSTAT 0 #endif #if !defined(HAVE_LTDL_H) # define HAVE_LTDL_H 0 |
︙ | ︙ |
Changes to lib/libfossil.c.
1 | #include "libfossil.h" | | | 1 2 3 4 5 6 7 8 9 | #include "libfossil.h" /* start of file fsl.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
44 45 46 47 48 49 50 | const fsl_buffer fsl_buffer_empty = fsl_buffer_empty_m; const fsl_card_F fsl_card_F_empty = fsl_card_F_empty_m; const fsl_card_F_list fsl_card_F_list_empty = fsl_card_F_list_empty_m; const fsl_card_J fsl_card_J_empty = fsl_card_J_empty_m; const fsl_card_Q fsl_card_Q_empty = fsl_card_Q_empty_m; const fsl_card_T fsl_card_T_empty = fsl_card_T_empty_m; const fsl_checkin_opt fsl_checkin_opt_empty = fsl_checkin_opt_empty_m; | < < | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | const fsl_buffer fsl_buffer_empty = fsl_buffer_empty_m; const fsl_card_F fsl_card_F_empty = fsl_card_F_empty_m; const fsl_card_F_list fsl_card_F_list_empty = fsl_card_F_list_empty_m; const fsl_card_J fsl_card_J_empty = fsl_card_J_empty_m; const fsl_card_Q fsl_card_Q_empty = fsl_card_Q_empty_m; const fsl_card_T fsl_card_T_empty = fsl_card_T_empty_m; const fsl_checkin_opt fsl_checkin_opt_empty = fsl_checkin_opt_empty_m; const fsl_ckout_manage_opt fsl_ckout_manage_opt_empty = fsl_ckout_manage_opt_empty_m; const fsl_ckout_unmanage_opt fsl_ckout_unmanage_opt_empty = fsl_ckout_unmanage_opt_empty_m; const fsl_ckup_opt fsl_ckup_opt_empty = fsl_ckup_opt_m; const fsl_confirmer fsl_confirmer_empty = fsl_confirmer_empty_m; const fsl_cx fsl_cx_empty = fsl_cx_empty_m; |
︙ | ︙ | |||
377 378 379 380 381 382 383 | } int fsl_stricmp_cmp( void const * lhs, void const * rhs ){ return fsl_stricmp((char const *)lhs, (char const *)rhs); } fsl_size_t fsl_strlen( char const * src ){ | | | | | 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 | } int fsl_stricmp_cmp( void const * lhs, void const * rhs ){ return fsl_stricmp((char const *)lhs, (char const *)rhs); } fsl_size_t fsl_strlen( char const * src ){ fsl_size_t i = 0; if(src) for( ; *src; ++i, ++src ){} return i; } char * fsl_strndup( char const * src, fsl_int_t len ){ if(!src) return NULL; else{ fsl_buffer b = fsl_buffer_empty; if(len<0) len = (fsl_int_t)fsl_strlen(src); |
︙ | ︙ | |||
924 925 926 927 928 929 930 | } /** Convenience form of fsl_simplify_sql() which assumes b holds an SQL string. It gets processed by fsl_simplify_sql() and its 'used' length potentially gets adjusted to match the adjusted SQL string. */ | | | | | 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 | } /** Convenience form of fsl_simplify_sql() which assumes b holds an SQL string. It gets processed by fsl_simplify_sql() and its 'used' length potentially gets adjusted to match the adjusted SQL string. */ fsl_size_t fsl_simplify_sql_buffer( fsl_buffer * b ){ return b->used = fsl_simplify_sql( (char *)b->mem, (fsl_int_t)b->used ); } char const *fsl_preferred_ckout_db_name(){ #if FSL_PLATFORM_IS_WINDOWS return "_FOSSIL_"; #else return ".fslckout"; #endif } char fsl_isatty(int fd){ return isatty(fd) ? 1 : 0; } bool fsl__is_reserved_fn_windows(const char *zPath, fsl_int_t nameLen){ static const char *const azRes[] = { "CON", "PRN", "AUX", "NUL", "COM", "LPT" }; unsigned int i; |
︙ | ︙ | |||
1020 1021 1022 1023 1024 1025 1026 | } default:{ return false; } } } | < < < < | | | 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 | } default:{ return false; } } } #undef MARKER #if defined(_WIN32) || defined(WIN32) #undef isatty #endif /* end of file fsl.c */ /* start of file annotate.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
1327 1328 1329 1330 1331 1332 1333 | if(NULL==x){ rc = FSL_RC_OOM; goto end; } a->aVers = x; a->naVers = n; } | | < < < < | | 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 | if(NULL==x){ rc = FSL_RC_OOM; goto end; } a->aVers = x; a->naVers = n; } #define AnnStr(COL,FLD) zCol = fsl_stmt_g_text(&q, COL, &nCol); \ zTmp = fsl_strndup(zCol, nCol); \ if(!zTmp){ rc = FSL_RC_OOM; goto end; } \ a->aVers[a->nVers].FLD = zTmp AnnStr(0,zFUuid); AnnStr(1,zMUuid); AnnStr(2,zUser); #undef AnnStr a->aVers[a->nVers].mtime = mtime; |
︙ | ︙ | |||
1497 1498 1499 1500 1501 1502 1503 | fsl__cx_scratchpad_yield(f, scratch); fsl__annotator_clean(&ann); return rc; } #undef MARKER #undef blob_to_utf8_no_bom | | | | 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 | fsl__cx_scratchpad_yield(f, scratch); fsl__annotator_clean(&ann); return rc; } #undef MARKER #undef blob_to_utf8_no_bom /* end of file annotate.c */ /* start of file appendf.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /************************************************************************ The printf-like implementation in this file is based on the one found in the sqlite3 distribution is in the Public Domain. This copy was forked for use with the clob API in Feb 2008 by Stephan |
︙ | ︙ | |||
2279 2280 2281 2282 2283 2284 2285 | && (c=fsl_utf8_read_char(z, zEnd, &zNext)); z = zNext ){ if( c=='\\' || c=='"' ){ out("\\", 1); outc; }else if( c<' ' ){ out("\\",1); | < | < | | | | | | | | | | | < < | 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 | && (c=fsl_utf8_read_char(z, zEnd, &zNext)); z = zNext ){ if( c=='\\' || c=='"' ){ out("\\", 1); outc; }else if( c<' ' ){ out("\\",1); if( c=='\n' ){ out("n",1); }else if( c=='\r' ){ out("r",1); }else{ unsigned char ubuf[5] = {'u',0,0,0,0}; int i; for(i = 4; i>0; --i){ ubuf[i] = "0123456789abcdef"[c&0xf]; c >>= 4; } out(ubuf,5); } }else if(c<128){ outc; }/* At this point we know that c is part of a multi-byte character. We're assuming legal UTF8 input, which means emitting a surrogate pair if the value is > 0xffff. */ else if(c<0xFFFF){ |
︙ | ︙ | |||
2942 2943 2944 2945 2946 2947 2948 | } case etSTRING: { bufpt = va_arg(ap,char*); length = bufpt ? StrNLen32(bufpt, (precision>0 && flag_alternateform) ? precision*4/*max bytes per char*/ | | | | 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 | } case etSTRING: { bufpt = va_arg(ap,char*); length = bufpt ? StrNLen32(bufpt, (precision>0 && flag_alternateform) ? precision*4/*max bytes per char*/ : (precision ? precision : -1)) : (int)0; if(flag_alternateform && length && (precision>0 || width>0)){ appendf__utf8_altform(bufpt, &length, &precision, &width); }else if( length && precision>=0 && precision<length ){ length = precision; } break; } case etDYNSTRING: { /* etDYNSTRING needs to be handled separately because it free()s its argument (which isn't available outside this block). This means, though, that %-#z does not work. */ bufpt = va_arg(ap,char*); length = bufpt ? StrNLen32(bufpt, (precision>0 && flag_alternateform) ? precision*4/*max bytes per char*/ : (precision ? precision : -1)) : (int)0; if(flag_alternateform && length && (precision>0 || width>0)){ appendf__utf8_altform(bufpt, &length, &precision, &width); }else if( length && precision>=0 && precision<length ){ length = precision; } pfrc = spech_dynstring( pfAppend, pfAppendArg, |
︙ | ︙ | |||
3229 3230 3231 3232 3233 3234 3235 | va_start( vargs, fmt ); rc = fsl_snprintfv( dest, n, fmt, vargs ); va_end( vargs ); return rc; } #undef MARKER | | | | < | 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 | va_start( vargs, fmt ); rc = fsl_snprintfv( dest, n, fmt, vargs ); va_end( vargs ); return rc; } #undef MARKER /* end of file appendf.c */ /* start of file auth.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /*************************************************************************** This file contains routines related to working with user authentication. */ FSL_EXPORT char * fsl_sha1_shared_secret( fsl_cx * f, char const * zLoginName, char const * zPw ){ if(!f || !zPw || !zLoginName) return 0; else{ fsl_sha1_cx hash = fsl_sha1_cx_empty; unsigned char zResult[20]; char zDigest[41]; if(!f->cache.projectCode){ |
︙ | ︙ | |||
3281 3282 3283 3284 3285 3286 3287 | fsl_sha1_update(&hash, zPw, fsl_strlen(zPw)); fsl_sha1_final(&hash, zResult); fsl_sha1_digest_to_base16(zResult, zDigest); return fsl_strndup( zDigest, FSL_STRLEN_SHA1 ); } } | | | | | 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 | fsl_sha1_update(&hash, zPw, fsl_strlen(zPw)); fsl_sha1_final(&hash, zResult); fsl_sha1_digest_to_base16(zResult, zDigest); return fsl_strndup( zDigest, FSL_STRLEN_SHA1 ); } } FSL_EXPORT char * fsl_repo_login_group_name(fsl_cx * f){ return f ? fsl_config_get_text(f, FSL_CONFDB_REPO, "login-group-name", 0) : 0; } FSL_EXPORT char * fsl_repo_login_cookie_name(fsl_cx * f){ fsl_db * db; if(!f || !(db = fsl_cx_db_repo(f))) return 0; else{ char const * sql = "SELECT 'fossil-' || substr(value,1,16)" " FROM config" " WHERE name IN ('project-code','login-group-code')" " ORDER BY name /*sort*/"; return fsl_db_g_text(db, 0, sql); } } FSL_EXPORT int fsl_repo_login_search_uid(fsl_cx * f, char const * zUsername, char const * zPasswd, fsl_id_t * userId){ int rc; char * zSecret; fsl_db * db; if(!f || !userId || !zUsername || !*zUsername |
︙ | ︙ | |||
3329 3330 3331 3332 3333 3334 3335 | " AND login NOT IN ('anonymous','nobody','developer','reader')" " AND (pw=%Q OR (length(pw)<>40 AND pw=%Q))", zUsername, zSecret, zPasswd); fsl_free(zSecret); return rc; } | | | | | 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 | " AND login NOT IN ('anonymous','nobody','developer','reader')" " AND (pw=%Q OR (length(pw)<>40 AND pw=%Q))", zUsername, zSecret, zPasswd); fsl_free(zSecret); return rc; } FSL_EXPORT int fsl_repo_login_clear( fsl_cx * f, fsl_id_t userId ){ fsl_db * db; if(!f) return FSL_RC_MISUSE; else if(!(db = fsl_needs_repo(f))) return FSL_RC_NOT_A_REPO; else{ int const rc = fsl_db_exec(db, "UPDATE user SET cookie=NULL, ipaddr=NULL, " " cexpire=0 WHERE " " CASE WHEN %"FSL_ID_T_PFMT">=0 THEN uid=%"FSL_ID_T_PFMT"" " ELSE uid>0 END" " AND login NOT IN('anonymous','nobody'," " 'developer','reader')", (fsl_id_t)userId, (fsl_id_t)userId); if(rc){ fsl_cx_uplift_db_error(f, db); } return rc; } } #undef MARKER /* end of file auth.c */ /* start of file bag.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
3550 3551 3552 3553 3554 3555 3556 | void fsl_id_bag_swap(fsl_id_bag * const lhs, fsl_id_bag * const rhs){ fsl_id_bag x = *lhs; *lhs = *rhs; *rhs = x; } #undef fsl_id_bag_hash | | | | 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 | void fsl_id_bag_swap(fsl_id_bag * const lhs, fsl_id_bag * const rhs){ fsl_id_bag x = *lhs; *lhs = *rhs; *rhs = x; } #undef fsl_id_bag_hash /* end of file bag.c */ /* start of file buffer.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
3578 3579 3580 3581 3582 3583 3584 | #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < | | | < | | < | > | | | | > | < | < | < < < < < < < | | < < < < | < | < < < < < < < < | < < < < < < | | | | | | | | | | | | | | > > | < < > | | > > > | | | | | | | | | > | 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 | #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) fsl_buffer * fsl_buffer_reuse( fsl_buffer * b ){ if(b->capacity){ assert(b->mem); b->mem[0] = 0; } b->used = b->cursor = 0; return b; } void fsl_buffer_clear( fsl_buffer * buf ){ if(buf){ if(buf->mem) fsl_free(buf->mem); *buf = fsl_buffer_empty; } } int fsl_buffer_reserve( fsl_buffer * buf, fsl_size_t n ){ if( ! buf ) return FSL_RC_MISUSE; else if( 0 == n ){ fsl_free(buf->mem); *buf = fsl_buffer_empty; return 0; }else if( buf->capacity >= n ){ return 0; }else{ unsigned char * x; assert((buf->used < n) && "Buffer in-use greater than capacity!"); x = (unsigned char *)fsl_realloc( buf->mem, n ); if( ! x ) return FSL_RC_OOM; memset( x + buf->used, 0, n - buf->used ); buf->mem = x; buf->capacity = n; return 0; } } int fsl_buffer_resize( fsl_buffer * buf, fsl_size_t n ){ if( !buf ) return FSL_RC_MISUSE; else if(n && (buf->capacity == n+1)){ buf->used = n; buf->mem[n] = 0; return 0; }else{ unsigned char * x = (unsigned char *)fsl_realloc( buf->mem, n+1/*NUL*/ ); if( ! x ) return FSL_RC_OOM; if(n > buf->capacity){ /* zero-fill new parts */ memset( x + buf->capacity, 0, n - buf->capacity +1/*NUL*/ ); } buf->capacity = n + 1 /*NUL*/; buf->used = n; buf->mem = x; buf->mem[buf->used] = 0; return 0; } } int fsl_buffer_compare(fsl_buffer const * lhs, fsl_buffer const * rhs){ fsl_size_t const szL = lhs->used; fsl_size_t const szR = rhs->used; fsl_size_t const sz = (szL<szR) ? szL : szR; int rc = memcmp(lhs->mem, rhs->mem, sz); if(0 == rc){ rc = (szL==szR) ? 0 : ((szL<szR) ? -1 : 1); } return rc; } /* Compare two blobs in constant time and return zero if they are equal. Constant time comparison only applies for blobs of the same length. If lengths are different, immediately returns 1. */ int fsl_buffer_compare_O1(fsl_buffer const * lhs, fsl_buffer const * rhs){ fsl_size_t const szL = lhs->used; fsl_size_t const szR = rhs->used; fsl_size_t i; unsigned char const *buf1; unsigned char const *buf2; unsigned char rc = 0; if( szL!=szR || szL==0 ) return 1; buf1 = lhs->mem; buf2 = rhs->mem; for( i=0; i<szL; i++ ){ rc = rc | (buf1[i] ^ buf2[i]); } return rc; } int fsl_buffer_append( fsl_buffer * b, void const * data, fsl_int_t len ){ if(!b || !data) return FSL_RC_MISUSE; else{ fsl_size_t sz = b->used; int rc = 0; assert(b->capacity ? !!b->mem : !b->mem); assert(b->used <= b->capacity); if(len<0){ len = (fsl_int_t)fsl_strlen((char const *)data); } sz += len + 1/*NUL*/; rc = b->capacity<sz ? fsl_buffer_reserve( b, sz ) : 0; if(!rc){ assert(b->capacity >= sz); if(len>0) memcpy(b->mem + b->used, data, (size_t)len); b->used += len; b->mem[b->used] = 0; } return rc; } } int fsl_buffer_appendfv( fsl_buffer * const b, char const * fmt, va_list args){ return fsl_appendfv( fsl_output_f_buffer, b, fmt, args ); } |
︙ | ︙ | |||
3777 3778 3779 3780 3781 3782 3783 | va_start(args,fmt); rc = fsl_buffer_appendfv( b, fmt, args ); va_end(args); return rc; } } | | | | | < | | | | < | | 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 | va_start(args,fmt); rc = fsl_buffer_appendfv( b, fmt, args ); va_end(args); return rc; } } char const * fsl_buffer_cstr(fsl_buffer const *b){ return b ? (char const *)b->mem : NULL; } char const * fsl_buffer_cstr2(fsl_buffer const *b, fsl_size_t * len){ char const * rc = NULL; if(b){ rc = (char const *)b->mem; if(len) *len = b->used; } return rc; } char * fsl_buffer_str(fsl_buffer const *b){ return b ? (char *)b->mem : NULL; } fsl_size_t fsl_buffer_size(fsl_buffer const * b){ return b ? b->used : 0U; } fsl_size_t fsl_buffer_capacity(fsl_buffer const * b){ return b ? b->capacity : 0; } bool fsl_data_is_compressed(unsigned char const * mem, fsl_size_t len){ if(!mem || (len<6)) return 0; #if 0 else return ('x'==mem[4]) && (0234==mem[5]); /* This check fails for one particular artifact in the tcl core. Notes gathered while debugging... |
︙ | ︙ | |||
3973 3974 3975 3976 3977 3978 3979 | }else{ fsl_buffer_reserve(&temp, 0); } return rc; } } | | | | < < < < < | < < < < < < < < < < < < < < < | | < < < | < > | | | | | | | < > | < > | | | < > | < | < < | | | < < < < < < < < < < < | 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 | }else{ fsl_buffer_reserve(&temp, 0); } return rc; } } int fsl_buffer_uncompress(fsl_buffer const *pIn, fsl_buffer *pOut){ unsigned int nOut; unsigned char *inBuf; unsigned int nIn = pIn->used; fsl_buffer temp = fsl_buffer_empty; int rc; unsigned long int nOut2; if( nIn<=4 ){ return FSL_RC_RANGE; } inBuf = pIn->mem; nOut = (inBuf[0]<<24) + (inBuf[1]<<16) + (inBuf[2]<<8) + inBuf[3]; /* MARKER(("decompress size: %u\n", nOut)); */ rc = fsl_buffer_reserve(&temp, nOut+1); if(rc) return rc; nOut2 = (long int)nOut; rc = uncompress(temp.mem, &nOut2, &inBuf[4], nIn - 4) /* valgrind says there's an uninitialized memory access somewhere under uncompress(), _presumably_ for one of these arguments, but i can't find it. fsl_buffer_reserve() always memsets() new bytes to 0. Turns out it's a known problem: https://www.zlib.net/zlib_faq.html#faq36 */; if( rc!=Z_OK ){ fsl_buffer_reserve(&temp, 0); return FSL_RC_ERROR; } rc = fsl_buffer_resize(&temp, nOut2); if(!rc){ temp.used = (fsl_size_t)nOut2; if( pOut==pIn ){ fsl_buffer_reserve(pOut, 0); } assert(!pOut->mem); *pOut = temp; }else{ fsl_buffer_reserve(&temp, 0); } return rc; } int fsl_buffer_fill_from( fsl_buffer * const dest, fsl_input_f src, void * const state ) { |
︙ | ︙ | |||
4140 4141 4142 4143 4144 4145 4146 | fsl_buffer const * const src ){ fsl_buffer_reuse(dest); return src->used ? fsl_buffer_append( dest, src->mem, src->used ) : 0; } | | | | | | | | | > > | | | | > | | | > | | | | > | | | > | | | | | | > > | > | | | > | > | > | | 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 | fsl_buffer const * const src ){ fsl_buffer_reuse(dest); return src->used ? fsl_buffer_append( dest, src->mem, src->used ) : 0; } int fsl_buffer_delta_apply2( fsl_buffer const * orig, fsl_buffer const * pDelta, fsl_buffer * pTarget, fsl_error * pErr){ int rc; fsl_size_t n = 0; fsl_buffer out = fsl_buffer_empty; rc = fsl_delta_applied_size( pDelta->mem, pDelta->used, &n); if(rc){ if(pErr){ fsl_error_set(pErr, rc, "fsl_delta_applied_size() failed."); } return rc; } rc = fsl_buffer_resize( &out, n ); if(rc) return rc; rc = fsl_delta_apply2( orig->mem, orig->used, pDelta->mem, pDelta->used, out.mem, pErr); if(rc){ fsl_buffer_clear(&out); }else{ fsl_buffer_clear(pTarget); *pTarget = out; } return rc; } int fsl_buffer_delta_apply( fsl_buffer const * orig, fsl_buffer const * pDelta, fsl_buffer * pTarget){ return fsl_buffer_delta_apply2(orig, pDelta, pTarget, NULL); } void fsl_buffer_defossilize( fsl_buffer * b ){ if(b){ fsl_bytes_defossilize( b->mem, &b->used ); } } int fsl_buffer_to_filename( fsl_buffer const * b, char const * fname ){ FILE * f; int rc = 0; if(!b || !fname) return FSL_RC_MISUSE; f = fsl_fopen(fname, "wb"); if(!f) rc = fsl_errno_to_rc(errno, FSL_RC_IO); else{ if(b->used) { size_t const frc = fwrite(b->mem, b->used, 1, f); rc = (1==frc) ? 0 : FSL_RC_IO; } fsl_fclose(f); } return rc; } int fsl_buffer_delta_create( fsl_buffer const * src, fsl_buffer const * newVers, fsl_buffer * delta){ if(!src || !newVers || !delta) return FSL_RC_MISUSE; else if((src == newVers) || (src==delta) || (newVers==delta)) return FSL_RC_MISUSE; else{ int rc = fsl_buffer_reserve( delta, newVers->used + 60 ); if(!rc){ delta->used = 0; rc = fsl_delta_create( src->mem, src->used, newVers->mem, newVers->used, delta->mem, &delta->used ); if(!rc){ rc = fsl_buffer_resize( delta, delta->used ); } } return rc; } } int fsl_output_f_buffer( void * state, void const * src, fsl_size_t n ){ return (!state || !src) ? FSL_RC_MISUSE : fsl_buffer_append((fsl_buffer*)state, src, n); } int fsl_finalizer_f_buffer( void * state, void * mem ){ fsl_buffer * b = (fsl_buffer*)mem; fsl_buffer_reserve(b, 0); *b = fsl_buffer_empty; return 0; } int fsl_buffer_strftime(fsl_buffer * const b, char const * format, const struct tm *timeptr){ if(!b || !format || !*format || !timeptr) return FSL_RC_MISUSE; else{ enum {BufSize = 128}; char buf[BufSize]; fsl_size_t len = fsl_strftime(buf, BufSize, format, timeptr); if(!len) return FSL_RC_RANGE; return fsl_buffer_append(b, buf, (fsl_int_t)len); } } int fsl_buffer_stream_lines(fsl_output_f fTo, void * const toState, fsl_buffer * const pFrom, fsl_size_t N){ char *z = (char *)pFrom->mem; fsl_size_t i = pFrom->cursor; |
︙ | ︙ | |||
4350 4351 4352 4353 4354 4355 4356 | fsl_buffer_clear(&fc); #endif return rc; } } char * fsl_buffer_take(fsl_buffer * const b){ | < < | | < | 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 | fsl_buffer_clear(&fc); #endif return rc; } } char * fsl_buffer_take(fsl_buffer * const b){ char * z = (char *)b->mem; *b = fsl_buffer_empty; return z; } fsl_size_t fsl_buffer_seek(fsl_buffer * const b, fsl_int_t offset, fsl_buffer_seek_e whence){ int64_t c = (int64_t)b->cursor; switch(whence){ |
︙ | ︙ | |||
4410 4411 4412 4413 4414 4415 4416 | if(i++) rc = fsl_buffer_append(b, separator, sepLen); if(!rc) rc = fsl_buffer_appendf(b, "%" FSL_ID_T_PFMT, e); } return rc; } int fsl_buffer_append_tcl_literal(fsl_buffer * const b, | < < | < < < | < < | | | 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 | if(i++) rc = fsl_buffer_append(b, separator, sepLen); if(!rc) rc = fsl_buffer_appendf(b, "%" FSL_ID_T_PFMT, e); } return rc; } int fsl_buffer_append_tcl_literal(fsl_buffer * const b, char const * z, fsl_int_t n){ int rc; if(n<0) n = fsl_strlen(z); rc = fsl_buffer_append(b, "\"", 1); for(fsl_int_t i=0; 0==rc && i<n; ++i){ char c = z[i]; switch( c ){ case '\r': c = 'r'; case '[': case ']': case '$': case '"': case '\\': if((rc = fsl_buffer_append(b, "\\", 1))) break; /* fall through */ default: rc = fsl_buffer_append(b, &c, 1); } } if(0==rc) rc = fsl_buffer_append(b, "\"", 1); return rc; } #undef MARKER /* end of file buffer.c */ /* start of file cache.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
4603 4604 4605 4606 4607 4608 4609 | } assert(!"delta-loop in repository"); return fsl_cx_err_set(f, FSL_RC_CONSISTENCY, "Serious problem: delta-loop in repository"); } #undef MARKER | | | | 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 | } assert(!"delta-loop in repository"); return fsl_cx_err_set(f, FSL_RC_CONSISTENCY, "Serious problem: delta-loop in repository"); } #undef MARKER /* end of file cache.c */ /* start of file checkin.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
4652 4653 4654 4655 4656 4657 4658 | ignore if (e.g.) the parent content is already a delta of something else. The wise caller will have a transaction in place when calling this. Returns 0 on success. On error rid and uuid are not modified. */ | | < < | | | 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 | ignore if (e.g.) the parent content is already a delta of something else. The wise caller will have a transaction in place when calling this. Returns 0 on success. On error rid and uuid are not modified. */ static int fsl_checkin_import_file( fsl_cx * f, char const * zRelName, fsl_id_t parentRid, bool allowMergeConflict, fsl_id_t *rid, fsl_uuid_str * uuid){ fsl_buffer * nbuf = fsl__cx_scratchpad(f); fsl_size_t const oldSize = nbuf->used; fsl_buffer * fbuf = &f->fileContent; char const * fn; int rc; fsl_id_t fnid = 0; fsl_id_t rcRid = 0; assert(!fbuf->used && "Misuse of f->fileContent"); assert(f->ckout.dir); rc = fsl__repo_filename_fnid2(f, zRelName, &fnid, 1); |
︙ | ︙ | |||
4897 4898 4899 4900 4901 4902 4903 | if(rc) fsl_db_transaction_rollback(db); else{ rc = fsl_cx_uplift_db_error2(f, db, fsl_db_transaction_commit(db)); } return rc; } | | | 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 | if(rc) fsl_db_transaction_rollback(db); else{ rc = fsl_cx_uplift_db_error2(f, db, fsl_db_transaction_commit(db)); } return rc; } int fsl_checkin_dequeue(fsl_cx * f, fsl_checkin_queue_opt const * opt){ fsl_db * const db = fsl_needs_ckout(f); if(!db) return FSL_RC_NOT_A_CKOUT; int rc = fsl_db_transaction_begin(db); if(rc) return fsl_cx_uplift_db_error2(f, db, rc); fsl_id_bag list = fsl_id_bag_empty; fsl_buffer * canon = 0; char const * fn; |
︙ | ︙ | |||
4938 4939 4940 4941 4942 4943 4944 | if(rc) fsl_db_transaction_rollback(db); else{ rc = fsl_cx_uplift_db_error2(f, db, fsl_db_transaction_commit(db)); } return rc; } | | > | | | 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 | if(rc) fsl_db_transaction_rollback(db); else{ rc = fsl_cx_uplift_db_error2(f, db, fsl_db_transaction_commit(db)); } return rc; } bool fsl_checkin_is_enqueued(fsl_cx * f, char const * zName, bool relativeToCwd){ fsl_db * db; if(!f || !zName || !*zName) return 0; else if(!(db = fsl_needs_ckout(f))) return 0; else if(!f->ckin.selectedIds.entryCount){ /* Behave like fsl_is_enqueued() SQL function. */ return true; } else { bool rv = false; fsl_buffer * const canon = fsl__cx_scratchpad(f); |
︙ | ︙ | |||
4966 4967 4968 4969 4970 4971 4972 | : false); } fsl__cx_scratchpad_yield(f, canon); return rv; } } | > | | 4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866 | : false); } fsl__cx_scratchpad_yield(f, canon); return rv; } } void fsl_checkin_discard(fsl_cx * f){ if(f){ fsl_id_bag_clear(&f->ckin.selectedIds); fsl_deck_finalize(&f->ckin.mf); } } /** |
︙ | ︙ | |||
5789 5790 5791 5792 5793 5794 5795 | "WHERE fsl_is_enqueued(id)", vid, d->rid); if(!rc) rc = fsl__ckout_version_write(f, d->rid, NULL); RC; assert(d->f == f); rc = fsl_checkin_add_unsent(f, d->rid); RC; | | | 5675 5676 5677 5678 5679 5680 5681 5682 5683 5684 5685 5686 5687 5688 5689 | "WHERE fsl_is_enqueued(id)", vid, d->rid); if(!rc) rc = fsl__ckout_version_write(f, d->rid, NULL); RC; assert(d->f == f); rc = fsl_checkin_add_unsent(f, d->rid); RC; rc = fsl__ckout_clear_merge_state(f); RC; /* todo(?) from fossil(1) follows. Most of this seems to be what the vfile handling does (above). db_multi_exec("PRAGMA %s.application_id=252006673;", db_name("repository")); db_multi_exec("PRAGMA %s.application_id=252006674;", db_name("localdb")); |
︙ | ︙ | |||
5883 5884 5885 5886 5887 5888 5889 | fsl_checkin_discard(f); fsl_deck_finalize(d); return rc; } #undef MARKER | | | | 5769 5770 5771 5772 5773 5774 5775 5776 5777 5778 5779 5780 5781 5782 5783 5784 | fsl_checkin_discard(f); fsl_deck_finalize(d); return rc; } #undef MARKER /* end of file checkin.c */ /* start of file checkout.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
5920 5921 5922 5923 5924 5925 5926 | /** Kludge for type-safe strncmp/strnicmp inconsistency. */ static int fsl_strnicmp_int(char const *zA, char const * zB, fsl_size_t nByte){ return fsl_strnicmp( zA, zB, (fsl_int_t)nByte); } | | | | | 5806 5807 5808 5809 5810 5811 5812 5813 5814 5815 5816 5817 5818 5819 5820 5821 5822 5823 5824 5825 5826 5827 5828 5829 5830 5831 5832 5833 5834 5835 5836 5837 5838 5839 5840 5841 | /** Kludge for type-safe strncmp/strnicmp inconsistency. */ static int fsl_strnicmp_int(char const *zA, char const * zB, fsl_size_t nByte){ return fsl_strnicmp( zA, zB, (fsl_int_t)nByte); } int fsl_ckout_filename_check( fsl_cx * f, bool relativeToCwd, char const * zOrigName, fsl_buffer * pOut ){ int rc; if(!zOrigName || !*zOrigName) return FSL_RC_MISUSE; else if(!fsl_needs_ckout(f)/* will update f's error state*/){ return FSL_RC_NOT_A_CKOUT; } #if 0 /* Is this sane? */ else if(fsl_is_simple_pathname(zOrigName,1)){ rc = 0; if(pOut){ rc = fsl_buffer_append(pOut, zOrigName, fsl_strlen(zOrigName)); } } #endif else{ char const * zLocalRoot; char const * zFull; fsl_size_t nLocalRoot; fsl_size_t nFull; fsl_buffer * full = fsl__cx_scratchpad(f); int (*xCmp)(char const *, char const *,fsl_size_t); bool endsWithSlash; assert(f->ckout.dir); zLocalRoot = f->ckout.dir; assert(zLocalRoot); assert(*zLocalRoot); nLocalRoot = f->ckout.dirLen; |
︙ | ︙ | |||
5967 5968 5969 5970 5971 5972 5973 | "file name: %s\n", rc, fsl_rc_cstr(rc), zOrigName); } goto end; } zFull = fsl_buffer_cstr2(full, &nFull); | | | 5853 5854 5855 5856 5857 5858 5859 5860 5861 5862 5863 5864 5865 5866 5867 | "file name: %s\n", rc, fsl_rc_cstr(rc), zOrigName); } goto end; } zFull = fsl_buffer_cstr2(full, &nFull); xCmp = fsl_cx_is_case_sensitive(f) ? fsl_strncmp : fsl_strnicmp_int; assert(zFull); assert(nFull>0); endsWithSlash = '/' == zFull[nFull-1]; if( ((nFull==nLocalRoot-1 || (nFull==nLocalRoot && endsWithSlash)) && xCmp(zLocalRoot, zFull, nFull)==0) |
︙ | ︙ | |||
6147 6148 6149 6150 6151 6152 6153 | return fsl_db_exists(fsl_cx_db_ckout(f), "SELECT 1 FROM vfile" " WHERE vid=%"FSL_ID_T_PFMT " AND pathname=%Q %s", f->ckout.rid, zFilename, fsl_cx_filename_collation(f)); } | < < < < < < < < < < | | | | 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042 6043 6044 6045 6046 6047 6048 6049 6050 6051 6052 6053 6054 6055 | return fsl_db_exists(fsl_cx_db_ckout(f), "SELECT 1 FROM vfile" " WHERE vid=%"FSL_ID_T_PFMT " AND pathname=%Q %s", f->ckout.rid, zFilename, fsl_cx_filename_collation(f)); } /** Internal machinery for fsl_ckout_manage(). zFilename MUST be a checkout-relative file which is known to exist. fst MUST be an object populated by fsl_stat()'ing zFilename. isInVFile MUST be the result of having passed zFilename to fsl_co_is_in_vfile(). */ static int fsl_ckout_manage_impl( fsl_cx * f, char const *zFilename, fsl_fstat const *fst, bool isInVFile){ int rc = 0; fsl_db * const db = fsl_needs_ckout(f); assert(fsl_is_simple_pathname(zFilename, true)); if( isInVFile ){ rc = fsl_db_exec(db, "UPDATE vfile SET deleted=0," " mtime=%"PRIi64 " WHERE vid=%"FSL_ID_T_PFMT |
︙ | ︙ | |||
6223 6224 6225 6226 6227 6228 6229 | static int fsl_dircrawl_f_add(fsl_dircrawl_state const *); /** Attempts to add file or directory (recursively) cas->absBuf to the current repository. isCrawling must be true if this is a fsl_dircrawl()-invoked call, else false. */ | | | 6099 6100 6101 6102 6103 6104 6105 6106 6107 6108 6109 6110 6111 6112 6113 | static int fsl_dircrawl_f_add(fsl_dircrawl_state const *); /** Attempts to add file or directory (recursively) cas->absBuf to the current repository. isCrawling must be true if this is a fsl_dircrawl()-invoked call, else false. */ static int co_add_one(CoAddState * cas, bool isCrawling){ int rc = 0; fsl_buffer_reuse(cas->coRelBuf); rc = fsl_cx_stat2(cas->f, cas->opt->relativeToCwd, fsl_buffer_cstr(cas->absBuf), &cas->fst, fsl_buffer_reuse(cas->coRelBuf), false) /* Reminder: will fail if file is outside of the checkout tree */; if(rc) return rc; |
︙ | ︙ | |||
6254 6255 6256 6257 6258 6259 6260 | }else if(cas->opt->checkIgnoreGlobs){ char const * m = fsl_cx_glob_matches(cas->f, FSL_GLOBS_IGNORE, zCoRel); if(m) skipped = true; } if(!skipped && cas->opt->callback){ bool yes = false; | < | < < | | 6130 6131 6132 6133 6134 6135 6136 6137 6138 6139 6140 6141 6142 6143 6144 6145 | }else if(cas->opt->checkIgnoreGlobs){ char const * m = fsl_cx_glob_matches(cas->f, FSL_GLOBS_IGNORE, zCoRel); if(m) skipped = true; } if(!skipped && cas->opt->callback){ bool yes = false; rc = cas->opt->callback( zCoRel, &yes, cas->opt->callbackState ); if(rc) goto end; else if(!yes) skipped = true; } } if(skipped){ ++cas->opt->counts.skipped; }else{ |
︙ | ︙ | |||
6304 6305 6306 6307 6308 6309 6310 | "fsl_fstat_type_e #%d", cas->fst.type); break; } end: return rc; } | < < < < < | | | | < < < < < < < | < < | < < < < < < < < < < < < < < < < < < < < < | | | | < | 6177 6178 6179 6180 6181 6182 6183 6184 6185 6186 6187 6188 6189 6190 6191 6192 6193 6194 6195 6196 6197 6198 6199 6200 6201 6202 6203 6204 6205 6206 6207 6208 6209 6210 6211 6212 6213 6214 6215 6216 6217 | "fsl_fstat_type_e #%d", cas->fst.type); break; } end: return rc; } static int fsl_dircrawl_f_add(fsl_dircrawl_state const *dst){ if(FSL_FSTAT_TYPE_FILE!=dst->entryType) return 0; CoAddState * cas = (CoAddState*)dst->callbackState; int rc = fsl_buffer_appendf(fsl_buffer_reuse(cas->absBuf), "%s/%s", dst->absoluteDir, dst->entryName); if(!rc) rc = co_add_one(cas, true); return rc; } int fsl_ckout_manage( fsl_cx * const f, fsl_ckout_manage_opt * const opt_ ){ int rc = 0; CoAddState cas = CoAddState_empty; fsl_ckout_manage_opt opt; if(!f) return FSL_RC_MISUSE; else if(!fsl_needs_ckout(f)) return FSL_RC_NOT_A_CKOUT; assert(f->ckout.rid>=0); opt = *opt_ /*use a copy in case the user manages to modify opt_ from a callback. */; cas.absBuf = fsl__cx_scratchpad(f); cas.coRelBuf = fsl__cx_scratchpad(f); rc = fsl_file_canonical_name(opt.filename, cas.absBuf, false); if(!rc){ cas.f = f; cas.opt = &opt; rc = co_add_one(&cas, false); opt_->counts = opt.counts; } fsl__cx_scratchpad_yield(f, cas.absBuf); fsl__cx_scratchpad_yield(f, cas.coRelBuf); return rc; } /** |
︙ | ︙ | |||
6417 6418 6419 6420 6421 6422 6423 | return rc; dberr: assert(rc); rc = fsl_cx_uplift_db_error2(f, db, rc); goto end; } | < < < < < < < < | 6254 6255 6256 6257 6258 6259 6260 6261 6262 6263 6264 6265 6266 6267 | return rc; dberr: assert(rc); rc = fsl_cx_uplift_db_error2(f, db, rc); goto end; } int fsl_ckout_unmanage(fsl_cx * const f, fsl_ckout_unmanage_opt const * opt){ int rc; fsl_db * const db = fsl_needs_ckout(f); fsl_buffer * fname = 0; fsl_id_t const vid = f->ckout.rid; fsl_stmt q = fsl_stmt_empty; bool inTrans = false; |
︙ | ︙ | |||
6507 6508 6509 6510 6511 6512 6513 | "/*%s()*/", vid, zNorm, zNorm, vid, __func__); if(rc) goto dberr; } }/*opt->filename*/ if(q.stmt){ | < < < | < < < < | | 6336 6337 6338 6339 6340 6341 6342 6343 6344 6345 6346 6347 6348 6349 6350 6351 6352 | "/*%s()*/", vid, zNorm, zNorm, vid, __func__); if(rc) goto dberr; } }/*opt->filename*/ if(q.stmt){ while(FSL_RC_STEP_ROW==fsl_stmt_step(&q)){ char const * fn = fsl_stmt_g_text(&q, 0, NULL); rc = opt->callback(fn, opt->callbackState); if(rc) goto end; } fsl_stmt_finalize(&q); } /* Remove rm'd ADDed-but-not-yet-committed entries... */ rc = fsl_db_exec(db, "DELETE FROM vfile WHERE vid=%" FSL_ID_T_PFMT |
︙ | ︙ | |||
6551 6552 6553 6554 6555 6556 6557 | } int fsl_ckout_changes_scan(fsl_cx * const f){ return fsl_vfile_changes_scan(f, -1, 0); } | | | | 6373 6374 6375 6376 6377 6378 6379 6380 6381 6382 6383 6384 6385 6386 6387 6388 6389 6390 6391 6392 6393 6394 6395 6396 6397 | } int fsl_ckout_changes_scan(fsl_cx * const f){ return fsl_vfile_changes_scan(f, -1, 0); } int fsl_ckout_install_schema(fsl_cx * const f, bool dropIfExists){ char const * tNames[] = { "vvar", "vfile", "vmerge", 0 }; int rc; fsl_db * const db = fsl_needs_ckout(f); if(!db) return f->error.code; if(dropIfExists){ char const * t; int i; char const * dbName = fsl_db_role_label(FSL_DBROLE_CKOUT); for(i=0; 0!=(t = tNames[i]); ++i){ rc = fsl_db_exec(db, "DROP TABLE IF EXISTS %s.%s /*%s()*/", dbName, t, __func__); if(rc) break; } if(!rc){ rc = fsl_db_exec(db, "DROP TRIGGER IF EXISTS " |
︙ | ︙ | |||
6592 6593 6594 6595 6596 6597 6598 | return fsl_db_exists(db, "SELECT 1 FROM vfile WHERE chnged " "OR coalesce(origname != pathname, 0) " "/*%s()*/", __func__) || fsl_db_exists(db,"SELECT 1 FROM vmerge /*%s()*/", __func__); } | | > | | > < < < < < < < < < < < | > > > | | 6414 6415 6416 6417 6418 6419 6420 6421 6422 6423 6424 6425 6426 6427 6428 6429 6430 6431 6432 6433 6434 6435 6436 6437 6438 6439 6440 6441 6442 6443 6444 6445 6446 6447 6448 6449 6450 6451 6452 6453 6454 6455 6456 6457 6458 6459 6460 6461 6462 6463 | return fsl_db_exists(db, "SELECT 1 FROM vfile WHERE chnged " "OR coalesce(origname != pathname, 0) " "/*%s()*/", __func__) || fsl_db_exists(db,"SELECT 1 FROM vmerge /*%s()*/", __func__); } int fsl__ckout_clear_merge_state( fsl_cx *f ){ fsl_db * const d = fsl_needs_ckout(f); int rc; if(d){ rc = fsl_db_exec(d,"DELETE FROM vmerge /*%s()*/", __func__); rc = fsl_cx_uplift_db_error2(f, d, rc); }else{ rc = FSL_RC_NOT_A_CKOUT; } return rc; } int fsl_ckout_clear_db(fsl_cx *f){ fsl_db * const db = fsl_needs_ckout(f); if(!db) return f->error.code; return fsl_db_exec_multi(db, "DELETE FROM vfile;" "DELETE FROM vmerge;" "DELETE FROM vvar WHERE name IN" "('checkout','checkout-hash') " "/*%s()*/", __func__); } fsl_db * fsl_cx_db_for_role(fsl_cx *, fsl_dbrole_e) /* defined in cx.c */; /** Updates f->ckout.dir and dirLen based on the current state of f->ckout.db. Returns 0 on success, FSL_RC_OOM on allocation error, some other code if canonicalization of the name fails (e.g. filesystem error or cwd cannot be resolved). */ static int fsl_update_ckout_dir(fsl_cx *f){ int rc; fsl_buffer ckDir = fsl_buffer_empty; fsl_db * dbC = fsl_cx_db_for_role(f, FSL_DBROLE_CKOUT); assert(dbC->filename); assert(*dbC->filename); rc = fsl_file_canonical_name(dbC->filename, &ckDir, false); if(rc) return rc; char * zCanon = fsl_buffer_take(&ckDir); //MARKER(("dbC->filename=%s\n", dbC->filename)); //MARKER(("zCanon=%s\n", zCanon)); |
︙ | ︙ | |||
6657 6658 6659 6660 6661 6662 6663 | /*MARKER(("Updated ckout.dir: %d %s\n", (int)f->ckout.dirLen, f->ckout.dir));*/ } return rc; } | | | > > > > > > > < < < < < < < < < | 6473 6474 6475 6476 6477 6478 6479 6480 6481 6482 6483 6484 6485 6486 6487 6488 6489 6490 6491 6492 6493 6494 6495 6496 6497 6498 6499 6500 6501 6502 6503 6504 6505 6506 6507 6508 6509 6510 6511 6512 6513 6514 | /*MARKER(("Updated ckout.dir: %d %s\n", (int)f->ckout.dirLen, f->ckout.dir));*/ } return rc; } int fsl_repo_open_ckout(fsl_cx *f, const fsl_repo_open_ckout_opt *opt){ fsl_db *dbC = 0; fsl_buffer *cwd = 0; int rc = 0; if(!opt) return FSL_RC_MISUSE; else if(!fsl_needs_repo(f)){ return f->error.code; }else if(fsl_cx_db_ckout(f)){ return fsl_cx_err_set(f, FSL_RC_MISUSE, "A checkout is already attached."); } if(opt->targetDir && *opt->targetDir){ if(fsl_chdir(opt->targetDir)){ return fsl_cx_err_set(f, FSL_RC_NOT_FOUND, "Directory not found or inaccessible: %s", opt->targetDir); } } cwd = fsl__cx_scratchpad(f); assert(!cwd->used); if((rc = fsl_cx_getcwd(f, cwd))){ assert(!cwd->used); fsl__cx_scratchpad_yield(f, cwd); return fsl_cx_err_set(f, rc, "Error %d [%s]: unable to " "determine current directory.", rc, fsl_rc_cstr(rc)); } /** AS OF HERE: do not use 'return'. Use goto end so that we can chdir() back to our original cwd! */ if(!fsl_dir_is_empty("."/*we've already chdir'd if we were going to*/)) { switch(opt->fileOverwritePolicy){ |
︙ | ︙ | |||
6728 6729 6730 6731 6732 6733 6734 | /** Create and attach ckout db... */ assert(!fsl_cx_db_ckout(f)); const char * dbName = opt->ckoutDbFile ? opt->ckoutDbFile : fsl_preferred_ckout_db_name(); fsl_cx_err_reset(f); | > > | | > > > | < | < | > | 6542 6543 6544 6545 6546 6547 6548 6549 6550 6551 6552 6553 6554 6555 6556 6557 6558 6559 6560 6561 6562 6563 6564 6565 6566 6567 6568 6569 6570 6571 6572 6573 6574 6575 6576 6577 6578 6579 6580 6581 6582 6583 6584 6585 6586 6587 6588 6589 6590 | /** Create and attach ckout db... */ assert(!fsl_cx_db_ckout(f)); const char * dbName = opt->ckoutDbFile ? opt->ckoutDbFile : fsl_preferred_ckout_db_name(); fsl_cx_err_reset(f); int fsl_cx_attach_role(fsl_cx * const , const char *, fsl_dbrole_e) /* defined in cx.c */; rc = fsl_cx_attach_role(f, dbName, FSL_DBROLE_CKOUT); if(rc) goto end; fsl_db * const theDbC = fsl_cx_db_ckout(f); dbC = fsl_cx_db_for_role(f, FSL_DBROLE_CKOUT); assert(theDbC != dbC && "Not anymore."); assert(theDbC == f->dbMain); assert(!f->error.code); assert(dbC->name); assert(dbC->filename); rc = fsl_ckout_install_schema(f, opt->dbOverwritePolicy); if(!rc){ rc = fsl_db_exec(theDbC,"INSERT OR IGNORE INTO " "%s.vvar (name,value) " "VALUES('checkout',0)," "('checkout-hash',null)", dbC->name); } if(rc) rc = fsl_cx_uplift_db_error(f, theDbC); end: if(opt->targetDir && *opt->targetDir && cwd->used){ fsl_chdir(fsl_buffer_cstr(cwd)) /* Ignoring error because we have no recovery strategy! */; } fsl__cx_scratchpad_yield(f, cwd); if(!rc){ fsl_db * const dbR = fsl_cx_db_for_role(f, FSL_DBROLE_REPO); assert(dbR); assert(dbR->filename && *dbR->filename); rc = fsl_config_set_text(f, FSL_CONFDB_CKOUT, "repository", dbR->filename); } if(!rc) rc = fsl_update_ckout_dir(f); fsl_buffer_clear(cwd); return rc; } int fsl__is_locally_modified(fsl_cx * const f, const char * zFilename, fsl_size_t origSize, const char * zOrigHash, |
︙ | ︙ | |||
6996 6997 6998 6999 7000 7001 7002 | RepoExtractCkup * const rec = (RepoExtractCkup *)xs->callbackState; const char * zFilename; fsl_ckup_state coState = fsl_ckup_state_empty; fsl_time_t mtime = 0; fsl_fstat fst = fsl_fstat_empty; fsl_ckup_localmod_e modType = FSL_RECO_MOD_UNKNOWN; bool loadedContent = false; | | | 6814 6815 6816 6817 6818 6819 6820 6821 6822 6823 6824 6825 6826 6827 6828 | RepoExtractCkup * const rec = (RepoExtractCkup *)xs->callbackState; const char * zFilename; fsl_ckup_state coState = fsl_ckup_state_empty; fsl_time_t mtime = 0; fsl_fstat fst = fsl_fstat_empty; fsl_ckup_localmod_e modType = FSL_RECO_MOD_UNKNOWN; bool loadedContent = false; fsl_buffer * content = &f->fileContent; assert(0==content->used && "Internal Misuse of fsl_cx::fileContent buffer."); //assert(xs->content); assert(xs->fCard->uuid && "We shouldn't be getting deletions " "via delta manifests."); rc = fsl_buffer_append(rec->tgtDir, xs->fCard->name, -1); if(rc) return rc; |
︙ | ︙ | |||
7343 7344 7345 7346 7347 7348 7349 | if(rc) goto end; while(FSL_RC_STEP_ROW==(rc = fsl_stmt_step(&q))){ fsl_size_t nFn = 0; char const * fn = fsl_stmt_g_text(&q, 0, &nFn); absPath->used = ckdirLen; rc = fsl_buffer_append(absPath, fn, nFn); if(rc) break; | | | 7161 7162 7163 7164 7165 7166 7167 7168 7169 7170 7171 7172 7173 7174 7175 | if(rc) goto end; while(FSL_RC_STEP_ROW==(rc = fsl_stmt_step(&q))){ fsl_size_t nFn = 0; char const * fn = fsl_stmt_g_text(&q, 0, &nFn); absPath->used = ckdirLen; rc = fsl_buffer_append(absPath, fn, nFn); if(rc) break; fsl_ckout_rm_empty_dirs(f, absPath) /* To see this in action, use (f-co tip) to check out the tip of a repo, then use (f-co rid:1) to back up to the initial empty checkin. It "should" leave you with a directory devoid of anything but .fslckout and any non-SCM'd content. */; } if(FSL_RC_STEP_DONE==rc) rc = 0; |
︙ | ︙ | |||
7459 7460 7461 7462 7463 7464 7465 | if(rc) goto end; } rc = fsl_ckout_manifest_write(f, -1, -1, -1, NULL); end: if(!rc){ rc = fsl_vfile_unload_except(f, cOpt->checkinRid); | | | 7277 7278 7279 7280 7281 7282 7283 7284 7285 7286 7287 7288 7289 7290 7291 | if(rc) goto end; } rc = fsl_ckout_manifest_write(f, -1, -1, -1, NULL); end: if(!rc){ rc = fsl_vfile_unload_except(f, cOpt->checkinRid); if(!rc) rc = fsl__ckout_clear_merge_state(f); } /* TODO: if "repo-cksum" config db setting is set, confirm R-card of cOpt->checkinRid against on-disk contents. */ if(cOpt->confirmer.callback){ fsl_cx_confirmer(f, &oldConfirm, NULL); |
︙ | ︙ | |||
7533 7534 7535 7536 7537 7538 7539 | } /* ** The record.fn field is used to match files against each other. The ** FV table contains one row for each each unique filename in ** in the current checkout, the pivot, and the version being merged. */ rc = fsl_db_exec_multi(dbC, | > | | < | 7351 7352 7353 7354 7355 7356 7357 7358 7359 7360 7361 7362 7363 7364 7365 7366 7367 7368 7369 7370 7371 7372 7373 7374 7375 7376 7377 7378 | } /* ** The record.fn field is used to match files against each other. The ** FV table contains one row for each each unique filename in ** in the current checkout, the pivot, and the version being merged. */ rc = fsl_db_exec_multi(dbC, "DROP TABLE IF EXISTS fv;" "CREATE TEMP TABLE fv(" " fn TEXT %s PRIMARY KEY," /* The filename relative to root */ " idv INTEGER," /* VFILE entry for current version */ " idt INTEGER," /* VFILE entry for target version */ " chnged BOOLEAN," /* True if current version has been edited */ " islinkv BOOLEAN," /* True if current file is a link */ " islinkt BOOLEAN," /* True if target file is a link */ " ridv INTEGER," /* Record ID for current version */ " ridt INTEGER," /* Record ID for target */ " isexe BOOLEAN," /* Does target have execute permission? */ " deleted BOOLEAN DEFAULT 0,"/* File marked by "rm" to become unmanaged */ " fnt TEXT %s" /* Filename of same file on target version */ ") /*%s()*/;", collation, collation, __func__ ); if(rc) goto dberr; /* Add files found in the current version */ rc = fsl_db_exec_multi(dbC, "INSERT OR IGNORE INTO fv(" "fn,fnt,idv,idt,ridv," |
︙ | ︙ | |||
8131 8132 8133 8134 8135 8136 8137 | || 0==fsl_strncmp(z,"true",4)){ z = "ru"/*historical default*/; }else if(!fsl_str_bool(z)){ z = ""; } for(;*z;++z){ switch(*z){ | | | | | | | | | 7949 7950 7951 7952 7953 7954 7955 7956 7957 7958 7959 7960 7961 7962 7963 7964 7965 7966 7967 7968 7969 7970 7971 7972 7973 7974 7975 7976 7977 7978 7979 7980 7981 7982 7983 7984 7985 7986 | || 0==fsl_strncmp(z,"true",4)){ z = "ru"/*historical default*/; }else if(!fsl_str_bool(z)){ z = ""; } for(;*z;++z){ switch(*z){ case 'r': *m |= 0x001; break; case 'u': *m |= 0x010; break; case 't': *m |= 0x100; break; default: break; } } fsl_free(str); } f->cache.manifestSetting = (short)*m; } int fsl_ckout_manifest_write(fsl_cx *f, int manifest, int manifestUuid, int manifestTags, int * wrote){ fsl_db * const db = fsl_needs_ckout(f); if(!db) return FSL_RC_NOT_A_CKOUT; else if(!f->ckout.rid){ return fsl_cx_err_set(f, FSL_RC_RANGE, "Checkout RID is 0, so it has no manifest."); } int W = 0; int rc = 0; fsl_buffer * b = fsl__cx_scratchpad(f); fsl_buffer * content = &f->fileContent; char * str = 0; fsl_time_t const mtime = f->ckout.mtime>0 ? fsl_julian_to_unix(f->ckout.mtime) : 0; fsl_buffer_reuse(content); if(manifest<0 || manifestUuid<0 || manifestTags<0){ int setting = 0; |
︙ | ︙ | |||
8374 8375 8376 8377 8378 8379 8380 | (int)errLen, zFilename); } end: fsl__cx_scratchpad_yield(f, fn); return rc; } | | | | 8192 8193 8194 8195 8196 8197 8198 8199 8200 8201 8202 8203 8204 8205 8206 8207 8208 8209 8210 8211 8212 8213 8214 8215 | (int)errLen, zFilename); } end: fsl__cx_scratchpad_yield(f, fn); return rc; } bool fsl_is_rooted_in_ckout(fsl_cx *f, char const *zAbsPath){ return f->ckout.dir ? 0==fsl_strncmp(zAbsPath, f->ckout.dir, f->ckout.dirLen) /* ^^^ fossil(1) uses stricmp() there, but that's a bug. However, NOT using stricmp() on case-insensitive filesystems is arguably also a bug. */ : false; } int fsl_is_rooted_in_ckout2(fsl_cx *f, char const *zAbsPath){ int rc = 0; if(!fsl_is_rooted_in_ckout(f, zAbsPath)){ rc = fsl_cx_err_set(f, FSL_RC_RANGE, "Path is not rooted " "in the current checkout: %s", zAbsPath); } return rc; |
︙ | ︙ | |||
8421 8422 8423 8424 8425 8426 8427 | } /** Queues the directory part of the given filename into temp table fx_revert_rmdir for an eventual rmdir() attempt on it in fsl_revert_rmdir_fini(). */ | | < | > | | | | > < | | < > > > > | | > | > | > > > > | 8239 8240 8241 8242 8243 8244 8245 8246 8247 8248 8249 8250 8251 8252 8253 8254 8255 8256 8257 8258 8259 8260 8261 8262 8263 8264 8265 8266 8267 8268 8269 8270 8271 8272 8273 8274 8275 8276 8277 8278 8279 8280 8281 8282 8283 8284 8285 8286 8287 8288 8289 8290 8291 8292 8293 8294 8295 8296 8297 8298 8299 8300 8301 8302 8303 8304 | } /** Queues the directory part of the given filename into temp table fx_revert_rmdir for an eventual rmdir() attempt on it in fsl_revert_rmdir_fini(). */ static int fsl_revert_rmdir_queue(fsl_cx * f, fsl_db * db, fsl_stmt * st, char const * zFilename){ int rc = 0; if( !st->stmt ){ rc = fsl_db_exec(db, "CREATE TEMP TABLE IF NOT EXISTS " "fx_revert_rmdir(n TEXT PRIMARY KEY) " "WITHOUT ROWID /* %s() */", __func__); if(rc) goto dberr; rc = fsl_db_prepare(db, st, "INSERT OR IGNORE INTO " "fx_revert_rmdir(n) " "VALUES(fsl_dirpart(?,0)) /* %s() */", __func__); if(rc) goto dberr; } rc = fsl_stmt_bind_step(st, "s", zFilename); if(rc) goto dberr; end: return rc; dberr: rc = fsl_cx_uplift_db_error2(f, db, rc); goto end; } /** Attempts to rmdir all dirs queued by fsl_revert_rmdir_queue(). Silently ignores rmdir failure but will return non-0 for db errors. */ static int fsl_revert_rmdir_fini(fsl_cx * f, fsl_db * db){ int rc; fsl_stmt st = fsl_stmt_empty; fsl_buffer * const b = fsl__cx_scratchpad(f); rc = fsl_db_prepare(db, &st, "SELECT fsl_ckout_dir()||n " "FROM fx_revert_rmdir " "ORDER BY length(n) DESC /* %s() */", __func__); if(rc) goto dberr; while(FSL_RC_STEP_ROW == fsl_stmt_step(&st)){ fsl_size_t nDir = 0; char const * zDir = fsl_stmt_g_text(&st, 0, &nDir); fsl_buffer_reuse(b); rc = fsl_buffer_append(b, zDir, (fsl_int_t)nDir); if(rc) break; fsl_ckout_rm_empty_dirs(f, b); } end: fsl__cx_scratchpad_yield(f, b); fsl_stmt_finalize(&st); return rc; dberr: rc = fsl_cx_uplift_db_error2(f, db, rc); goto end; } int fsl_ckout_revert( fsl_cx * const f, fsl_ckout_revert_opt const * opt ){ /** Reminder to whoever works on this code: the initial implementation was done almost entirely without the benefit of |
︙ | ︙ | |||
8506 8507 8508 8509 8510 8511 8512 | if(fname->used) fsl_buffer_strip_slashes(fname); if(1==fname->used && '.'==*zNorm){ /* Special case: handle "." from ckout root intuitively */ fsl_buffer_reuse(fname); assert(0==*zNorm); } } | | | | 8333 8334 8335 8336 8337 8338 8339 8340 8341 8342 8343 8344 8345 8346 8347 8348 | if(fname->used) fsl_buffer_strip_slashes(fname); if(1==fname->used && '.'==*zNorm){ /* Special case: handle "." from ckout root intuitively */ fsl_buffer_reuse(fname); assert(0==*zNorm); } } rc = fsl_db_transaction_begin(db); if(rc) goto dberr; inTrans = true; if(opt->scanForChanges){ rc = fsl_vfile_changes_scan(f, 0, 0); if(rc) goto end; } sql = fsl__cx_scratchpad(f); rc = fsl_buffer_appendf(sql, |
︙ | ︙ | |||
8546 8547 8548 8549 8550 8551 8552 | " OR deleted<>0" " OR rid=0" " OR coalesce(origname,pathname)" " <>pathname" ")", -1); } assert(!rc); | | > > > | > | | | 8373 8374 8375 8376 8377 8378 8379 8380 8381 8382 8383 8384 8385 8386 8387 8388 8389 8390 8391 8392 8393 8394 8395 8396 8397 8398 8399 8400 8401 8402 8403 8404 8405 8406 8407 | " OR deleted<>0" " OR rid=0" " OR coalesce(origname,pathname)" " <>pathname" ")", -1); } assert(!rc); rc = fsl_db_prepare(db, &q, "%b /* %s() */", sql, __func__); fsl__cx_scratchpad_yield(f, sql); sql = 0; if(rc) goto dberr; if((!zNorm || !*zNorm) && !opt->vfileIds){ rc = fsl__ckout_clear_merge_state(f); if(rc) goto end; } while((FSL_RC_STEP_ROW==fsl_stmt_step(&q))){ fsl_id_t const id = fsl_stmt_g_id(&q, 0); fsl_id_t const rid = fsl_stmt_g_id(&q, 1); int32_t const deleted = fsl_stmt_g_int32(&q, 2); char const * const zName = fsl_stmt_g_text(&q, 3, NULL); char const * const zNameOrig = fsl_stmt_g_text(&q, 4, NULL); bool const renamed = zNameOrig ? !!fsl_strcmp(zName, zNameOrig) : false; fsl_ckout_revert_e changeType = FSL_REVERT_NONE; if(!rid){ // Added but not yet checked in. rc = fsl_db_exec(db, "DELETE FROM vfile WHERE id=%" FSL_ID_T_PFMT, id); if(rc) goto dberr; changeType = FSL_REVERT_UNMANAGE; }else{ int wasWritten = 0; if(renamed){ if((rc=fsl_mkdir_for_file(zNameOrig, true))){ rc = fsl_cx_err_set(f, rc, "mkdir() failed for file: %s", zNameOrig); |
︙ | ︙ | |||
8591 8592 8593 8594 8595 8596 8597 | } } /* Ignore any errors: this operation is an optimization, not a requirement. Worse case, the entry with the old name is left in the filesystem. */ } if(!vfUpdate.stmt){ | | | | 8422 8423 8424 8425 8426 8427 8428 8429 8430 8431 8432 8433 8434 8435 8436 8437 8438 8439 8440 8441 | } } /* Ignore any errors: this operation is an optimization, not a requirement. Worse case, the entry with the old name is left in the filesystem. */ } if(!vfUpdate.stmt){ rc = fsl_db_prepare(db, &vfUpdate, "UPDATE vfile SET chnged=0, deleted=0, " "pathname=coalesce(origname,pathname), " "origname=NULL " "WHERE id=?1 /*%s()*/", __func__); if(rc) goto dberr; } rc = fsl_stmt_bind_step(&vfUpdate, "R", id) /* Has to be done before fsl__vfile_to_ckout() because that function writes to vfile.pathname. */; if(rc) goto dberr; rc = fsl__vfile_to_ckout(f, id, &wasWritten); if(rc) break; |
︙ | ︙ | |||
8630 8631 8632 8633 8634 8635 8636 | end: if(fname) fsl__cx_scratchpad_yield(f, fname); if(sql) fsl__cx_scratchpad_yield(f, sql); fsl_stmt_finalize(&q); fsl_stmt_finalize(&vfUpdate); if(qRmdir.stmt){ fsl_stmt_finalize(&qRmdir); | | < < < | 8461 8462 8463 8464 8465 8466 8467 8468 8469 8470 8471 8472 8473 8474 8475 8476 8477 8478 8479 8480 8481 8482 8483 | end: if(fname) fsl__cx_scratchpad_yield(f, fname); if(sql) fsl__cx_scratchpad_yield(f, sql); fsl_stmt_finalize(&q); fsl_stmt_finalize(&vfUpdate); if(qRmdir.stmt){ fsl_stmt_finalize(&qRmdir); if(!rc) rc = fsl_revert_rmdir_fini(f, db); fsl_db_exec(db, "DROP TABLE IF EXISTS fx_revert_rmdir /* %s() */", __func__); } if(opt->vfileIds){ fsl_db_exec_multi(db, "DROP TABLE IF EXISTS fx_revert_id " "/* %s() */", __func__) /* Ignoring result code */; } if(inTrans){ int const rc2 = fsl_db_transaction_end(db, !!rc); if(!rc) rc = rc2; } return rc; dberr: assert(rc); |
︙ | ︙ | |||
8718 8719 8720 8721 8722 8723 8724 | fsl_time_t * repoMtime, fsl_time_t * localMtime){ int rc = 0; fsl_id_t fid = 0; fsl_fstat fst = fsl_fstat_empty; if(!fsl_needs_ckout(f)) return FSL_RC_NOT_A_CKOUT; | | | 8546 8547 8548 8549 8550 8551 8552 8553 8554 8555 8556 8557 8558 8559 8560 | fsl_time_t * repoMtime, fsl_time_t * localMtime){ int rc = 0; fsl_id_t fid = 0; fsl_fstat fst = fsl_fstat_empty; if(!fsl_needs_ckout(f)) return FSL_RC_NOT_A_CKOUT; if(0<=vid){ fsl_ckout_version_info(f, &vid, NULL); } fid = fsl_repo_filename_fnid(f, fc->name); if(fid<=0){ rc = fsl_cx_err_get(f, NULL, NULL); return rc ? rc : fsl_cx_err_set(f, FSL_RC_NOT_FOUND, "Could not resolve filename: %s", |
︙ | ︙ | |||
8748 8749 8750 8751 8752 8753 8754 | if(repoMtime){ rc = fsl_mtime_of_manifest_file(f, vid, fid, repoMtime); } return rc; } | < < < < < < < < < < < < < < < < < < < < < < < | | > < < < < < < < < | 8576 8577 8578 8579 8580 8581 8582 8583 8584 8585 8586 8587 8588 8589 8590 8591 8592 8593 8594 8595 8596 8597 8598 8599 8600 8601 8602 8603 8604 8605 8606 | if(repoMtime){ rc = fsl_mtime_of_manifest_file(f, vid, fid, repoMtime); } return rc; } #undef MARKER /* end of file checkout.c */ /* start of file cli.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ #include <string.h> /* for strchr() */ /* Only for debugging */ #include <stdio.h> #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) |
︙ | ︙ | |||
8871 8872 8873 8874 8875 8876 8877 | assert(f); if(fcli.transient.repoDbArg){ FCLI_V3(("Trying to open repo db file [%s]...\n", fcli.transient.repoDbArg)); rc = fsl_repo_open( f, fcli.transient.repoDbArg ); } else if(fcli.clientFlags.checkoutDir){ fsl_buffer dir = fsl_buffer_empty; | | > > > > | 8669 8670 8671 8672 8673 8674 8675 8676 8677 8678 8679 8680 8681 8682 8683 8684 8685 8686 8687 | assert(f); if(fcli.transient.repoDbArg){ FCLI_V3(("Trying to open repo db file [%s]...\n", fcli.transient.repoDbArg)); rc = fsl_repo_open( f, fcli.transient.repoDbArg ); } else if(fcli.clientFlags.checkoutDir){ fsl_buffer dir = fsl_buffer_empty; char const * dirName; rc = fsl_file_canonical_name(fcli.clientFlags.checkoutDir, &dir, 0); assert(!rc); dirName = (char const *)fsl_buffer_cstr(&dir); FCLI_V3(("Trying to open checkout from [%s]...\n", dirName)); rc = fsl_ckout_open_dir(f, dirName, true); FCLI_V3(("checkout open rc=%s\n", fsl_rc_cstr(rc))); /* if(FSL_RC_NOT_FOUND==rc) rc = FSL_RC_NOT_A_CKOUT; */ if(rc){ |
︙ | ︙ | |||
8939 8940 8941 8942 8943 8944 8945 | static struct { fsl_list list; } FCliFree = { fsl_list_empty_m }; static void fcli_shutdown(void){ | | | | 8741 8742 8743 8744 8745 8746 8747 8748 8749 8750 8751 8752 8753 8754 8755 8756 8757 8758 8759 8760 8761 8762 8763 8764 8765 8766 8767 8768 8769 8770 8771 8772 | static struct { fsl_list list; } FCliFree = { fsl_list_empty_m }; static void fcli_shutdown(void){ fsl_cx * f = fcli.f; int rc = 0; fsl_error_clear(&fcli.err); fsl_free(fcli.argv)/*contents are in the FCliFree list*/; if(f){ while(fsl_cx_transaction_level(f)){ MARKER(("WARNING: open db transaction at shutdown-time. " "Rolling back.\n")); fsl_cx_transaction_end(f, true); } if(1 && fsl_cx_db_ckout(f)){ /* For testing/demo only: this is implicit when we call fsl_cx_finalize(). */ rc = fsl_ckout_close(f); FCLI_V3(("Closed checkout/repo db(s). rc=%s\n", fsl_rc_cstr(rc))); //assert(0==rc); } } fsl_list_clear(&FCliFree.list, fsl_list_v_fsl_free, 0); fsl_list_reserve(&FCliFree.list, 0); if(f){ |
︙ | ︙ | |||
9090 9091 9092 9093 9094 9095 9096 | if(fcli.appHelp && fcli.appHelp->callback){ fcli.appHelp->callback(); f_out("\n"); } } if(showGlobal){ if(!showApp){ | | | | | | 8892 8893 8894 8895 8896 8897 8898 8899 8900 8901 8902 8903 8904 8905 8906 8907 8908 8909 8910 8911 8912 8913 8914 8915 | if(fcli.appHelp && fcli.appHelp->callback){ fcli.appHelp->callback(); f_out("\n"); } } if(showGlobal){ if(!showApp){ f_out("Invoke --help three times to list " "both the framework- and app-level options.\n"); }else{ f_out("Invoke --help once to list only the " "app-level flags.\n"); } }else{ f_out("Invoke --help twice to list the framework-level " "options. Use --help three times to list both " "framework- and app-level options.\n"); } f_out("\nFlags which require values may be passed as " "--flag=value or --flag value.\n\n"); } int fcli_process_flags( fcli_cliflag const * defs ) { fcli_cliflag const * f; |
︙ | ︙ | |||
9564 9565 9566 9567 9568 9569 9570 | fsl_cx_user_set(f, u); fsl_free(u); } } return rc; } | | > | > > > > | < < < < < < < < < < < < | | > > > > | | > | | 9366 9367 9368 9369 9370 9371 9372 9373 9374 9375 9376 9377 9378 9379 9380 9381 9382 9383 9384 9385 9386 9387 9388 9389 9390 9391 9392 9393 9394 9395 9396 9397 9398 9399 9400 9401 9402 9403 9404 9405 9406 9407 9408 9409 9410 9411 9412 9413 9414 9415 9416 9417 9418 9419 9420 9421 9422 9423 9424 9425 9426 9427 9428 9429 9430 9431 9432 9433 9434 9435 9436 9437 9438 | fsl_cx_user_set(f, u); fsl_free(u); } } return rc; } static int fcli_setup2(int argc, char const * const * argv, const fcli_cliflag * flags){ int rc; FCliHelpState.flags = flags; rc = fcli_setup_common1(false, argc, argv); if(rc) return rc; assert(!fcli__error->code); if(fcli.transient.helpRequested){ /* Do this last so that we can get the default user name and such for display in the help text. */ fcli_help(); rc = FCLI_RC_HELP; }else if(fcli.transient.versionRequested){ f_out("libfossil version: %s\nCheckin: %s\nCheckin timestamp: %s\n", fsl_library_version(), FSL_LIB_VERSION_HASH, FSL_LIB_VERSION_TIMESTAMP); rc = FCLI_RC_HELP; }else{ rc = fcli_process_flags(flags); if(rc) assert(fcli__error->msg.used); if(!rc){ rc = fcli_setup_common2(); } } return rc; } int fcli_setup_v2(int argc, char const * const * argv, fcli_cliflag const * const cliFlags, fcli_help_info const * const helpInfo ){ if(NULL!=cliFlags) fcli.cliFlags = cliFlags; if(NULL!=helpInfo) fcli.appHelp = helpInfo; if(fcli.cliFlags){ return fcli_setup2(argc, argv, fcli.cliFlags); } int rc = fcli_setup_common1(true, argc, argv); if(!rc){ //f_out("fcli.transient.helpRequested=%d\n",fcli.transient.helpRequested); if(fcli.transient.helpRequested){ /* Do this last so that we can get the default user name and such for display in the help text. */ fcli_help(); rc = FCLI_RC_HELP; }else{ if( fcli_flag2(NULL, "no-checkout", NULL) ){ fcli.clientFlags.checkoutDir = NULL; } fcli_flag2(NULL,"user", &fcli.transient.userArg); fcli.config.traceSql = fcli_flag2(NULL,"trace-sql", NULL); fcli_flag2("R", "repo", &fcli.transient.repoDbArg); rc = fcli_setup_common2(); } } return rc; } int fcli_setup(int argc, char const * const * argv ){ return fcli_setup_v2(argc, argv, NULL, NULL); } int fcli_err_report2(bool clear, char const * file, int line){ int errRc = 0; char const * msg = NULL; errRc = fsl_error_get( fcli__error, &msg, NULL ); if(!errRc && fcli.f && fcli.f->interrupted){ |
︙ | ︙ | |||
9840 9841 9842 9843 9844 9845 9846 | f_out(" (aliases: "); while ( *alias!=0 ){ f_out("%s%s", alias, *(strchr(alias, 0) + 1) ? ", " : ")\n"); alias = strchr(alias, 0) + 1; } } | | < | 9640 9641 9642 9643 9644 9645 9646 9647 9648 9649 9650 9651 9652 9653 9654 9655 9656 9657 | f_out(" (aliases: "); while ( *alias!=0 ){ f_out("%s%s", alias, *(strchr(alias, 0) + 1) ? ", " : ")\n"); alias = strchr(alias, 0) + 1; } } void fcli_fax(void * mem){ if(mem){ fsl_list_append( &FCliFree.list, mem ); } } int fcli_ckout_show_info(bool useUtc){ fsl_cx * const f = fcli_cx(); int rc = 0; fsl_stmt st = fsl_stmt_empty; fsl_db * const dbR = fsl_cx_db_repo(f); |
︙ | ︙ | |||
9870 9871 9872 9873 9874 9875 9876 | assert((uuid && (rid>0)) || (!uuid && (0==rid))); f_out("%*s %s\n", lblWidth, "repository-db:", fsl_cx_db_file_repo(f, NULL)); f_out("%*s %s\n", lblWidth, "checkout-root:", fsl_cx_ckout_dir_name(f, NULL)); | | | > | | < < < < < < < < < < < < < < < < < < < < < < < < | | > > > > | 9669 9670 9671 9672 9673 9674 9675 9676 9677 9678 9679 9680 9681 9682 9683 9684 9685 9686 9687 9688 9689 9690 9691 9692 9693 9694 9695 9696 9697 9698 9699 9700 9701 9702 9703 9704 9705 9706 9707 9708 9709 9710 9711 9712 9713 9714 9715 9716 9717 9718 9719 9720 9721 9722 9723 9724 9725 9726 9727 9728 9729 9730 9731 9732 9733 9734 9735 9736 9737 9738 9739 9740 9741 9742 9743 9744 9745 9746 9747 9748 9749 9750 9751 9752 9753 9754 9755 9756 9757 9758 9759 9760 9761 9762 9763 9764 9765 | assert((uuid && (rid>0)) || (!uuid && (0==rid))); f_out("%*s %s\n", lblWidth, "repository-db:", fsl_cx_db_file_repo(f, NULL)); f_out("%*s %s\n", lblWidth, "checkout-root:", fsl_cx_ckout_dir_name(f, NULL)); rc = fsl_db_prepare(dbR, &st, "SELECT " /*0*/"datetime(event.mtime%s) AS timestampString, " /*1*/"coalesce(euser, user) AS user, " /*2*/"(SELECT group_concat(substr(tagname,5), ', ') FROM tag, tagxref " "WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid " "AND tagxref.rid=blob.rid AND tagxref.tagtype>0) as tags, " /*3*/"coalesce(ecomment, comment) AS comment, " /*4*/"uuid AS uuid " "FROM event JOIN blob " "WHERE " "event.type='ci' " "AND blob.rid=%"FSL_ID_T_PFMT" " "AND blob.rid=event.objid " "ORDER BY event.mtime DESC", useUtc ? "" : ", 'localtime'", rid); if(rc) goto dberr; if( FSL_RC_STEP_ROW != fsl_stmt_step(&st)){ /* fcli_err_set(FSL_RC_ERROR, "Event data for checkout not found."); */ f_out("\nNo 'event' data found. This is only normal for an empty repo.\n"); goto end; } f_out("%*s %s %s %s (RID %"FSL_ID_T_PFMT")\n", lblWidth, "checkout-version:", fsl_stmt_g_text(&st, 4, NULL), fsl_stmt_g_text(&st, 0, NULL), useUtc ? "UTC" : "local", rid ); { /* list parent(s) */ fsl_stmt stP = fsl_stmt_empty; rc = fsl_db_prepare(dbR, &stP, "SELECT " "uuid, pid, isprim " "FROM plink JOIN blob ON pid=rid " "WHERE cid=%"FSL_ID_T_PFMT" " "ORDER BY isprim DESC, mtime DESC /*sort*/", rid); if(rc) goto dberr; while( FSL_RC_STEP_ROW == fsl_stmt_step(&stP) ){ char const * zLabel = fsl_stmt_g_int32(&stP,2) ? "parent:" : "merged-from:"; f_out("%*s %s\n", lblWidth, zLabel, fsl_stmt_g_text(&stP, 0, NULL)); } fsl_stmt_finalize(&stP); } { /* list children */ fsl_stmt stC = fsl_stmt_empty; rc = fsl_db_prepare(dbR, &stC, "SELECT " "uuid, cid, isprim " "FROM plink JOIN blob ON cid=rid " "WHERE pid=%"FSL_ID_T_PFMT" " "ORDER BY isprim DESC, mtime DESC /*sort*/", rid); if(rc) goto dberr; while( FSL_RC_STEP_ROW == fsl_stmt_step(&stC) ){ char const * zLabel = fsl_stmt_g_int32(&stC,2) ? "child:" : "merged-into:"; f_out("%*s %s\n", lblWidth, zLabel, fsl_stmt_g_text(&stC, 0, NULL)); } fsl_stmt_finalize(&stC); } f_out("%*s %s\n", lblWidth, "user:", fsl_stmt_g_text(&st, 1, NULL)); f_out("%*s %s\n", lblWidth, "tags:", fsl_stmt_g_text(&st, 2, NULL)); f_out("%*s %s\n", lblWidth, "comment:", fsl_stmt_g_text(&st, 3, NULL)); dberr: if(rc){ fsl_cx_uplift_db_error(f, dbR); } end: fsl_stmt_finalize(&st); return rc; } static int fsl_stmt_each_f_ambiguous( fsl_stmt * stmt, void * state ){ |
︙ | ︙ | |||
10039 10040 10041 10042 10043 10044 10045 | fsl_db * fcli_needs_repo(void){ if(fcli.f) return fsl_needs_repo(fcli.f); fcli_err_set(FSL_RC_NOT_A_REPO, "No repository db is opened."); return NULL; } | | < | 9819 9820 9821 9822 9823 9824 9825 9826 9827 9828 9829 9830 9831 9832 9833 | fsl_db * fcli_needs_repo(void){ if(fcli.f) return fsl_needs_repo(fcli.f); fcli_err_set(FSL_RC_NOT_A_REPO, "No repository db is opened."); return NULL; } int fcli_args_to_vfile_ids(fsl_id_bag *tgt, fsl_id_t vid, bool relativeToCwd, bool changedFilesOnly){ if(!fcli.argc){ return fcli_err_set(FSL_RC_MISUSE, "No file/dir name arguments provided."); } int rc = 0; |
︙ | ︙ | |||
10083 10084 10085 10086 10087 10088 10089 | return zEnd+1; default: break; } } return zEnd; } | | | 9862 9863 9864 9865 9866 9867 9868 9869 9870 9871 9872 9873 9874 9875 9876 | return zEnd+1; default: break; } } return zEnd; } void fcli_diff_colors(fsl_diff_opt * const tgt, fcli_diff_colors_e theme){ char const * zIns = 0; char const * zEdit = 0; char const * zDel = 0; char const * zReset = 0; switch(theme){ case FCLI_DIFF_COLORS_RG: zIns = "\x1b[32m"; |
︙ | ︙ | |||
10138 10139 10140 10141 10142 10143 10144 | } #undef FCLI_V3 #undef fcli_empty_m #undef fcli__error #undef MARKER #undef FCLI_USE_SIGACTION | | | | 9917 9918 9919 9920 9921 9922 9923 9924 9925 9926 9927 9928 9929 9930 9931 9932 | } #undef FCLI_V3 #undef fcli_empty_m #undef fcli__error #undef MARKER #undef FCLI_USE_SIGACTION /* end of file cli.c */ /* start of file content.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
10166 10167 10168 10169 10170 10171 10172 | #include <stdio.h> #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) | | > > | | | | < | | > | | < | > | | | > | > | | | < > | > | | < < < | | < | | | | | < | | | | | < | | | | | | | | < < < < | < | | | < < < | | | | | | | < | > | | | | > | 9945 9946 9947 9948 9949 9950 9951 9952 9953 9954 9955 9956 9957 9958 9959 9960 9961 9962 9963 9964 9965 9966 9967 9968 9969 9970 9971 9972 9973 9974 9975 9976 9977 9978 9979 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 9996 9997 9998 9999 10000 10001 10002 10003 10004 10005 10006 10007 10008 10009 10010 10011 10012 10013 10014 10015 10016 10017 10018 10019 10020 10021 10022 10023 10024 10025 10026 10027 10028 10029 10030 10031 10032 10033 10034 10035 10036 10037 10038 10039 10040 10041 10042 10043 10044 10045 10046 10047 10048 10049 10050 10051 10052 10053 10054 10055 10056 10057 10058 | #include <stdio.h> #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) fsl_int_t fsl_content_size( fsl_cx * f, fsl_id_t blobRid ){ fsl_db * dbR = f ? fsl_cx_db_repo(f) : NULL; if(!f) return -3; else if(blobRid<=0) return -4; else if(!dbR) return -5; else{ int rc; fsl_int_t rv = -2; fsl_stmt * q = NULL; rc = fsl_db_prepare_cached(dbR, &q, "SELECT size FROM blob " "WHERE rid=? " "/*%s()*/",__func__); if(!rc){ rc = fsl_stmt_bind_id(q, 1, blobRid); if(!rc){ if(FSL_RC_STEP_ROW==fsl_stmt_step(q)){ rv = (fsl_int_t)fsl_stmt_g_int64(q, 0); } } fsl_stmt_cached_yield(q); } return rv; } } bool fsl_content_is_available(fsl_cx * f, fsl_id_t rid){ fsl_id_t srcid = 0; int rc = 0, depth = 0 /* Limit delta recursion depth */; while( depth++ < 100000 ){ if( fsl_id_bag_contains(&f->cache.blobContent.missing, rid) ){ return false; }else if( fsl_id_bag_contains(&f->cache.blobContent.available, rid) ){ return true; }else if( fsl_content_size(f, rid)<0 ){ fsl_id_bag_insert(&f->cache.blobContent.missing, rid) /* ignore possible OOM error */; return false; } rc = fsl_delta_src_id(f, rid, &srcid); if(rc) break; else if( 0==srcid ){ fsl_id_bag_insert(&f->cache.blobContent.available, rid); return true; } rid = srcid; } if(0==rc){ /* This "cannot happen" (never has historically, and would be indicative of what amounts to corruption in the repo). */ fsl__fatal(FSL_RC_RANGE,"delta-loop in repository"); } return false; } int fsl_content_blob( fsl_cx * const f, fsl_id_t blobRid, fsl_buffer * const tgt ){ fsl_db * const dbR = fsl_cx_db_repo(f); if(blobRid<=0) return FSL_RC_RANGE; else if(!dbR) return FSL_RC_NOT_A_REPO; else{ int rc; fsl_stmt * q = NULL; rc = fsl_db_prepare_cached( dbR, &q, "SELECT content, size FROM blob " "WHERE rid=?" "/*%s()*/",__func__); if(!rc){ rc = fsl_stmt_bind_id(q, 1, blobRid); if(!rc && (FSL_RC_STEP_ROW==(rc=fsl_stmt_step(q)))){ void const * mem = NULL; fsl_size_t memLen = 0; if(fsl_stmt_g_int64(q, 1)<0){ rc = fsl_cx_err_set(f, FSL_RC_PHANTOM, "Cannot fetch content for phantom " "blob #%"FSL_ID_T_PFMT".", blobRid); }else{ tgt->used = 0; fsl_stmt_get_blob(q, 0, &mem, &memLen); if(mem && memLen){ rc = fsl_buffer_append(tgt, mem, memLen); if(!rc && fsl_buffer_is_compressed(tgt)){ rc = fsl_buffer_uncompress(tgt, tgt); } } } }else if(FSL_RC_STEP_DONE==rc){ rc = fsl_cx_err_set(f, FSL_RC_NOT_FOUND, "No blob found for rid %"FSL_ID_T_PFMT".", blobRid); } fsl_stmt_cached_yield(q); } if(rc && !f->error.code && dbR->error.code){ fsl_cx_uplift_db_error(f, dbR); } return rc; } } bool fsl_content_is_private(fsl_cx * const f, fsl_id_t rid){ fsl_stmt * s1 = NULL; fsl_db * db = fsl_cx_db_repo(f); int rc = db |
︙ | ︙ | |||
10313 10314 10315 10316 10317 10318 10319 10320 10321 10322 10323 10324 10325 10326 10327 10328 10329 10330 10331 10332 10333 10334 10335 10336 10337 10338 | "Fossil has no repo opened."); } else{ int rc; bool gotIt = 0; fsl_id_t nextRid; fsl__bccache * const ac = &f->cache.blobContent; if(fsl_id_bag_contains(&ac->missing, rid)){ /* Early out if we know the content is not available */ return FSL_RC_NOT_FOUND; } /* Look for the artifact in the cache first */ if(0!=(FSL_CX_F_BLOB_CACHE & f->flags) && fsl_id_bag_contains(&ac->inCache, rid) ){ fsl_size_t i; fsl__bccache_line * line; for(i=0; i<ac->used; ++i){ line = &ac->list[i]; if( line->rid==rid ){ ++ac->metrics.hits; rc = fsl_buffer_copy(tgt, &line->content); line->age = ac->nextAge++; return rc; } } } | > > < | | > | < < | < | < < | | | | < < | | | < > > > > > > > > > > > > | 10084 10085 10086 10087 10088 10089 10090 10091 10092 10093 10094 10095 10096 10097 10098 10099 10100 10101 10102 10103 10104 10105 10106 10107 10108 10109 10110 10111 10112 10113 10114 10115 10116 10117 10118 10119 10120 10121 10122 10123 10124 10125 10126 10127 10128 10129 10130 10131 10132 10133 10134 10135 10136 10137 10138 10139 10140 10141 10142 10143 10144 10145 10146 10147 10148 10149 10150 10151 10152 10153 10154 10155 10156 10157 10158 10159 10160 10161 10162 10163 10164 10165 10166 10167 10168 10169 10170 10171 10172 10173 10174 10175 10176 10177 10178 10179 10180 10181 10182 10183 10184 10185 10186 10187 10188 10189 10190 10191 10192 10193 10194 10195 10196 10197 10198 | "Fossil has no repo opened."); } else{ int rc; bool gotIt = 0; fsl_id_t nextRid; fsl__bccache * const ac = &f->cache.blobContent; fsl_buffer_reuse(tgt); if(fsl_id_bag_contains(&ac->missing, rid)){ /* Early out if we know the content is not available */ return FSL_RC_NOT_FOUND; } /* Look for the artifact in the cache first */ if(0!=(FSL_CX_F_BLOB_CACHE & f->flags) && fsl_id_bag_contains(&ac->inCache, rid) ){ fsl_size_t i; fsl__bccache_line * line; for(i=0; i<ac->used; ++i){ line = &ac->list[i]; if( line->rid==rid ){ ++ac->metrics.hits; rc = fsl_buffer_copy(tgt, &line->content); line->age = ac->nextAge++; return rc; } } } ++ac->metrics.misses; nextRid = 0; rc = fsl_delta_src_id(f, rid, &nextRid); /* MARKER(("rc=%d, nextRid=%"FSL_ID_T_PFMT"\n", rc, nextRid)); */ if(rc) return rc; if( nextRid == 0 ){ /* This is not a delta, so get its raw content. */ rc = fsl_content_blob(f, rid, tgt); gotIt = 0==rc; }else{ /* Looks like a delta, so let's expand it... */ fsl_int_t n /* number of used entries in 'a' */; fsl_int_t nAlloc = 10 /* number it items allocated in 'a' */; fsl_id_t * a = NULL /* array of rids we expand */; fsl_int_t mx; fsl_buffer delta = fsl_buffer_empty; fsl_buffer next = fsl_buffer_empty /* delta-applied content */ ; assert(nextRid>0); a = fsl_malloc( sizeof(a[0]) * nAlloc ); if(!a) return FSL_RC_OOM; a[0] = rid; a[1] = nextRid; n = 1; while( !fsl_id_bag_contains(&ac->inCache, nextRid) && !fsl_delta_src_id(f, nextRid, &nextRid) && (nextRid>0)){ /* Figure out how big n needs to be... */ ++n; if( n >= nAlloc ){ /* Expand 'a' */ void * remem; if( n > fsl_db_g_int64(db, 0, "SELECT max(rid) FROM blob")){ rc = fsl_cx_err_set(f, FSL_RC_RANGE, "Infinite loop in delta table."); goto end_delta; } nAlloc = nAlloc * 2; remem = fsl_realloc(a, nAlloc*sizeof(a[0])); if(!remem){ rc = FSL_RC_OOM; goto end_delta; } a = (fsl_id_t*)remem; } a[n] = nextRid; } /** Recursively expand deltas to get the content... */ mx = n; rc = fsl_content_get( f, a[n], tgt ); /* MARKER(("Getting content for rid #%"FSL_ID_T_PFMT", rc=%d\n", a[n], rc)); */ --n; for( ; !rc && (n>=0); --n){ rc = fsl_content_blob(f, a[n], &delta); /* MARKER(("Getting/applying delta rid #%"FSL_ID_T_PFMT", rc=%d\n", a[n], rc)); */ if(rc) goto end_delta; if(!delta.used){ assert(!"Is this possible? The fossil tree has a similar " "condition but i naively don't believe it's necessary."); continue; } next = fsl_buffer_empty; rc = fsl_buffer_delta_apply2(tgt, &delta, &next, &f->error); if(rc) goto end_delta; #if 1 /* In my (very simple) tests this cache costs us more than it saves. TODO: re-test this once we can do a 'rebuild', or something more intensive than processing a single manifest's R-card. At that point we can set a f->flags bit to enable or disable this block for per-use-case optimization purposes. We also probably want to cache fsl_deck instances instead of Manifest blobs (fsl_buffer) like fossil(1) does, otherwise this cache really doesn't save us much work/memory. 2021-03-24: in a debug build, running: f-parseparty -t c -c -q (i.e.: parse and crosslink all checkin artifacts) on the libfossil repo with 2003 checkins takes: |
︙ | ︙ | |||
10444 10445 10446 10447 10448 10449 10450 10451 | #else if(mx){/*unused var*/} fsl_buffer_clear(tgt); #endif *tgt = next; } end_delta: fsl_free(a); | > < | 10221 10222 10223 10224 10225 10226 10227 10228 10229 10230 10231 10232 10233 10234 10235 10236 | #else if(mx){/*unused var*/} fsl_buffer_clear(tgt); #endif *tgt = next; } end_delta: fsl_buffer_clear(&delta); fsl_free(a); gotIt = 0==rc; } if(!rc){ rc = fsl_id_bag_insert(gotIt ? &f->cache.blobContent.available : &f->cache.blobContent.missing, |
︙ | ︙ | |||
10476 10477 10478 10479 10480 10481 10482 | /** Mark artifact rid as being available now. Update f's cache to show that everything that was formerly unavailable because rid was missing is now available. Returns 0 on success. f must have an opened repo and rid must be valid. */ | | > | | > | 10253 10254 10255 10256 10257 10258 10259 10260 10261 10262 10263 10264 10265 10266 10267 10268 10269 10270 10271 10272 10273 10274 10275 10276 10277 10278 10279 10280 10281 10282 10283 10284 10285 10286 10287 10288 10289 10290 10291 10292 10293 10294 10295 10296 10297 | /** Mark artifact rid as being available now. Update f's cache to show that everything that was formerly unavailable because rid was missing is now available. Returns 0 on success. f must have an opened repo and rid must be valid. */ static int fsl_content_mark_available(fsl_cx * const f, fsl_id_t rid){ fsl_id_bag pending = fsl_id_bag_empty; int rc; fsl_stmt * st = NULL; fsl_db * db = fsl_cx_db_repo(f); assert(f); assert(db); assert(rid>0); if( fsl_id_bag_contains(&f->cache.blobContent.available, rid) ) return 0; rc = fsl_id_bag_insert(&pending, rid); if(rc) goto end; while( 0==rc && (rid = fsl_id_bag_first(&pending))!=0 ){ fsl_id_bag_remove(&pending, rid); rc = fsl_id_bag_insert(&f->cache.blobContent.available, rid); if(rc) goto end; fsl_id_bag_remove(&f->cache.blobContent.missing, rid); if(!st){ rc = fsl_db_prepare_cached(db, &st, "SELECT rid FROM delta " "WHERE srcid=?" "/*%s()*/",__func__); if(rc) goto end; } rc = fsl_stmt_bind_id(st, 1, rid); while( !rc && (FSL_RC_STEP_ROW==fsl_stmt_step(st)) ){ fsl_id_t const nx = fsl_stmt_g_id(st,0); assert(nx>0); rc = fsl_id_bag_insert(&pending, nx); } } end: if(st) fsl_stmt_cached_yield(st); fsl_id_bag_clear(&pending); return rc; } /** When a record is converted from a phantom to a real record, if that |
︙ | ︙ | |||
10810 10811 10812 10813 10814 10815 10816 | if(!rc){ rc = fsl_db_exec(dbR, "DELETE FROM phantom " "WHERE rid=%"FSL_ID_T_PFMT, rid /* FIXME? use cached statement? */); if( !rc && (srcId==0 || 0==fsl__bccache_check_available(f, srcId)) ){ isDephantomize = true; | | | 10589 10590 10591 10592 10593 10594 10595 10596 10597 10598 10599 10600 10601 10602 10603 | if(!rc){ rc = fsl_db_exec(dbR, "DELETE FROM phantom " "WHERE rid=%"FSL_ID_T_PFMT, rid /* FIXME? use cached statement? */); if( !rc && (srcId==0 || 0==fsl__bccache_check_available(f, srcId)) ){ isDephantomize = true; rc = fsl_content_mark_available(f, rid); } } fsl_stmt_cached_yield(s1); s1 = NULL; if(rc) goto end; #endif }else{ |
︙ | ︙ | |||
10874 10875 10876 10877 10878 10879 10880 | if( !isDephantomize && fsl_id_bag_contains(&f->cache.blobContent.missing, rid) && (srcId==0 || (0==fsl__bccache_check_available(f,srcId)))){ /* TODO: document what this is for. TODO: figure out what that is. */ | | | 10653 10654 10655 10656 10657 10658 10659 10660 10661 10662 10663 10664 10665 10666 10667 | if( !isDephantomize && fsl_id_bag_contains(&f->cache.blobContent.missing, rid) && (srcId==0 || (0==fsl__bccache_check_available(f,srcId)))){ /* TODO: document what this is for. TODO: figure out what that is. */ rc = fsl_content_mark_available(f, rid); if(rc) goto end; } if( isDephantomize ){ rc = fsl_after_dephantomize(f, rid, false); if(rc) goto end; } |
︙ | ︙ | |||
10938 10939 10940 10941 10942 10943 10944 | } /* TODO? cached query */ return 1==fsl_db_g_int32( db, 0, "SELECT 1 FROM shun WHERE uuid=%Q", zUuid); } | | | | 10717 10718 10719 10720 10721 10722 10723 10724 10725 10726 10727 10728 10729 10730 10731 10732 | } /* TODO? cached query */ return 1==fsl_db_g_int32( db, 0, "SELECT 1 FROM shun WHERE uuid=%Q", zUuid); } int fsl__content_new( fsl_cx * f, fsl_uuid_cstr uuid, bool isPrivate, fsl_id_t * newId ){ fsl_id_t rid = 0; int rc; fsl_db * db = fsl_cx_db_repo(f); fsl_stmt * s1 = NULL, * s2 = NULL; int const uuidLen = uuid ? fsl_is_uuid(uuid) : 0; if(!f || !uuid) return FSL_RC_MISUSE; else if(!uuidLen) return FSL_RC_RANGE; |
︙ | ︙ | |||
11018 11019 11020 11021 11022 11023 11024 | } } return rc; } int fsl__content_undeltify(fsl_cx * const f, fsl_id_t rid){ int rc; | | > | | > > | > > > > | > | | 10797 10798 10799 10800 10801 10802 10803 10804 10805 10806 10807 10808 10809 10810 10811 10812 10813 10814 10815 10816 10817 10818 10819 10820 10821 10822 10823 10824 10825 10826 10827 10828 10829 10830 10831 10832 10833 10834 10835 10836 10837 10838 10839 10840 10841 10842 10843 10844 10845 10846 | } } return rc; } int fsl__content_undeltify(fsl_cx * const f, fsl_id_t rid){ int rc; fsl_db * db = f ? fsl_cx_db_repo(f) : NULL; fsl_id_t srcid = 0; fsl_buffer x = fsl_buffer_empty; fsl_stmt s = fsl_stmt_empty; if(!f) return FSL_RC_MISUSE; else if(!db) return FSL_RC_NOT_A_REPO; else if(rid<=0) return FSL_RC_RANGE; rc = fsl_db_transaction_begin(db); if(rc) return fsl_cx_uplift_db_error2(f, db, rc); /* Reminder: the original impl does not do this in a transaction, _possibly_ because it's only done from places where a transaction is active (that's unconfirmed). Nested transactions are very cheap, though. */ rc = fsl_delta_src_id( f, rid, &srcid ); if(rc || srcid<=0) goto end; rc = fsl_content_get(f, rid, &x); if( rc || !x.used ) goto end; /* TODO? use cached statements */ rc = fsl_db_prepare(db, &s, "UPDATE blob SET content=?," " size=%" FSL_SIZE_T_PFMT " WHERE rid=%" FSL_ID_T_PFMT, x.used, rid); if(rc) goto dberr; rc = fsl_buffer_compress(&x, &x); if(rc) goto end; rc = fsl_stmt_bind_blob(&s, 1, x.mem, (fsl_int_t)x.used, 0); if(rc) goto dberr; rc = fsl_stmt_step(&s); if(FSL_RC_STEP_DONE==rc) rc = 0; else goto dberr; rc = fsl_db_exec(db, "DELETE FROM delta " "WHERE rid=%"FSL_ID_T_PFMT, (fsl_id_t)rid); if(rc) goto dberr; #if 0 /* fossil does not do this, but that seems like an inconsistency. On that topic Richard says: |
︙ | ︙ | |||
11083 11084 11085 11086 11087 11088 11089 | } int fsl__content_deltify(fsl_cx * f, fsl_id_t rid, fsl_id_t srcid, bool force){ fsl_id_t s; fsl_buffer data = fsl_buffer_empty; fsl_buffer src = fsl_buffer_empty; | | | > | | 10870 10871 10872 10873 10874 10875 10876 10877 10878 10879 10880 10881 10882 10883 10884 10885 10886 10887 10888 10889 | } int fsl__content_deltify(fsl_cx * f, fsl_id_t rid, fsl_id_t srcid, bool force){ fsl_id_t s; fsl_buffer data = fsl_buffer_empty; fsl_buffer src = fsl_buffer_empty; fsl_buffer delta = fsl_buffer_empty; fsl_db * db = f ? fsl_cx_db_repo(f) : NULL; int rc = 0; enum { MinSizeThreshold = 50 }; if(!f) return FSL_RC_MISUSE; else if(rid<=0 || srcid<=0) return FSL_RC_RANGE; else if(!db) return FSL_RC_NOT_A_REPO; else if( srcid==rid ) return 0; else if(!fsl_content_is_available(f, rid)){ return 0; } if(!force){ fsl_id_t tmpRid = 0; |
︙ | ︙ | |||
11133 11134 11135 11136 11137 11138 11139 | break; } } if(rc) return rc; /* As of here, don't return on error. Use (goto end) instead, or be really careful, b/c buffers might need cleaning. */ rc = fsl_content_get(f, srcid, &src); | > | | | | | | 10921 10922 10923 10924 10925 10926 10927 10928 10929 10930 10931 10932 10933 10934 10935 10936 10937 10938 10939 10940 10941 10942 10943 10944 10945 10946 10947 10948 10949 10950 10951 10952 | break; } } if(rc) return rc; /* As of here, don't return on error. Use (goto end) instead, or be really careful, b/c buffers might need cleaning. */ rc = fsl_content_get(f, srcid, &src); if(rc || (src.used < MinSizeThreshold) /* See API doc comments about minimum size to delta/undelta. */ ) goto end; rc = fsl_content_get(f, rid, &data); if(rc || (data.used < MinSizeThreshold)) goto end; rc = fsl_buffer_delta_create(&src, &data, &delta); if( !rc && (delta.used <= (data.used * 3 / 4 /* 75% */))){ fsl_stmt * s1 = NULL; fsl_stmt * s2 = NULL; rc = fsl_buffer_compress(&delta, &delta); if(rc) goto end; rc = fsl_db_prepare_cached(db, &s1, "UPDATE blob SET content=? " "WHERE rid=?/*%s()*/",__func__); if(!rc){ fsl_stmt_bind_id(s1, 2, rid); rc = fsl_stmt_bind_blob(s1, 1, delta.mem, delta.used, 0); if(!rc){ rc = fsl_db_prepare_cached(db, &s2, "REPLACE INTO delta(rid,srcid) " "VALUES(?,?)/*%s()*/",__func__); if(!rc){ fsl_stmt_bind_id(s2, 1, rid); fsl_stmt_bind_id(s2, 2, srcid); |
︙ | ︙ | |||
11180 11181 11182 11183 11184 11185 11186 | } end: if(rc && db->error.code && !f->error.code){ fsl_cx_uplift_db_error(f,db); } fsl_buffer_clear(&src); fsl_buffer_clear(&data); | | | < | | 10969 10970 10971 10972 10973 10974 10975 10976 10977 10978 10979 10980 10981 10982 10983 10984 10985 10986 10987 10988 10989 10990 10991 10992 10993 10994 10995 10996 10997 10998 10999 11000 11001 11002 11003 11004 11005 11006 11007 11008 11009 11010 11011 11012 11013 11014 11015 11016 11017 11018 11019 11020 11021 11022 | } end: if(rc && db->error.code && !f->error.code){ fsl_cx_uplift_db_error(f,db); } fsl_buffer_clear(&src); fsl_buffer_clear(&data); fsl_buffer_clear(&delta); return rc; } /** Removes all entries from the repo's blob table which are listed in the shun table. */ int fsl__repo_shun_artifacts(fsl_cx * const f){ fsl_stmt q = fsl_stmt_empty; int rc; fsl_db * db = f ? fsl_cx_db_repo(f) : NULL; if(!f) return FSL_RC_MISUSE; else if(!db) return FSL_RC_NOT_A_REPO; rc = fsl_db_transaction_begin(db); if(rc) return rc; rc = fsl_db_exec_multi(db, "CREATE TEMP TABLE IF NOT EXISTS " "toshun(rid INTEGER PRIMARY KEY);" "INSERT INTO toshun SELECT rid FROM blob, shun " "WHERE blob.uuid=shun.uuid;" ); if(rc) goto end; /* Ensure that deltas generated from the to-be-shunned data are unpacked into non-delta form... */ rc = fsl_db_prepare(db, &q, "SELECT rid FROM delta WHERE srcid IN toshun" ); if(rc) goto end; while( !rc && (FSL_RC_STEP_ROW==fsl_stmt_step(&q)) ){ fsl_id_t const srcid = fsl_stmt_g_id(&q, 0); rc = fsl__content_undeltify(f, srcid); } fsl_stmt_finalize(&q); if(!rc){ rc = fsl_db_exec_multi(db, "DELETE FROM delta WHERE rid IN toshun;" "DELETE FROM blob WHERE rid IN toshun;" "DROP TABLE toshun;" "DELETE FROM private " "WHERE NOT EXISTS " "(SELECT 1 FROM blob WHERE rid=private.rid);" ); } end: if(!rc) rc = fsl_db_transaction_commit(db); |
︙ | ︙ | |||
11249 11250 11251 11252 11253 11254 11255 | return rc ? fsl_cx_uplift_db_error(f, db) : 0; } /** Load the record ID rid and up to N-1 closest ancestors into the "fsl_computed_ancestors" table. */ | | | > > > | > > > | < < | < | | | 11037 11038 11039 11040 11041 11042 11043 11044 11045 11046 11047 11048 11049 11050 11051 11052 11053 11054 11055 11056 11057 11058 11059 11060 11061 11062 11063 11064 11065 11066 11067 11068 11069 11070 11071 11072 11073 11074 11075 11076 11077 11078 11079 11080 11081 11082 11083 11084 11085 11086 11087 11088 11089 11090 11091 11092 11093 11094 11095 11096 11097 11098 11099 11100 11101 11102 11103 | return rc ? fsl_cx_uplift_db_error(f, db) : 0; } /** Load the record ID rid and up to N-1 closest ancestors into the "fsl_computed_ancestors" table. */ static int fsl_compute_ancestors( fsl_db * db, fsl_id_t rid, int N, char directOnly ){ fsl_stmt st = fsl_stmt_empty; int rc = fsl_db_prepare(db, &st, "WITH RECURSIVE " " ancestor(rid, mtime) AS (" " SELECT ?, mtime " " FROM event WHERE objid=? " " UNION " " SELECT plink.pid, event.mtime" " FROM ancestor, plink, event" " WHERE plink.cid=ancestor.rid" " AND event.objid=plink.pid %s" " ORDER BY mtime DESC LIMIT ?" " )" "INSERT INTO fsl_computed_ancestors" " SELECT rid FROM ancestor;", directOnly ? "AND plink.isPrim" : "" ); if(!rc){ fsl_stmt_bind_id(&st, 1, rid); fsl_stmt_bind_id(&st, 2, rid); fsl_stmt_bind_int32(&st, 3, (int32_t)N); rc = fsl_stmt_step(&st); if(FSL_RC_STEP_DONE==rc){ rc = 0; } } fsl_stmt_finalize(&st); return rc; } int fsl_mtime_of_F_card(fsl_cx * f, fsl_id_t vid, fsl_card_F const * fc, fsl_time_t *pMTime){ if(!f || !fc) return FSL_RC_MISUSE; else if(vid<=0) return FSL_RC_RANGE; else if(!fc->uuid){ if(pMTime) *pMTime = 0; return 0; }else{ fsl_id_t fid = fsl_uuid_to_rid(f, fc->uuid); if(fid<=0){ assert(f->error.code); return f->error.code; }else{ return fsl_mtime_of_manifest_file(f, vid, fid, pMTime); } } } int fsl_mtime_of_manifest_file(fsl_cx * f, fsl_id_t vid, fsl_id_t fid, fsl_time_t *pMTime){ fsl_db * db = fsl_needs_repo(f); fsl_stmt * q = NULL; int rc; if(!db) return FSL_RC_NOT_A_REPO; if(fid<=0){ /* Only fetch the checkin time... */ int64_t i = -1; rc = fsl_db_get_int64(db, &i, "SELECT (mtime-2440587.5)*86400 " |
︙ | ︙ | |||
11324 11325 11326 11327 11328 11329 11330 | /* Computing (and keeping) ancestors is relatively costly, so we keep only the copy associated with f->cache.mtimeManifest around. For the general case, we will be feeding this function files from the same manifest. */ f->cache.mtimeManifest = vid; | | | | < | | 11115 11116 11117 11118 11119 11120 11121 11122 11123 11124 11125 11126 11127 11128 11129 11130 11131 11132 11133 | /* Computing (and keeping) ancestors is relatively costly, so we keep only the copy associated with f->cache.mtimeManifest around. For the general case, we will be feeding this function files from the same manifest. */ f->cache.mtimeManifest = vid; rc = fsl_db_exec_multi(db,"DROP TABLE IF EXISTS temp.fsl_computed_ancestors;" "CREATE TEMP TABLE fsl_computed_ancestors" "(x INTEGER PRIMARY KEY);"); if(!rc){ rc = fsl_compute_ancestors(db, vid, 1000000, 1); } if(rc){ fsl_cx_uplift_db_error(f, db); return rc; } } rc = fsl_db_prepare_cached(db, &q, |
︙ | ︙ | |||
11353 11354 11355 11356 11357 11358 11359 | rc = 0; if(pMTime) *pMTime = (fsl_time_t)fsl_stmt_g_int64(q, 0); }else{ assert(rc); if(FSL_RC_STEP_DONE==rc) rc = FSL_RC_NOT_FOUND; } fsl_stmt_cached_yield(q); | < < | | 11143 11144 11145 11146 11147 11148 11149 11150 11151 11152 11153 11154 11155 11156 11157 11158 11159 11160 11161 11162 | rc = 0; if(pMTime) *pMTime = (fsl_time_t)fsl_stmt_g_int64(q, 0); }else{ assert(rc); if(FSL_RC_STEP_DONE==rc) rc = FSL_RC_NOT_FOUND; } fsl_stmt_cached_yield(q); } return rc; } int fsl_card_F_content( fsl_cx * f, fsl_card_F const * fc, fsl_buffer * dest ){ if(!f || !fc || !dest) return FSL_RC_MISUSE; else if(!fc->uuid){ return fsl_cx_err_set(f, FSL_RC_RANGE, "Cannot fetch content of a deleted file " "because it has no UUID."); } else if(!fsl_needs_repo(f)) return FSL_RC_NOT_A_REPO; |
︙ | ︙ | |||
11424 11425 11426 11427 11428 11429 11430 11431 11432 11433 11434 11435 11436 11437 11438 11439 | */ int fsl_import_file( fsl_cx * f, char relativeToCwd, char const * zName, fsl_id_t parentRid, fsl_id_t *rid, fsl_uuid_str * uuid ){ fsl_buffer * canon = 0; // canonicalized filename fsl_buffer * nbuf = 0; // filename buffer char const * fn; int rc; fsl_id_t fnid = 0; fsl_id_t rcRid = 0; fsl_db * db = f ? fsl_needs_repo(f) : NULL; char inTrans = 0; if(!zName || !*zName) return FSL_RC_MISUSE; else if(!f->ckout.dir) return FSL_RC_NOT_A_CKOUT; else if(!db) return FSL_RC_NOT_A_REPO; | > < > | 11212 11213 11214 11215 11216 11217 11218 11219 11220 11221 11222 11223 11224 11225 11226 11227 11228 11229 11230 11231 11232 11233 11234 11235 11236 11237 11238 11239 | */ int fsl_import_file( fsl_cx * f, char relativeToCwd, char const * zName, fsl_id_t parentRid, fsl_id_t *rid, fsl_uuid_str * uuid ){ fsl_buffer * canon = 0; // canonicalized filename fsl_buffer * nbuf = 0; // filename buffer fsl_buffer * fbuf = &f->fileContent; // file content buffer char const * fn; int rc; fsl_id_t fnid = 0; fsl_id_t rcRid = 0; fsl_db * db = f ? fsl_needs_repo(f) : NULL; char inTrans = 0; if(!zName || !*zName) return FSL_RC_MISUSE; else if(!f->ckout.dir) return FSL_RC_NOT_A_CKOUT; else if(!db) return FSL_RC_NOT_A_REPO; canon = fsl__cx_scratchpad(f); nbuf = fsl__cx_scratchpad(f); assert(!fbuf->used && "Misuse of f->fileContent"); assert(f->ckout.dir); /* Normalize the name... i often regret having fsl_ckout_filename_check() return checkout-relative paths. */ rc = fsl_ckout_filename_check(f, relativeToCwd, zName, canon); if(rc) goto end; |
︙ | ︙ | |||
11582 11583 11584 11585 11586 11587 11588 | ); end: fsl_stmt_finalize(&q); return rc; } #undef MARKER | | | | 11371 11372 11373 11374 11375 11376 11377 11378 11379 11380 11381 11382 11383 11384 11385 11386 | ); end: fsl_stmt_finalize(&q); return rc; } #undef MARKER /* end of file content.c */ /* start of file config.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
12731 12732 12733 12734 12735 12736 12737 | #undef fsl__configs_get_v #undef fsl__configs_get_x1 #undef fsl__configs_get_x2 #undef SELECT_FROM_CONFIG #undef MARKER #undef ARRAYLEN | | | > < < > | 12520 12521 12522 12523 12524 12525 12526 12527 12528 12529 12530 12531 12532 12533 12534 12535 12536 12537 12538 12539 12540 12541 12542 12543 12544 12545 12546 12547 12548 12549 12550 12551 12552 12553 12554 12555 12556 12557 12558 12559 12560 12561 12562 12563 12564 12565 12566 12567 12568 12569 12570 12571 | #undef fsl__configs_get_v #undef fsl__configs_get_x1 #undef fsl__configs_get_x2 #undef SELECT_FROM_CONFIG #undef MARKER #undef ARRAYLEN /* end of file config.c */ /* start of file cx.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /************************************************************************* This file houses most of the context-related APIs. */ #if !defined(FSL_ENABLE_SQLITE_REGEXP) # define FSL_ENABLE_SQLITE_REGEXP 0 #endif #if FSL_ENABLE_SQLITE_REGEXP #endif #include "sqlite3.h" #include <assert.h> #if defined(_WIN32) # include <windows.h> # define F_OK 0 # define W_OK 2 #else # include <unistd.h> /* F_OK */ #endif #include <stdlib.h> #include <string.h> /* Only for debugging */ #include <stdio.h> #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) /** Number of fsl_cx::scratchpads buffers. */ #define FSL_CX_NSCRATCH \ |
︙ | ︙ | |||
12811 12812 12813 12814 12815 12816 12817 12818 12819 12820 12821 12822 | This function does not trigger any finializers set for f's client state or output channel. Results are undefined if !f or f's memory has not been properly initialized. */ static void fsl__cx_reset( fsl_cx * const f, bool closeDatabases ); int fsl_cx_init( fsl_cx ** tgt, fsl_cx_init_opt const * param ){ static fsl_cx_init_opt paramDefaults = fsl_cx_init_opt_default_m; int rc = 0; fsl_cx * f; | > | | 12600 12601 12602 12603 12604 12605 12606 12607 12608 12609 12610 12611 12612 12613 12614 12615 12616 12617 12618 12619 12620 | This function does not trigger any finializers set for f's client state or output channel. Results are undefined if !f or f's memory has not been properly initialized. */ static void fsl__cx_reset( fsl_cx * const f, bool closeDatabases ); int fsl_cx_init( fsl_cx ** tgt, fsl_cx_init_opt const * param ){ static fsl_cx_init_opt paramDefaults = fsl_cx_init_opt_default_m; int rc = 0; fsl_cx * f; extern int fsl_cx_install_timeline_crosslinkers(fsl_cx * const f) /*in deck.c*/; if(!tgt) return FSL_RC_MISUSE; else if(!param){ if(!paramDefaults.output.state){ paramDefaults.output.state = stdout; } param = ¶mDefaults; |
︙ | ︙ | |||
12880 12881 12882 12883 12884 12885 12886 | /* Clean up pseudo-leak valgrind complains about: https://www.sqlite.org/c3ref/auto_extension.html */; } #endif #if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE>0 sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER)); #endif | > > | > > > | > > > > > > > | | < < < < < < < < < < < < < < < < < < < < < < | | < < | | < < | > | 12670 12671 12672 12673 12674 12675 12676 12677 12678 12679 12680 12681 12682 12683 12684 12685 12686 12687 12688 12689 12690 12691 12692 12693 12694 12695 12696 12697 12698 12699 12700 12701 12702 12703 12704 12705 12706 12707 12708 12709 12710 12711 12712 12713 12714 12715 12716 12717 12718 12719 12720 12721 12722 12723 12724 12725 12726 12727 12728 12729 12730 12731 12732 12733 12734 12735 12736 12737 12738 12739 12740 12741 12742 12743 12744 12745 12746 12747 12748 12749 | /* Clean up pseudo-leak valgrind complains about: https://www.sqlite.org/c3ref/auto_extension.html */; } #endif #if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE>0 sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER)); #endif f->dbMem.f = f /* so that dbMem gets fsl_xxx() SQL funcs installed. */; rc = fsl_db_open( &f->dbMem, "", 0 ); if(!rc){ /* Attempt to ensure that the TEMP tables/indexes use FILE storage. */ rc = fsl_db_exec(&f->dbMem, "PRAGMA temp_store=FILE;"); } if(!rc){ rc = fsl_cx_install_timeline_crosslinkers(f); } if(rc){ if(f->dbMem.error.code){ fsl_cx_uplift_db_error(f, &f->dbMem); } }else{ f->dbMain = &f->dbMem; f->dbMem.role = FSL_DBROLE_MAIN; } return rc; } static void fsl__cx_mcache_clear(fsl_cx * const f){ const unsigned cacheLen = (unsigned)(sizeof(fsl__mcache_empty.aAge) /sizeof(fsl__mcache_empty.aAge[0])); for(unsigned i = 0; i < cacheLen; ++i){ fsl_deck_finalize(&f->cache.mcache.decks[i]); } f->cache.mcache = fsl__mcache_empty; } static void fsl__cx_reset(fsl_cx * const f, bool closeDatabases){ fsl_checkin_discard(f); #define SFREE(X) fsl_free(X); X = NULL if(closeDatabases){ fsl_cx_close_dbs(f); /* Reminder: f->dbMem is NOT closed here: it's an internal detail, not public state. We could arguably close and reopen it here, but then we introduce a potenital error case (OOM) where we currently have none (thus the void return). 2021-11-09: it turns out we've had an error case all along here: if any cached statements are opened for one of the dbs, that can prohibit its detachement. */ SFREE(f->ckout.dir); f->ckout.dirLen = 0; /* assert(NULL==f->dbMain); */ } SFREE(f->repo.user); SFREE(f->ckout.uuid); SFREE(f->cache.projectCode); #undef SFREE fsl_error_clear(&f->error); f->interrupted = 0; fsl__card_J_list_free(&f->ticket.customFields, 1); fsl_buffer_clear(&f->fileContent); for(int i = 0; i < FSL_CX_NSCRATCH; ++i){ fsl_buffer_clear(&f->scratchpads.buf[i]); f->scratchpads.used[i] = false; } fsl__bccache_clear(&f->cache.blobContent); fsl__cx_mcache_clear(f); fsl_id_bag_clear(&f->cache.leafCheck); fsl_id_bag_clear(&f->cache.toVerify); fsl__cx_clear_mf_seen(f, true); assert(NULL==f->cache.mfSeen.list); if(f->xlinkers.list){ fsl_free(f->xlinkers.list); f->xlinkers = fsl_xlinker_list_empty; } #define SLIST(L) fsl_list_visit_free(L, 1) #define GLOBL(X) SLIST(&f->cache.globs.X) |
︙ | ︙ | |||
12980 12981 12982 12983 12984 12985 12986 | void fsl__cx_clear_mf_seen(fsl_cx * const f, bool freeMemory){ if(freeMemory) fsl_id_bag_clear(&f->cache.mfSeen); else fsl_id_bag_reset(&f->cache.mfSeen); } void fsl_cx_finalize( fsl_cx * const f ){ | | > < > | 12757 12758 12759 12760 12761 12762 12763 12764 12765 12766 12767 12768 12769 12770 12771 12772 12773 12774 12775 12776 12777 12778 12779 12780 12781 | void fsl__cx_clear_mf_seen(fsl_cx * const f, bool freeMemory){ if(freeMemory) fsl_id_bag_clear(&f->cache.mfSeen); else fsl_id_bag_reset(&f->cache.mfSeen); } void fsl_cx_finalize( fsl_cx * const f ){ void const * allocStamp = f ? f->allocStamp : NULL; if(!f) return; if(f->clientState.finalize.f){ f->clientState.finalize.f( f->clientState.finalize.state, f->clientState.state ); } f->clientState = fsl_state_empty; f->output = fsl_outputer_empty; fsl__cx_reset(f, true); fsl_db_close(&f->dbMem); *f = fsl_cx_empty; if(&fsl_cx_empty == allocStamp){ fsl_free(f); }else{ f->allocStamp = allocStamp; } |
︙ | ︙ | |||
13016 13017 13018 13019 13020 13021 13022 13023 13024 13025 13026 13027 13028 13029 | sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER)); #endif } void fsl_cx_err_reset(fsl_cx * const f){ //f->interrupted = 0; // No! ONLY modify this via fsl_cx_interrupt() fsl_error_reset(&f->error); fsl_db_err_reset(&f->repo.db); fsl_db_err_reset(&f->config.db); fsl_db_err_reset(&f->ckout.db); } int fsl_cx_err_set_e( fsl_cx * const f, fsl_error * const err ){ if(!f) return FSL_RC_MISUSE; | > | 12794 12795 12796 12797 12798 12799 12800 12801 12802 12803 12804 12805 12806 12807 12808 | sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER)); #endif } void fsl_cx_err_reset(fsl_cx * const f){ //f->interrupted = 0; // No! ONLY modify this via fsl_cx_interrupt() fsl_error_reset(&f->error); fsl_db_err_reset(&f->dbMem); fsl_db_err_reset(&f->repo.db); fsl_db_err_reset(&f->config.db); fsl_db_err_reset(&f->ckout.db); } int fsl_cx_err_set_e( fsl_cx * const f, fsl_error * const err ){ if(!f) return FSL_RC_MISUSE; |
︙ | ︙ | |||
13116 13117 13118 13119 13120 13121 13122 | assert(db && "misuse: no DB handle to uplift error from!"); if(db->error.code) rc = fsl_cx_uplift_db_error(f, db); } return rc; } fsl_db * fsl_cx_db_config( fsl_cx * const f ){ | > > | > > | | 12895 12896 12897 12898 12899 12900 12901 12902 12903 12904 12905 12906 12907 12908 12909 12910 12911 12912 12913 12914 12915 12916 12917 | assert(db && "misuse: no DB handle to uplift error from!"); if(db->error.code) rc = fsl_cx_uplift_db_error(f, db); } return rc; } fsl_db * fsl_cx_db_config( fsl_cx * const f ){ if(!f) return NULL; else if(f->dbMain && (FSL_DBROLE_CONFIG & f->dbMain->role)) return f->dbMain; else if(f->config.db.dbh) return &f->config.db; else return NULL; } fsl_db * fsl_cx_db_repo( fsl_cx * const f ){ if(!f) return NULL; else if(f->dbMain && (FSL_DBROLE_REPO & f->dbMain->role)) return f->dbMain; else if(f->repo.db.dbh) return &f->repo.db; else return NULL; } fsl_db * fsl_needs_repo(fsl_cx * const f){ fsl_db * const db = fsl_cx_db_repo(f); if(!db){ |
︙ | ︙ | |||
13144 13145 13146 13147 13148 13149 13150 | fsl_cx_err_set(f, FSL_RC_NOT_A_CKOUT, "Fossil context has no opened checkout db."); } return db; } fsl_db * fsl_cx_db_ckout( fsl_cx * const f ){ | > | | > > > > > > > > > > > > > | | < < < < < < < < < < < < < < < | | < < < | < < | < < < | < | < < < > | | | < < < < < < < < < < > | | | | | | | | | < < < < < < < < < < < < | | > > > > > > | | | | > > > > > > > > > > > > > > > > > > > > | > | | | < > < < < | | | < > | | | < < < < < < < < < | < < < < > | < | < < < < < < < | < < < < < < < < < < < < < < < | | | < < < | | | | | | < < > | < > | < > | | > | | < < < < | < < < < < > | < | > | > | > > > > | > > | > > | < < > > > > > > > > > > > > > > > > > > > > > > > | > | | | 12927 12928 12929 12930 12931 12932 12933 12934 12935 12936 12937 12938 12939 12940 12941 12942 12943 12944 12945 12946 12947 12948 12949 12950 12951 12952 12953 12954 12955 12956 12957 12958 12959 12960 12961 12962 12963 12964 12965 12966 12967 12968 12969 12970 12971 12972 12973 12974 12975 12976 12977 12978 12979 12980 12981 12982 12983 12984 12985 12986 12987 12988 12989 12990 12991 12992 12993 12994 12995 12996 12997 12998 12999 13000 13001 13002 13003 13004 13005 13006 13007 13008 13009 13010 13011 13012 13013 13014 13015 13016 13017 13018 13019 13020 13021 13022 13023 13024 13025 13026 13027 13028 13029 13030 13031 13032 13033 13034 13035 13036 13037 13038 13039 13040 13041 13042 13043 13044 13045 13046 13047 13048 13049 13050 13051 13052 13053 13054 13055 13056 13057 13058 13059 13060 13061 13062 13063 13064 13065 13066 13067 13068 13069 13070 13071 13072 13073 13074 13075 13076 13077 13078 13079 13080 13081 13082 13083 13084 13085 13086 13087 13088 13089 13090 13091 13092 13093 13094 13095 13096 13097 13098 13099 13100 13101 13102 13103 13104 13105 13106 13107 13108 13109 13110 13111 13112 13113 13114 13115 13116 13117 13118 13119 13120 13121 13122 13123 13124 13125 13126 13127 13128 13129 13130 13131 13132 13133 13134 13135 13136 13137 13138 13139 13140 13141 13142 13143 13144 13145 13146 13147 13148 13149 13150 13151 13152 13153 13154 13155 13156 13157 13158 13159 13160 13161 13162 13163 13164 13165 13166 13167 13168 13169 13170 13171 13172 13173 13174 | fsl_cx_err_set(f, FSL_RC_NOT_A_CKOUT, "Fossil context has no opened checkout db."); } return db; } fsl_db * fsl_cx_db_ckout( fsl_cx * const f ){ if(!f) return NULL; else if(f->dbMain && (FSL_DBROLE_CKOUT & f->dbMain->role)) return f->dbMain; else if(f->ckout.db.dbh) return &f->ckout.db; else return NULL; } fsl_db * fsl_cx_db( fsl_cx * const f ){ return f ? f->dbMain : NULL; } /** @internal Returns one of f->db{Config,Repo,Ckout,Mem} or NULL. ACHTUNG and REMINDER TO SELF: the current (2021-03) design means that none of these handles except for FSL_DBROLE_MAIN actually has an sqlite3 db handle assigned to it. This returns a handle to the "level of abstraction" we need to keep track of each db's name and db-specific other state. e.g. passing a role of FSL_DBROLE_CKOUT this does NOT return the same thing as fsl_cx_db_ckout(). */ fsl_db * fsl_cx_db_for_role(fsl_cx * const f, fsl_dbrole_e r){ switch(r){ case FSL_DBROLE_CONFIG: return &f->config.db; case FSL_DBROLE_REPO: return &f->repo.db; case FSL_DBROLE_CKOUT: return &f->ckout.db; case FSL_DBROLE_MAIN: return &f->dbMem; case FSL_DBROLE_NONE: default: return NULL; } } /** Detaches the given db role from f->dbMain and removes the role from f->dbMain->role. */ static int fsl_cx_detach_role(fsl_cx * const f, fsl_dbrole_e r){ if(NULL==f->dbMain) return FSL_RC_MISUSE; else if(!(r & f->dbMain->role)){ assert(!"Misuse: cannot detach unattached role."); return FSL_RC_NOT_FOUND; } else{ fsl_db * const db = fsl_cx_db_for_role(f,r); int rc; assert(db && "Internal API misuse."); assert(f->dbMain != db); rc = fsl__db_cached_clear_role(f->dbMain, r) /* Make sure that we destroy any cached statements which are known to be tied to this db role. This is primarily a kludge for the global config db to avoid that closing it fails due to a lock held by those statements. This is a special case for the global db (as opposed to the repo/ckout dbs) because exactly when that db is opened and close is not as tightly controlled/funneled as the other dbs. */; if(0==rc){ rc = fsl_db_detach( f->dbMain, fsl_db_role_label(r) ); //MARKER(("rc=%s %s %s\n", fsl_rc_cstr(rc), fsl_db_role_label(r), // fsl_buffer_cstr(&f->dbMain->error.msg))); if(rc){ fsl_cx_uplift_db_error(f, f->dbMain); }else{ f->dbMain->role &= ~r; fsl__db_clear_strings(db, true); } } return rc; } } /** @internal Attaches the given db file to f with the given role. This function "should" be static but we need it in fsl_repo.c when creating a new repository. */ int fsl_cx_attach_role(fsl_cx * const f, const char *zDbName, fsl_dbrole_e r){ char const * label = fsl_db_role_label(r); fsl_db * const db = fsl_cx_db_for_role(f, r); char ** nameDest = NULL; int rc; if(!f->dbMain){ fsl__fatal(FSL_RC_MISUSE,"Internal API misuse: f->dbMain has " "not been set, so cannot attach role."); return FSL_RC_MISUSE; } else if(r & f->dbMain->role){ assert(!"Misuse: role is already attached."); return fsl_cx_err_set(f, FSL_RC_MISUSE, "Db role %s is already attached.", label); } #if 0 MARKER(("r=%s db=%p, ckout.db=%p\n", label, (void*)db, (void*)&f->ckout.db)); MARKER(("r=%s db=%p, repo.db=%p\n", label, (void*)db, (void*)&f->repo.db)); MARKER(("r=%s db=%p, dbMain=%p\n", label, (void*)db, (void*)f->dbMain)); #endif assert(db); assert(label); assert(f->dbMain != db); assert(!db->filename); assert(!db->name); nameDest = &db->filename; switch(r){ case FSL_DBROLE_CONFIG: case FSL_DBROLE_REPO: case FSL_DBROLE_CKOUT: break; case FSL_DBROLE_MAIN: case FSL_DBROLE_NONE: default: assert(!"cannot happen/not legal"); return FSL_RC_RANGE; } *nameDest = fsl_strdup(zDbName); db->name = *nameDest ? fsl_strdup(label) : NULL; if(!db->name){ rc = FSL_RC_OOM; /* Design note: we do the strdup() before the ATTACH because if the attach succeeds and strdup fails, detaching the db will almost certainly fail because it must allocate for its prepared statement and other internals. We would end up having to leave the db attached and returning a failure, which could lead to a memory leak (or worse) downstream. */ }else{ /*MARKER(("Attached %p role %d %s %s\n", (void const *)db, r, db->name, db->filename));*/ rc = fsl_db_attach(f->dbMain, zDbName, label); if(rc){ fsl_cx_uplift_db_error(f, f->dbMain); }else{ //MARKER(("Attached db %p %s from %s\n", // (void*)db, label, db->filename)); f->dbMain->role |= r; } } return rc; } int fsl_config_close( fsl_cx * const f ){ int rc = 0; fsl_db * const db = &f->config.db; if(f->dbMain && (FSL_DBROLE_CONFIG & f->dbMain->role)){ /* Config db is ATTACHed. */ rc = fsl_cx_detach_role(f, FSL_DBROLE_CONFIG); }else{ fsl_db_close(db); } return rc; } int fsl_repo_close( fsl_cx * const f ){ if(fsl_cx_transaction_level(f)){ return fsl_cx_err_set(f, FSL_RC_MISUSE, "Cannot close repo with an opened transaction."); }else{ int rc = 0; fsl_db * const db = &f->repo.db; if(f->dbMain && (FSL_DBROLE_REPO & f->dbMain->role)){ /* Repo db is ATTACHed. */ if(FSL_DBROLE_CKOUT & f->dbMain->role){ rc = fsl_cx_err_set(f, FSL_RC_MISUSE, "Cannot close repo while checkout is " "opened."); }else{ assert(f->dbMain!=db); rc = fsl_cx_detach_role(f, FSL_DBROLE_REPO); } }else{ fsl_db_close(db); } assert(!db->dbh); return rc; } } int fsl_ckout_close( fsl_cx * const f ){ if(fsl_cx_transaction_level(f)){ return fsl_cx_err_set(f, FSL_RC_MISUSE, "Cannot close checkout with opened transaction."); }else{ int rc = 0; fsl_db * const db = &f->ckout.db; if(f->dbMain && (FSL_DBROLE_CKOUT & f->dbMain->role)){ /* Checkout db is ATTACHed. */ rc = fsl_cx_detach_role(f, FSL_DBROLE_CKOUT); fsl_repo_close(f) /* Because the repo is implicitly opened, we "should" implicitly close it. This is debatable but "probably almost always" desired. i can't currently envisage a reasonable use-case which requires closing the checkout but keeping the repo opened. The repo can always be re-opened by itself. */; }else{ fsl_db_close(db); } fsl_free(f->ckout.uuid); f->ckout.uuid = NULL; f->ckout.rid = 0; assert(!db->dbh); return rc; } } /** If zDbName is a valid checkout database file, open it and return 0. If it is not a valid local database file, return a non-0 code. */ static int fsl_cx_ckout_open_db(fsl_cx * f, const char *zDbName){ /* char *zVFileDef; */ int rc; fsl_int_t const lsize = fsl_file_size(zDbName); if( -1 == lsize ){ return FSL_RC_NOT_FOUND /* might be FSL_RC_ACCESS? */; } if( lsize%1024!=0 || lsize<4096 ){ return fsl_cx_err_set(f, FSL_RC_RANGE, "File's size is not correct for a " "checkout db: %s", zDbName); } rc = fsl_cx_attach_role(f, zDbName, FSL_DBROLE_CKOUT); return rc; } int fsl_cx_execv( fsl_cx * const f, char const * sql, va_list args ){ int const rc = (f->dbMain && sql) ? fsl_db_execv(f->dbMain, sql, args) |
︙ | ︙ | |||
13488 13489 13490 13491 13492 13493 13494 | schema's tables. */ static int fsl_config_file_reset(fsl_cx * const f, char const * dbName){ fsl_db DB = fsl_db_empty; fsl_db * db = &DB; int rc = 0; bool isAttached = false; | | | | 13247 13248 13249 13250 13251 13252 13253 13254 13255 13256 13257 13258 13259 13260 13261 13262 13263 13264 13265 13266 13267 13268 13269 13270 13271 13272 13273 13274 | schema's tables. */ static int fsl_config_file_reset(fsl_cx * const f, char const * dbName){ fsl_db DB = fsl_db_empty; fsl_db * db = &DB; int rc = 0; bool isAttached = false; const char * zPrefix = fsl_db_role_label(FSL_DBROLE_CONFIG); if(-1 != fsl_file_size(dbName)){ rc = fsl_file_unlink(dbName); if(rc){ return fsl_cx_err_set(f, rc, "Error %s while removing old config file (%s)", fsl_rc_cstr(rc), dbName); } } /** Hoop-jumping: because the schema file has a cfg. prefix for the table(s), and we cannot assign an arbitrary name to an open()'d db, we first open the db (making the the "main" db), then ATTACH it to itself to provide the fsl_db_role_label() alias. */ rc = fsl_db_open(db, dbName, FSL_OPEN_F_RWC); if(rc) goto end; rc = fsl_db_attach(db, dbName, zPrefix); if(rc) goto end; isAttached = true; rc = fsl_db_exec_multi(db, "%s", fsl_schema_config()); |
︙ | ︙ | |||
13585 13586 13587 13588 13589 13590 13591 | int fsl_config_open( fsl_cx * const f, char const * openDbName ){ int rc = 0; const char * zDbName = 0; char * zPrefName = 0; if(fsl_cx_db_config(f)){ if(NULL==openDbName || 0==*openDbName) return 0/*nothing to do*/; | | < | 13344 13345 13346 13347 13348 13349 13350 13351 13352 13353 13354 13355 13356 13357 13358 | int fsl_config_open( fsl_cx * const f, char const * openDbName ){ int rc = 0; const char * zDbName = 0; char * zPrefName = 0; if(fsl_cx_db_config(f)){ if(NULL==openDbName || 0==*openDbName) return 0/*nothing to do*/; else fsl_config_close(f); } if(openDbName && *openDbName){ zDbName = openDbName; }else{ rc = fsl_config_global_preferred_name(&zPrefName); if(rc) goto end; zDbName = zPrefName; |
︙ | ︙ | |||
13615 13616 13617 13618 13619 13620 13621 | rc = fsl_cx_err_set(f, FSL_RC_ACCESS, "Configuration database [%s] " "must be writeable.", zDbName); goto end; } #endif assert(NULL==fsl_cx_db_config(f)); | < < < < < < < | < < < < < < | 13373 13374 13375 13376 13377 13378 13379 13380 13381 13382 13383 13384 13385 13386 13387 | rc = fsl_cx_err_set(f, FSL_RC_ACCESS, "Configuration database [%s] " "must be writeable.", zDbName); goto end; } #endif assert(NULL==fsl_cx_db_config(f)); rc = fsl_cx_attach_role(f, zDbName, FSL_DBROLE_CONFIG); end: fsl_free(zPrefName); return rc; } static void fsl_cx_username_from_repo(fsl_cx * f){ fsl_db * dbR = fsl_cx_db_repo(f); |
︙ | ︙ | |||
13722 13723 13724 13725 13726 13727 13728 | case FSL_HPOLICY_SHA1: p = FSL_HPOLICY_SHA1; break; case FSL_HPOLICY_SHUN_SHA1: p = FSL_HPOLICY_SHUN_SHA1; break; default: p = FSL_HPOLICY_AUTO; break; } f->cxConfig.hashPolicy = p; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | > > | 13467 13468 13469 13470 13471 13472 13473 13474 13475 13476 13477 13478 13479 13480 13481 13482 13483 13484 13485 13486 13487 13488 13489 13490 13491 13492 13493 13494 13495 13496 13497 13498 13499 13500 13501 13502 13503 | case FSL_HPOLICY_SHA1: p = FSL_HPOLICY_SHA1; break; case FSL_HPOLICY_SHUN_SHA1: p = FSL_HPOLICY_SHUN_SHA1; break; default: p = FSL_HPOLICY_AUTO; break; } f->cxConfig.hashPolicy = p; } int fsl_repo_open( fsl_cx * const f, char const * repoDbFile /* , bool readOnlyCurrentlyIgnored */ ){ if(fsl_cx_db_repo(f)){ return fsl_cx_err_set(f, FSL_RC_ACCESS, "Context already has an opened repository."); }else{ int rc; if(0!=fsl_file_access( repoDbFile, F_OK )){ rc = fsl_cx_err_set(f, FSL_RC_NOT_FOUND, "Repository db [%s] not found or cannot be read.", repoDbFile); }else{ rc = fsl_cx_attach_role(f, repoDbFile, FSL_DBROLE_REPO); if(!rc && !(FSL_CX_F_IS_OPENING_CKOUT & f->flags)){ rc = fsl_cx_after_open(f); } if(!rc){ fsl_db * const db = fsl_cx_db_repo(f); fsl_cx_username_from_repo(f); f->cache.allowSymlinks = fsl_config_get_bool(f, FSL_CONFDB_REPO, false, "allow-symlinks"); f->cache.seenDeltaManifest = fsl_config_get_int32(f, FSL_CONFDB_REPO, -1, "seen-delta-manifest"); fsl_cx_fetch_hash_policy(f); if(f->cxConfig.hashPolicy==FSL_HPOLICY_AUTO){ if(fsl_db_exists(db, "SELECT 1 FROM blob WHERE length(uuid)>40") || !fsl_db_exists(db, "SELECT 1 FROM blob WHERE length(uuid)==40")){ |
︙ | ︙ | |||
13857 13858 13859 13860 13861 13862 13863 | ? fsl_db_g_double(fsl_cx_db_repo(f), 0.0, "SELECT mtime FROM event " "WHERE objid=%" FSL_ID_T_PFMT, f->ckout.rid) : 0.0; } | < < < < < < < > | > > | 13562 13563 13564 13565 13566 13567 13568 13569 13570 13571 13572 13573 13574 13575 13576 13577 13578 13579 13580 13581 13582 13583 13584 13585 | ? fsl_db_g_double(fsl_cx_db_repo(f), 0.0, "SELECT mtime FROM event " "WHERE objid=%" FSL_ID_T_PFMT, f->ckout.rid) : 0.0; } int fsl__ckout_version_fetch( fsl_cx * const f ){ fsl_id_t rid = 0; int rc = 0; fsl_db * dbC = fsl_cx_db_ckout(f); fsl_db * dbR = dbC ? fsl_needs_repo(f) : NULL; assert(!dbC || (dbC && dbR)); fsl_free(f->ckout.uuid); f->ckout.rid = -1; f->ckout.uuid = NULL; f->ckout.mtime = 0.0; if(!dbC){ return 0; } fsl_cx_err_reset(f); rid = fsl_config_get_id(f, FSL_CONFDB_CKOUT, -1, "checkout"); //MARKER(("rc=%s rid=%d\n",fsl_rc_cstr(f->error.code), (int)rid)); if(rid>0){ |
︙ | ︙ | |||
13984 13985 13986 13987 13988 13989 13990 13991 13992 13993 13994 13995 13996 13997 | fsl_buffer * const pOut ){ int rc; fsl_int_t dLen = 0, i; enum { DbCount = 2 }; const char aDbName[DbCount][10] = { "_FOSSIL_", ".fslckout" }; fsl_buffer Buf = fsl_buffer_empty; fsl_buffer * buf = &Buf; if(dirName){ dLen = fsl_strlen(dirName); if(0==dLen) return FSL_RC_RANGE; rc = fsl_buffer_reserve( buf, (fsl_size_t)(dLen + 10) ); if(!rc) rc = fsl_buffer_append( buf, dirName, dLen ); if(rc){ fsl_buffer_clear(buf); | > | 13685 13686 13687 13688 13689 13690 13691 13692 13693 13694 13695 13696 13697 13698 13699 | fsl_buffer * const pOut ){ int rc; fsl_int_t dLen = 0, i; enum { DbCount = 2 }; const char aDbName[DbCount][10] = { "_FOSSIL_", ".fslckout" }; fsl_buffer Buf = fsl_buffer_empty; fsl_buffer * buf = &Buf; buf->used = 0; if(dirName){ dLen = fsl_strlen(dirName); if(0==dLen) return FSL_RC_RANGE; rc = fsl_buffer_reserve( buf, (fsl_size_t)(dLen + 10) ); if(!rc) rc = fsl_buffer_append( buf, dirName, dLen ); if(rc){ fsl_buffer_clear(buf); |
︙ | ︙ | |||
14070 14071 14072 14073 14074 14075 14076 | } } } fsl_buffer_clear(buf); return FSL_RC_NOT_FOUND; } | | | | | | | | < < < < < < > | | | > > > | 13772 13773 13774 13775 13776 13777 13778 13779 13780 13781 13782 13783 13784 13785 13786 13787 13788 13789 13790 13791 13792 13793 13794 13795 13796 13797 13798 13799 13800 13801 13802 13803 13804 13805 13806 13807 13808 13809 13810 13811 13812 13813 13814 13815 13816 13817 13818 13819 13820 13821 13822 13823 13824 13825 13826 13827 | } } } fsl_buffer_clear(buf); return FSL_RC_NOT_FOUND; } int fsl_cx_getcwd(fsl_cx * f, fsl_buffer * pOut){ char cwd[FILENAME_MAX] = {0}; fsl_size_t cwdLen = 0; int rc = fsl_getcwd(cwd, (fsl_size_t)sizeof(cwd), &cwdLen); if(rc){ return fsl_cx_err_set(f, rc, "Could not get current working directory!"); } rc = fsl_buffer_append(pOut, cwd, cwdLen); return rc ? fsl_cx_err_set(f, rc/*must be an OOM*/, NULL) : 0; } int fsl_ckout_open_dir( fsl_cx * f, char const * dirName, bool checkParentDirs ){ int rc; fsl_buffer Buf = fsl_buffer_empty; fsl_buffer * buf = &Buf; char const * zName; if(fsl_cx_db_ckout(f)){ return fsl_cx_err_set( f, FSL_RC_ACCESS, "A checkout is already opened. " "Close it before opening another."); } rc = fsl_ckout_db_search(dirName, checkParentDirs, buf); if(rc){ if(FSL_RC_NOT_FOUND==rc){ rc = fsl_cx_err_set(f, FSL_RC_NOT_FOUND, "Could not find checkout under [%s].", dirName ? dirName : "."); } fsl_buffer_clear(buf); return rc; } assert(buf->used>1 /* "/<FILENAME>" */); zName = fsl_buffer_cstr(buf); rc = fsl_cx_ckout_open_db(f, zName); if(rc){ fsl_buffer_clear(buf); return rc; }else{ /* Checkout db is now opened. Fiddle some internal bits... */ unsigned char * end = buf->mem+buf->used-1; /* Find dir part */ while(end>buf->mem && (unsigned char)'/'!=*end) --end; assert('/' == (char)*end && "fsl_ckout_db_search() appends '/<DBNAME>'"); |
︙ | ︙ | |||
14138 14139 14140 14141 14142 14143 14144 | rc = fsl_repo_open_for_ckout(f); f->flags &= ~FSL_CX_F_IS_OPENING_CKOUT; if(!rc) rc = fsl_cx_after_open(f); if(rc){ /* Is this sane? Is not doing it sane? */ fsl_ckout_close(f); } | < < < < | > | | > | | | < < < | | 13838 13839 13840 13841 13842 13843 13844 13845 13846 13847 13848 13849 13850 13851 13852 13853 13854 13855 13856 13857 13858 13859 13860 13861 13862 13863 13864 13865 13866 13867 13868 13869 13870 13871 13872 13873 13874 13875 | rc = fsl_repo_open_for_ckout(f); f->flags &= ~FSL_CX_F_IS_OPENING_CKOUT; if(!rc) rc = fsl_cx_after_open(f); if(rc){ /* Is this sane? Is not doing it sane? */ fsl_ckout_close(f); } return rc; } } char const * fsl_cx_db_file_for_role(fsl_cx const * f, fsl_dbrole_e r, fsl_size_t * len){ fsl_db const * db = fsl_cx_db_for_role((fsl_cx*)f, r); char const * rc = db ? db->filename : NULL; if(len) *len = fsl_strlen(rc); return rc; } char const * fsl_cx_db_name_for_role(fsl_cx const * f, fsl_dbrole_e r, fsl_size_t * len){ if(FSL_DBROLE_MAIN == r){ /* special case to be removed when f->dbMem bits are finished. */ if(len) *len=4; return "main"; }else{ fsl_db const * db = fsl_cx_db_for_role((fsl_cx*)f, r); char const * rc = db ? db->name : NULL; if(len) *len = rc ? fsl_strlen(rc) : 0; return rc; } } char const * fsl_cx_db_file_config(fsl_cx const * f, |
︙ | ︙ | |||
14376 14377 14378 14379 14380 14381 14382 | } int fsl_cx_stat(fsl_cx * const f, bool relativeToCwd, char const * zName, fsl_fstat * const tgt){ return fsl_cx_stat2(f, relativeToCwd, zName, tgt, NULL, false); } | < < < < | < < < | | | < | < < | < | < | < < < < | < < < | | | | | | | < | < > > > > > > > > | > > > > > > > > > > > > > | | 14071 14072 14073 14074 14075 14076 14077 14078 14079 14080 14081 14082 14083 14084 14085 14086 14087 14088 14089 14090 14091 14092 14093 14094 14095 14096 14097 14098 14099 14100 14101 14102 14103 14104 14105 14106 14107 14108 14109 14110 14111 14112 14113 14114 14115 14116 14117 14118 14119 14120 14121 14122 14123 14124 14125 14126 14127 14128 14129 14130 14131 14132 14133 14134 14135 14136 14137 14138 14139 14140 14141 14142 | } int fsl_cx_stat(fsl_cx * const f, bool relativeToCwd, char const * zName, fsl_fstat * const tgt){ return fsl_cx_stat2(f, relativeToCwd, zName, tgt, NULL, false); } void fsl_cx_case_sensitive_set(fsl_cx * f, bool caseSensitive){ f->cache.caseInsensitive = caseSensitive; } bool fsl_cx_is_case_sensitive(fsl_cx const * f){ return !f->cache.caseInsensitive; } char const * fsl_cx_filename_collation(fsl_cx const * f){ return f->cache.caseInsensitive ? "COLLATE nocase" : ""; } void fsl__cx_content_buffer_yield(fsl_cx * const f){ enum { MaxSize = 1024 * 1024 * 2 }; assert(f); if(f->fileContent.capacity>MaxSize){ fsl_buffer_resize(&f->fileContent, MaxSize); assert(f->fileContent.capacity<=MaxSize+1); } fsl_buffer_reuse(&f->fileContent); } fsl_error const * fsl_cx_err_get_e(fsl_cx const * f){ return f ? &f->error : NULL; } int fsl_cx_close_dbs( fsl_cx * const f ){ if(fsl_cx_transaction_level(f)){ /* Is this really necessary? */ return fsl_cx_err_set(f, FSL_RC_MISUSE, "Cannot close the databases when a " "transaction is pending."); } if(NULL==f->dbMain) return 0; int rc = 0, rc1; rc = fsl__db_cached_clear_role(f->dbMain, 0); if(rc) return fsl_cx_uplift_db_error(f, f->dbMain); rc1 = fsl_ckout_close(f); if(rc1) rc = rc1; rc1 = fsl_repo_close(f); if(rc1) rc = rc1; rc1 = fsl_config_close(f); if(rc1) rc = rc1; /* Forcibly reset the role and db strings for this case, even if closing ostensibly fails. */ f->dbMain->role = FSL_DBROLE_MAIN; fsl__db_clear_strings(&f->repo.db, true); fsl__db_clear_strings(&f->ckout.db, true); fsl__db_clear_strings(&f->config.db, true); assert(!f->repo.db.dbh); assert(!f->ckout.db.dbh); assert(!f->config.db.dbh); assert(!f->repo.db.filename); assert(!f->ckout.db.filename); assert(!f->config.db.filename); return rc; } char const * fsl_cx_glob_matches( fsl_cx * const f, int gtype, char const * str ){ int i, count = 0; char const * rv = NULL; fsl_list const * lists[] = {0,0,0}; |
︙ | ︙ | |||
14491 14492 14493 14494 14495 14496 14497 | } int fsl_cx_hash_filename( fsl_cx * f, bool useAlternate, const char * zFilename, fsl_buffer * pOut){ /* FIXME: reimplement this to stream the content in bite-sized chunks. That requires duplicating most of fsl_buffer_fill_from() and fsl_cx_hash_buffer(). */ | | | 14186 14187 14188 14189 14190 14191 14192 14193 14194 14195 14196 14197 14198 14199 14200 | } int fsl_cx_hash_filename( fsl_cx * f, bool useAlternate, const char * zFilename, fsl_buffer * pOut){ /* FIXME: reimplement this to stream the content in bite-sized chunks. That requires duplicating most of fsl_buffer_fill_from() and fsl_cx_hash_buffer(). */ fsl_buffer * content = &f->fileContent; int rc; assert(!content->used && "Internal recursive misuse of fsl_cx::fileContent"); fsl_buffer_reuse(content); rc = fsl_buffer_fill_from_filename(content, zFilename); if(!rc){ rc = fsl_cx_hash_buffer(f, useAlternate, content, pOut); } |
︙ | ︙ | |||
14599 14600 14601 14602 14603 14604 14605 | f->cache.seenDeltaManifest = 1; rc = fsl_config_set_bool(f, FSL_CONFDB_REPO, "seen-delta-manifest", 1); } return rc; } | | | | | < < | | 14294 14295 14296 14297 14298 14299 14300 14301 14302 14303 14304 14305 14306 14307 14308 14309 14310 14311 14312 14313 14314 14315 14316 14317 14318 14319 14320 14321 14322 14323 14324 14325 14326 14327 14328 14329 14330 14331 14332 14333 14334 14335 14336 14337 14338 14339 14340 14341 14342 14343 14344 14345 14346 14347 14348 14349 14350 14351 14352 14353 14354 14355 14356 14357 14358 14359 | f->cache.seenDeltaManifest = 1; rc = fsl_config_set_bool(f, FSL_CONFDB_REPO, "seen-delta-manifest", 1); } return rc; } int fsl_reserved_fn_check(fsl_cx *f, const char *zPath, fsl_int_t nPath, bool relativeToCwd){ static const int errRc = FSL_RC_RANGE; int rc = 0; char const * z1 = 0; if(nPath<0) nPath = (fsl_int_t)fsl_strlen(zPath); if(fsl_is_reserved_fn(zPath, nPath)){ return fsl_cx_err_set(f, errRc, "Filename is reserved, not legal " "for adding to a repository: %.*s", (int)nPath, zPath); } if(!(f->flags & FSL_CX_F_ALLOW_WINDOWS_RESERVED_NAMES) && fsl__is_reserved_fn_windows(zPath, nPath)){ return fsl_cx_err_set(f, errRc, "Filename is a Windows reserved name: %.*s", (int)nPath, zPath); } if((z1 = fsl_cx_db_file_for_role(f, FSL_DBROLE_REPO, NULL))){ fsl_buffer * c1 = fsl__cx_scratchpad(f); fsl_buffer * c2 = fsl__cx_scratchpad(f); rc = fsl_file_canonical_name2(relativeToCwd ? NULL : f->ckout.dir/*NULL is okay*/, z1, c1, false); if(!rc) rc = fsl_file_canonical_name2(relativeToCwd ? NULL : f->ckout.dir, zPath, c2, false); //MARKER(("\nzPath=%s\nc1=%s\nc2=%s\n", zPath, //fsl_buffer_cstr(c1), fsl_buffer_cstr(c2))); if(!rc && c1->used == c2->used && 0==fsl_stricmp(fsl_buffer_cstr(c1), fsl_buffer_cstr(c2))){ rc = fsl_cx_err_set(f, errRc, "File is the repository database: %.*s", (int)nPath, zPath); } fsl__cx_scratchpad_yield(f, c1); fsl__cx_scratchpad_yield(f, c2); if(rc) return rc; } assert(!rc); while(f->ckout.dir || relativeToCwd){ int manifestSetting = 0; fsl_ckout_manifest_setting(f, &manifestSetting); if(!manifestSetting) break; typedef struct { short flag; char const * fn; } MSetting; const MSetting M[] = { {FSL_MANIFEST_MAIN, "manifest"}, {FSL_MANIFEST_UUID, "manifest.uuid"}, {FSL_MANIFEST_TAGS, "manifest.tags"}, {0,0} }; fsl_buffer * c1 = fsl__cx_scratchpad(f); if(f->ckout.dir){ rc = fsl_ckout_filename_check(f, relativeToCwd, zPath, c1); }else{ rc = fsl_file_canonical_name2("", zPath, c1, false); } if(rc) goto yield; char const * const z = fsl_buffer_cstr(c1); |
︙ | ︙ | |||
14730 14731 14732 14733 14734 14735 14736 | "Fatal internal fsl_cx::scratchpads misuse: " "passed a non-scratchpad buffer."); } /** @internal | | | 14423 14424 14425 14426 14427 14428 14429 14430 14431 14432 14433 14434 14435 14436 14437 | "Fatal internal fsl_cx::scratchpads misuse: " "passed a non-scratchpad buffer."); } /** @internal Don't use this. Use fsl_cx_rm_empty_dirs() instead. Attempts to remove empty directories from under a checkout, starting with tgtDir and working upwards until it either cannot remove one or it reaches the top of the checkout dir. The first argument must be the canonicalized absolute path to the checkout root. The second is the length of coRoot - if it's |
︙ | ︙ | |||
14753 14754 14755 14756 14757 14758 14759 | Results are undefined if tgtDir is not an absolute path or does not have coRoot as its initial prefix. There are any number of valid reasons removal of a directory might fail, and this routine stops at the first one which does. */ | | < | | | | < | | | > > > > > | | 14446 14447 14448 14449 14450 14451 14452 14453 14454 14455 14456 14457 14458 14459 14460 14461 14462 14463 14464 14465 14466 14467 14468 14469 14470 14471 14472 14473 14474 14475 14476 14477 14478 14479 14480 14481 14482 14483 14484 14485 14486 14487 14488 14489 14490 14491 14492 14493 14494 14495 14496 14497 14498 14499 14500 14501 14502 14503 14504 14505 14506 14507 14508 14509 14510 14511 14512 14513 14514 14515 14516 | Results are undefined if tgtDir is not an absolute path or does not have coRoot as its initial prefix. There are any number of valid reasons removal of a directory might fail, and this routine stops at the first one which does. */ static unsigned fsl_rm_empty_dirs(char const *coRoot, fsl_int_t rootLen, fsl_buffer * tgtDir){ if(rootLen<0) rootLen = fsl_strlen(coRoot); char const * zAbs = fsl_buffer_cstr(tgtDir); char const * zCoDirPart = zAbs + rootLen; char * zEnd = fsl_buffer_str(tgtDir) + tgtDir->used - 1; unsigned rc = 0; assert(coRoot); if(0!=memcmp(coRoot, zAbs, (size_t)rootLen)){ assert(!"Misuse of fsl_rm_empty_dirs()"); return 0; } if(fsl_rmdir(zAbs)) return rc; ++rc; /** Now walk up each dir in the path and try to remove each, stopping when removal of one fails or we reach coRoot. */ while(zEnd>zCoDirPart){ for( ; zEnd>zCoDirPart && '/'!=*zEnd; --zEnd ){} if(zEnd==zCoDirPart) break; else if('/'==*zEnd){ *zEnd = 0; assert(zEnd>zCoDirPart); if(fsl_rmdir(zAbs)) break; ++rc; } } return rc; } unsigned int fsl_ckout_rm_empty_dirs(fsl_cx * const f, fsl_buffer * const tgtDir){ int rc = f->ckout.dir ? 0 : FSL_RC_NOT_A_CKOUT; if(!rc){ rc = fsl_rm_empty_dirs(f->ckout.dir, f->ckout.dirLen, tgtDir); } return rc; } int fsl_ckout_rm_empty_dirs_for_file(fsl_cx * const f, char const *zAbsPath){ if(!fsl_is_rooted_in_ckout(f, zAbsPath)){ assert(!"Internal API misuse!"); return FSL_RC_MISUSE; }else{ fsl_buffer * const p = fsl__cx_scratchpad(f); fsl_int_t const nAbs = (fsl_int_t)fsl_strlen(zAbsPath); int const rc = fsl_file_dirpart(zAbsPath, nAbs, p, false); if(!rc) fsl_rm_empty_dirs(f->ckout.dir, f->ckout.dirLen, p); fsl__cx_scratchpad_yield(f,p); return rc; } } bool fsl_repo_forbids_delta_manifests(fsl_cx * f){ return fsl_config_get_bool(f, FSL_CONFDB_REPO, false, "forbid-delta-manifests"); } int fsl_ckout_fingerprint_check(fsl_cx * f){ fsl_db * const db = fsl_cx_db_ckout(f); if(!db) return 0; int rc = 0; char const * zCkout = 0; char * zRepo = 0; fsl_id_t rcvCkout = 0; fsl_buffer * const buf = fsl__cx_scratchpad(f); |
︙ | ︙ | |||
14898 14899 14900 14901 14902 14903 14904 | struct tm * tm = fsl_cx_localtime(f, &clock); return tm ? mktime(tm) : 0; } #endif #undef MARKER #undef FSL_CX_NSCRATCH | | | | 14594 14595 14596 14597 14598 14599 14600 14601 14602 14603 14604 14605 14606 14607 14608 14609 | struct tm * tm = fsl_cx_localtime(f, &clock); return tm ? mktime(tm) : 0; } #endif #undef MARKER #undef FSL_CX_NSCRATCH /* end of file cx.c */ /* start of file db.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
14943 14944 14945 14946 14947 14948 14949 | */ static int fsl_list_v_fsl_stmt_finalize(void * obj, void * visitorState ){ if(obj) fsl_stmt_finalize( (fsl_stmt*)obj ); return 0; } #endif | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < > | > | > > > > > > > > > > > > > > > > > | > | 14639 14640 14641 14642 14643 14644 14645 14646 14647 14648 14649 14650 14651 14652 14653 14654 14655 14656 14657 14658 14659 14660 14661 14662 14663 14664 14665 14666 14667 14668 14669 14670 14671 14672 14673 14674 14675 14676 14677 14678 14679 14680 14681 14682 14683 14684 14685 14686 14687 14688 14689 14690 | */ static int fsl_list_v_fsl_stmt_finalize(void * obj, void * visitorState ){ if(obj) fsl_stmt_finalize( (fsl_stmt*)obj ); return 0; } #endif void fsl__db_clear_strings(fsl_db * const db, bool alsoErrorState ){ fsl_free(db->filename); db->filename = NULL; fsl_free(db->name); db->name = NULL; if(alsoErrorState) fsl_error_clear(&db->error); } int fsl_db_err_get( fsl_db const * const db, char const ** msg, fsl_size_t * len ){ return db ? fsl_error_get(&db->error, msg, len) : FSL_RC_MISUSE; } fsl_db * fsl_stmt_db( fsl_stmt * const stmt ){ return stmt ? stmt->db : NULL; } /** Resets db->error state based on the given code and the current error string from the db driver. Returns FSL_RC_DB on success, some other non-0 value on error (most likely FSL_RC_OOM while allocating the error string - that's the only other error case as long as db is opened). Results are undefined if !db or db is not opened. */ static int fsl_err_from_db( fsl_db * const db, int dbCode ){ assert(db && db->dbh); db->error.msg.used =0 ; return fsl_error_set(&db->error, FSL_RC_DB, "Db error #%d: %s", dbCode, sqlite3_errmsg(db->dbh)); } char const * fsl_stmt_sql( fsl_stmt * const stmt, fsl_size_t * const len ){ return stmt ? fsl_buffer_cstr2(&stmt->sql, len) : NULL; } char const * fsl_db_filename(fsl_db const * db, fsl_size_t * len){ if(len && db->filename) *len = fsl_strlen(db->filename); return db->filename; } |
︙ | ︙ | |||
15044 15045 15046 15047 15048 15049 15050 | } db->cacheHead = 0; } return rc; } void fsl_db_close( fsl_db * const db ){ | > | < | | | | 14726 14727 14728 14729 14730 14731 14732 14733 14734 14735 14736 14737 14738 14739 14740 14741 14742 14743 14744 14745 14746 14747 14748 14749 14750 14751 14752 14753 14754 14755 14756 14757 14758 14759 14760 14761 14762 14763 | } db->cacheHead = 0; } return rc; } void fsl_db_close( fsl_db * const db ){ if(!db) return; void const * allocStamp = db->allocStamp; fsl_cx * const f = db->f; fsl_db_stmt_cache_clear(db); if(db->f && db->f->dbMain==db){ /* Horrible, horrible dependency, and only necessary if the fsl_cx API gets sloppy or repo/checkout/config DBs are otherwised closed improperly (i.e. not via the fsl_cx API). */ assert(0 != db->role); f->dbMain = NULL; } while(db->beginCount>0){ fsl_db_transaction_end(db, 1); } if(0!=db->openStatementCount){ MARKER(("WARNING: %d open statement(s) left on db [%s].\n", (int)db->openStatementCount, db->filename)); } if(db->dbh){ sqlite3_close(db->dbh); /* ignoring results in the style of "destructors may not throw". */ } fsl__db_clear_strings(db, true); fsl_db_cleanup_beforeCommit(db); fsl_buffer_clear(&db->cachePrepBuf); *db = fsl_db_empty; if(&fsl_db_empty == allocStamp){ fsl_free( db ); |
︙ | ︙ | |||
15107 15108 15109 15110 15111 15112 15113 | char const * fsl_db_name(fsl_db const * const db){ return db ? db->name : NULL; } /** Returns the db name for the given role. */ | | > | 14789 14790 14791 14792 14793 14794 14795 14796 14797 14798 14799 14800 14801 14802 14803 14804 14805 14806 14807 14808 14809 14810 14811 14812 14813 14814 14815 14816 14817 | char const * fsl_db_name(fsl_db const * const db){ return db ? db->name : NULL; } /** Returns the db name for the given role. */ const char * fsl_db_role_label(fsl_dbrole_e r){ switch(r){ case FSL_DBROLE_CONFIG: return "cfg"; case FSL_DBROLE_REPO: return "repo"; case FSL_DBROLE_CKOUT: return "ckout"; case FSL_DBROLE_MAIN: return "main"; case FSL_DBROLE_TEMP: return "temp"; case FSL_DBROLE_NONE: default: assert(!"cannot happen/not legal"); return NULL; } } char * fsl_db_julian_to_iso8601( fsl_db * const db, double j, bool msPrecision, bool localTime){ |
︙ | ︙ | |||
15352 15353 15354 15355 15356 15357 15358 | st->flags = FSL_STMT_F_CACHE_HELD; *rv = st; } end: return rc; } | | | 15035 15036 15037 15038 15039 15040 15041 15042 15043 15044 15045 15046 15047 15048 15049 | st->flags = FSL_STMT_F_CACHE_HELD; *rv = st; } end: return rc; } int fsl_db_prepare_cached( fsl_db * db, fsl_stmt ** st, char const * sql, ... ){ int rc; va_list args; va_start(args,sql); rc = fsl_db_preparev_cached( db, st, sql, args ); va_end(args); return rc; } |
︙ | ︙ | |||
15405 15406 15407 15408 15409 15410 15411 | return rc; } int fsl_stmt_finalize( fsl_stmt * const stmt ){ if(!stmt) return FSL_RC_MISUSE; else{ void const * allocStamp = stmt->allocStamp; | | | 15088 15089 15090 15091 15092 15093 15094 15095 15096 15097 15098 15099 15100 15101 15102 | return rc; } int fsl_stmt_finalize( fsl_stmt * const stmt ){ if(!stmt) return FSL_RC_MISUSE; else{ void const * allocStamp = stmt->allocStamp; fsl_db * db = stmt->db; if(db){ if(stmt->sql.mem){ /* ^^^ b/c that buffer is set at the same time that openStatementCount is incremented. */ --stmt->db->openStatementCount; } |
︙ | ︙ | |||
15486 15487 15488 15489 15490 15491 15492 | fsl_stmt_finalize(s); break; } return rc; } int fsl_stmt_step( fsl_stmt * const stmt ){ | | > > | | | | | | | | | | 15169 15170 15171 15172 15173 15174 15175 15176 15177 15178 15179 15180 15181 15182 15183 15184 15185 15186 15187 15188 15189 15190 15191 15192 15193 15194 15195 15196 15197 15198 15199 15200 15201 15202 15203 15204 15205 15206 15207 15208 15209 15210 15211 15212 15213 15214 15215 15216 15217 15218 15219 15220 15221 15222 15223 15224 15225 15226 15227 15228 15229 15230 15231 15232 15233 15234 15235 15236 15237 15238 15239 15240 15241 15242 15243 15244 15245 15246 15247 15248 15249 15250 15251 15252 15253 15254 15255 15256 15257 15258 15259 15260 15261 | fsl_stmt_finalize(s); break; } return rc; } int fsl_stmt_step( fsl_stmt * const stmt ){ if(!stmt || !stmt->stmt) return FSL_RC_MISUSE; else{ int const rc = sqlite3_step(stmt->stmt); assert(stmt->db); switch( rc ){ case SQLITE_ROW: ++stmt->rowCount; return FSL_RC_STEP_ROW; case SQLITE_DONE: return FSL_RC_STEP_DONE; default: return fsl_error_set(&stmt->db->error, FSL_RC_STEP_ERROR, "sqlite3_step(): sqlite error #%d: %s", rc, sqlite3_errmsg(stmt->db->dbh)); } } } int fsl_db_eachv( fsl_db * db, fsl_stmt_each_f callback, void * callbackState, char const * sql, va_list args ){ if(!db || !db->dbh || !callback || !sql) return FSL_RC_MISUSE; else if(!*sql) return FSL_RC_RANGE; else{ fsl_stmt st = fsl_stmt_empty; int rc; rc = fsl_db_preparev( db, &st, sql, args ); if(!rc){ rc = fsl_stmt_each( &st, callback, callbackState ); fsl_stmt_finalize( &st ); } return rc; } } int fsl_db_each( fsl_db * db, fsl_stmt_each_f callback, void * callbackState, char const * sql, ... ){ int rc; va_list args; va_start(args,sql); rc = fsl_db_eachv( db, callback, callbackState, sql, args ); va_end(args); return rc; } int fsl_stmt_each( fsl_stmt * stmt, fsl_stmt_each_f callback, void * callbackState ){ if(!stmt || !callback) return FSL_RC_MISUSE; else{ int strc; int rc = 0; char doBreak = 0; while( !doBreak && (FSL_RC_STEP_ROW == (strc=fsl_stmt_step(stmt)))){ rc = callback( stmt, callbackState ); switch(rc){ case 0: continue; case FSL_RC_BREAK: rc = 0; /* fall through */ default: doBreak = 1; break; } } return rc ? rc : ((FSL_RC_STEP_ERROR==strc) ? FSL_RC_DB : 0); } } int fsl_stmt_reset2( fsl_stmt * const stmt, bool resetRowCounter ){ if(!stmt->stmt || !stmt->db) return FSL_RC_MISUSE; else{ int const rc = sqlite3_reset(stmt->stmt); if(resetRowCounter) stmt->rowCount = 0; assert(stmt->db); return rc ? fsl_err_from_db(stmt->db, rc) : 0; } } int fsl_stmt_reset( fsl_stmt * const stmt ){ return fsl_stmt_reset2(stmt, 0); } |
︙ | ︙ | |||
15715 15716 15717 15718 15719 15720 15721 | #define BIND_PARAM_CHECK \ if(!(stmt && stmt->stmt && stmt->db && stmt->db->dbh)) return FSL_RC_MISUSE; else #define BIND_PARAM_CHECK2 BIND_PARAM_CHECK \ if(ndx<1 || ndx>stmt->paramCount) return FSL_RC_RANGE; else int fsl_stmt_bind_null( fsl_stmt * const stmt, int ndx ){ BIND_PARAM_CHECK2 { int const rc = sqlite3_bind_null( stmt->stmt, ndx ); | | | | | | | | | 15400 15401 15402 15403 15404 15405 15406 15407 15408 15409 15410 15411 15412 15413 15414 15415 15416 15417 15418 15419 15420 15421 15422 15423 15424 15425 15426 15427 15428 15429 15430 15431 15432 15433 15434 15435 15436 15437 15438 15439 15440 15441 15442 15443 15444 15445 15446 15447 15448 15449 15450 15451 15452 15453 15454 15455 15456 15457 15458 15459 15460 15461 15462 15463 | #define BIND_PARAM_CHECK \ if(!(stmt && stmt->stmt && stmt->db && stmt->db->dbh)) return FSL_RC_MISUSE; else #define BIND_PARAM_CHECK2 BIND_PARAM_CHECK \ if(ndx<1 || ndx>stmt->paramCount) return FSL_RC_RANGE; else int fsl_stmt_bind_null( fsl_stmt * const stmt, int ndx ){ BIND_PARAM_CHECK2 { int const rc = sqlite3_bind_null( stmt->stmt, ndx ); return rc ? fsl_err_from_db(stmt->db, rc) : 0; } } int fsl_stmt_bind_int32( fsl_stmt * const stmt, int ndx, int32_t v ){ BIND_PARAM_CHECK2 { int const rc = sqlite3_bind_int( stmt->stmt, ndx, (int)v ); return rc ? fsl_err_from_db(stmt->db, rc) : 0; } } int fsl_stmt_bind_int64( fsl_stmt * const stmt, int ndx, int64_t v ){ BIND_PARAM_CHECK2 { int const rc = sqlite3_bind_int64( stmt->stmt, ndx, (sqlite3_int64)v ); return rc ? fsl_err_from_db(stmt->db, rc) : 0; } } int fsl_stmt_bind_id( fsl_stmt * const stmt, int ndx, fsl_id_t v ){ BIND_PARAM_CHECK2 { int const rc = sqlite3_bind_int64( stmt->stmt, ndx, (sqlite3_int64)v ); return rc ? fsl_err_from_db(stmt->db, rc) : 0; } } int fsl_stmt_bind_double( fsl_stmt * const stmt, int ndx, double v ){ BIND_PARAM_CHECK2 { int const rc = sqlite3_bind_double( stmt->stmt, ndx, (double)v ); return rc ? fsl_err_from_db(stmt->db, rc) : 0; } } int fsl_stmt_bind_blob( fsl_stmt * const stmt, int ndx, void const * src, fsl_size_t len, bool makeCopy ){ BIND_PARAM_CHECK2 { int rc; rc = sqlite3_bind_blob( stmt->stmt, ndx, src, (int)len, makeCopy ? SQLITE_TRANSIENT : SQLITE_STATIC ); return rc ? fsl_err_from_db(stmt->db, rc) : 0; } } int fsl_stmt_bind_text( fsl_stmt * const stmt, int ndx, char const * src, fsl_int_t len, bool makeCopy ){ BIND_PARAM_CHECK { int rc; if(len<0) len = fsl_strlen((char const *)src); rc = sqlite3_bind_text( stmt->stmt, ndx, src, len, makeCopy ? SQLITE_TRANSIENT : SQLITE_STATIC ); return rc ? fsl_err_from_db(stmt->db, rc) : 0; } } int fsl_stmt_bind_null_name( fsl_stmt * const stmt, char const * param ){ BIND_PARAM_CHECK{ return fsl_stmt_bind_null( stmt, sqlite3_bind_parameter_index( stmt->stmt, |
︙ | ︙ | |||
15886 15887 15888 15889 15890 15891 15892 | ? sqlite3_column_text(stmt->stmt, ndx) : NULL; if(out) *out = (char const *)t; if(outLen){ int const x = sqlite3_column_bytes(stmt->stmt, ndx); *outLen = (x>0) ? (fsl_size_t)x : 0; } | | | | 15571 15572 15573 15574 15575 15576 15577 15578 15579 15580 15581 15582 15583 15584 15585 15586 15587 15588 15589 15590 15591 15592 15593 15594 15595 15596 15597 15598 15599 15600 15601 15602 15603 | ? sqlite3_column_text(stmt->stmt, ndx) : NULL; if(out) *out = (char const *)t; if(outLen){ int const x = sqlite3_column_bytes(stmt->stmt, ndx); *outLen = (x>0) ? (fsl_size_t)x : 0; } return 0; } } int fsl_stmt_get_blob( fsl_stmt * const stmt, int ndx, void const **out, fsl_size_t * outLen ){ GET_CHECK { void const * t = (out || outLen) ? sqlite3_column_blob(stmt->stmt, ndx) : NULL; if(out) *out = t; if(outLen){ if(!t) *outLen = 0; else{ int sz = sqlite3_column_bytes(stmt->stmt, ndx); *outLen = (sz>=0) ? (fsl_size_t)sz : 0; } } return 0; } } #undef GET_CHECK fsl_id_t fsl_stmt_g_id( fsl_stmt * const stmt, int index ){ fsl_id_t rv = -1; |
︙ | ︙ | |||
15940 15941 15942 15943 15944 15945 15946 | char const * rv = NULL; fsl_stmt_get_text(stmt, index, &rv, outLen); return rv; } /** | | | | | > | > > > > > > | > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > | | > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > > > > > > > > > > > > > > > > | > > | > > | > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > | > > > > | > > | > > | > > > > | > > > > > > > > > > > > > > > > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > | > | > > > | | | | | | | | | | > | 15625 15626 15627 15628 15629 15630 15631 15632 15633 15634 15635 15636 15637 15638 15639 15640 15641 15642 15643 15644 15645 15646 15647 15648 15649 15650 15651 15652 15653 15654 15655 15656 15657 15658 15659 15660 15661 15662 15663 15664 15665 15666 15667 15668 15669 15670 15671 15672 15673 15674 15675 15676 15677 15678 15679 15680 15681 15682 15683 15684 15685 15686 15687 15688 15689 15690 15691 15692 15693 15694 15695 15696 15697 15698 15699 15700 15701 15702 15703 15704 15705 15706 15707 15708 15709 15710 15711 15712 15713 15714 15715 15716 15717 15718 15719 15720 15721 15722 15723 15724 15725 15726 15727 15728 15729 15730 15731 15732 15733 15734 15735 15736 15737 15738 15739 15740 15741 15742 15743 15744 15745 15746 15747 15748 15749 15750 15751 15752 15753 15754 15755 15756 15757 15758 15759 15760 15761 15762 15763 15764 15765 15766 15767 15768 15769 15770 15771 15772 15773 15774 15775 15776 15777 15778 15779 15780 15781 15782 15783 15784 15785 15786 15787 15788 15789 15790 15791 15792 15793 15794 15795 15796 15797 15798 15799 15800 15801 15802 15803 15804 15805 15806 15807 15808 15809 15810 15811 15812 15813 15814 15815 15816 15817 15818 15819 15820 15821 15822 15823 15824 15825 15826 15827 15828 15829 15830 15831 15832 15833 15834 15835 15836 15837 15838 15839 15840 15841 15842 15843 15844 15845 15846 15847 15848 15849 15850 15851 15852 15853 15854 15855 15856 15857 15858 15859 15860 15861 15862 15863 15864 15865 15866 15867 15868 15869 15870 15871 15872 15873 15874 15875 15876 15877 15878 15879 15880 15881 15882 15883 15884 15885 15886 15887 15888 15889 15890 15891 15892 15893 15894 15895 15896 15897 15898 15899 15900 15901 15902 15903 15904 15905 15906 15907 15908 15909 15910 15911 15912 15913 15914 15915 15916 15917 15918 15919 15920 15921 15922 15923 15924 15925 15926 15927 15928 15929 15930 15931 15932 15933 15934 15935 15936 15937 15938 15939 15940 15941 15942 15943 15944 15945 15946 15947 15948 15949 15950 15951 15952 15953 15954 15955 15956 15957 15958 15959 15960 15961 15962 15963 15964 15965 15966 15967 15968 15969 15970 15971 15972 15973 15974 15975 15976 15977 15978 15979 15980 15981 15982 15983 15984 15985 15986 15987 15988 15989 15990 15991 15992 15993 15994 15995 15996 15997 15998 15999 16000 16001 16002 16003 16004 16005 16006 16007 16008 16009 16010 16011 16012 16013 16014 16015 16016 16017 16018 16019 16020 16021 16022 16023 16024 16025 16026 16027 16028 16029 16030 16031 16032 16033 16034 16035 16036 16037 16038 16039 16040 16041 16042 16043 16044 16045 16046 16047 16048 16049 16050 16051 16052 16053 16054 16055 16056 16057 16058 16059 16060 16061 16062 16063 16064 16065 16066 16067 16068 16069 16070 16071 16072 16073 16074 16075 16076 16077 16078 16079 16080 16081 16082 16083 16084 16085 16086 16087 16088 16089 16090 16091 16092 16093 16094 16095 16096 16097 16098 16099 16100 16101 16102 16103 16104 16105 16106 16107 16108 16109 16110 16111 16112 16113 16114 16115 16116 16117 16118 16119 16120 16121 16122 16123 16124 16125 16126 16127 16128 16129 16130 16131 16132 16133 16134 16135 16136 16137 16138 16139 16140 16141 16142 16143 16144 16145 16146 16147 16148 16149 16150 16151 16152 16153 16154 16155 | char const * rv = NULL; fsl_stmt_get_text(stmt, index, &rv, outLen); return rv; } /** This function outputs tracing info using fsl_fprintf((FILE*)zFILE,...). Defaults to stdout if zFILE is 0. */ static void fsl_db_sql_trace(void *zFILE, const char *zSql){ int const n = fsl_strlen(zSql); static int counter = 0; /* FIXME: in v1 this uses fossil_trace(), but don't have that functionality here yet. */ fsl_fprintf(zFILE ? (FILE*)zFILE : stdout, "SQL TRACE #%d: %s%s\n", ++counter, zSql, (n>0 && zSql[n-1]==';') ? "" : ";"); } /* SQL function for debugging. The print() function writes its arguments to fsl_output() if the bound fsl_cx->cxConfig.sqlPrint flag is true. */ static void fsl_db_sql_print( sqlite3_context *context, int argc, sqlite3_value **argv ){ fsl_cx * f = (fsl_cx*)sqlite3_user_data(context); assert(f); if( f->cxConfig.sqlPrint ){ int i; for(i=0; i<argc; i++){ char c = i==argc-1 ? '\n' : ' '; fsl_outputf(f, "%s%c", sqlite3_value_text(argv[i]), c); } } } /* SQL function to return the number of seconds since 1970. This is the same as strftime('%s','now') but is more compact. */ static void fsl_db_now_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ sqlite3_result_int64(context, (sqlite3_int64)time(0)); } /* SQL function to convert a Julian Day to a Unix timestamp. */ static void fsl_db_j2u_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ double const jd = (double)sqlite3_value_double(argv[0]); sqlite3_result_int64(context, (sqlite3_int64)fsl_julian_to_unix(jd)); } /* SQL function FSL_CKOUT_DIR([bool includeTrailingSlash=1]) returns the top-level checkout directory, optionally (by default) with a trailing slash. Returns NULL if the fsl_cx instance bound to sqlite3_user_data() has no checkout. */ static void fsl_db_cx_chkout_dir_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ fsl_cx * f = (fsl_cx*)sqlite3_user_data(context); int const includeSlash = argc ? sqlite3_value_int(argv[0]) : 1; if(f && f->ckout.dir && f->ckout.dirLen){ sqlite3_result_text(context, f->ckout.dir, (int)f->ckout.dirLen - (includeSlash ? 0 : 1), SQLITE_TRANSIENT); }else{ sqlite3_result_null(context); } } /** SQL Function to return the check-in time for a file. Requires (vid,fid) RID arguments, as described for fsl_mtime_of_manifest_file(). */ static void fsl_db_checkin_mtime_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ fsl_cx * f = (fsl_cx*)sqlite3_user_data(context); fsl_time_t mtime = 0; int rc; fsl_id_t vid, fid; assert(f); vid = (fsl_id_t)sqlite3_value_int(argv[0]); fid = (fsl_id_t)sqlite3_value_int(argv[1]); rc = fsl_mtime_of_manifest_file(f, vid, fid, &mtime); if( rc==0 ){ sqlite3_result_int64(context, mtime); }else{ sqlite3_result_error(context, "fsl_mtime_of_manifest_file() failed", -1); } } static void fsl_db_content_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ fsl_cx * f = (fsl_cx*)sqlite3_user_data(context); fsl_id_t rid = 0; char const * arg; int rc; fsl_buffer b = fsl_buffer_empty; assert(f); if(1 != argc){ sqlite3_result_error(context, "Expecting one argument", -1); return; } if(SQLITE_INTEGER==sqlite3_value_type(argv[0])){ rid = (fsl_id_t)sqlite3_value_int64(argv[0]); arg = NULL; }else{ arg = (const char*)sqlite3_value_text(argv[0]); if(!arg){ sqlite3_result_error(context, "Invalid argument", -1); return; } rc = fsl_sym_to_rid(f, arg, FSL_SATYPE_CHECKIN, &rid); if(rc) goto cx_err; else if(!rid){ sqlite3_result_error(context, "No blob found", -1); return; } } rc = fsl_content_get(f, rid, &b); if(rc) goto cx_err; /* Curiously, i'm seeing no difference in allocation counts here... */ sqlite3_result_blob(context, b.mem, (int)b.used, fsl_free); b = fsl_buffer_empty; return; cx_err: fsl_buffer_clear(&b); assert(f->error.msg.used); if(FSL_RC_OOM==rc){ sqlite3_result_error_nomem(context); }else{ assert(f->error.msg.used); sqlite3_result_error(context, (char const *)f->error.msg.mem, (int)f->error.msg.used); } } static void fsl_db_sym2rid_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ fsl_cx * f = (fsl_cx*)sqlite3_user_data(context); char const * arg; assert(f); if(1 != argc){ sqlite3_result_error(context, "Expecting one argument", -1); return; } arg = (const char*)sqlite3_value_text(argv[0]); if(!arg){ sqlite3_result_error(context, "Expecting a STRING argument", -1); }else{ fsl_id_t rid = 0; int const rc = fsl_sym_to_rid(f, arg, FSL_SATYPE_CHECKIN, &rid); if(rc){ if(FSL_RC_OOM==rc){ sqlite3_result_error_nomem(context); }else{ assert(f->error.msg.used); sqlite3_result_error(context, (char const *)f->error.msg.mem, (int)f->error.msg.used); } fsl_cx_err_reset(f) /* This is arguable but keeps this error from poluting down-stream code (seen it happen in unit tests). The irony is, it's very possible/likely that the error will propagate back up into f->error at some point. */; }else{ assert(rid>0); sqlite3_result_int64(context, rid); } } } static void fsl_db_dirpart_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ char const * arg; int rc; fsl_buffer b = fsl_buffer_empty; int fSlash = 0; if(argc<1 || argc>2){ sqlite3_result_error(context, "Expecting (string) or (string,bool) arguments", -1); return; } arg = (const char*)sqlite3_value_text(argv[0]); if(!arg){ sqlite3_result_error(context, "Invalid argument", -1); return; } if(argc>1){ fSlash = sqlite3_value_int(argv[1]); } rc = fsl_file_dirpart(arg, -1, &b, fSlash ? 1 : 0); if(!rc){ if(b.used && *b.mem){ #if 0 sqlite3_result_text(context, (char const *)b.mem, (int)b.used, SQLITE_TRANSIENT); #else sqlite3_result_text(context, (char const *)b.mem, (int)b.used, fsl_free); b = fsl_buffer_empty /* we passed ^^^^^ on ownership of b.mem */; #endif }else{ sqlite3_result_null(context); } }else{ if(FSL_RC_OOM==rc){ sqlite3_result_error_nomem(context); }else{ sqlite3_result_error(context, "fsl_dirpart() failed!", -1); } } fsl_buffer_clear(&b); } /* Implement the user() SQL function. user() takes no arguments and returns the user ID of the current user. */ static void fsl_db_user_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ fsl_cx * f = (fsl_cx*)sqlite3_user_data(context); assert(f); if(f->repo.user){ sqlite3_result_text(context, f->repo.user, -1, SQLITE_STATIC); }else{ sqlite3_result_null(context); } } /** SQL function: fsl_is_enqueued(vfile.id) fsl_if_enqueued(vfile.id, X, Y) On the commit command, when filenames are specified (in order to do a partial commit) the vfile.id values for the named files are loaded into the fsl_cx state. This function looks at that state to see if a file is named in that list. In the first form (1 argument) return TRUE if either no files are named (meaning that all changes are to be committed) or if id is found in the list. In the second form (3 arguments) return argument X if true and Y if false unless Y is NULL, in which case always return X. */ static void fsl_db_selected_for_checkin_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ int rc = 0; fsl_cx * f = (fsl_cx*)sqlite3_user_data(context); fsl_id_bag * bag = &f->ckin.selectedIds; assert(argc==1 || argc==3); if( bag->entryCount ){ fsl_id_t const iId = (fsl_id_t)sqlite3_value_int64(argv[0]); rc = iId ? (fsl_id_bag_contains(bag, iId) ? 1 : 0) : 0; }else{ rc = 1; } if(1==argc){ sqlite3_result_int(context, rc); }else{ assert(3 == argc); assert( rc==0 || rc==1 ); if( sqlite3_value_type(argv[2-rc])==SQLITE_NULL ) rc = 1-rc; sqlite3_result_value(context, argv[2-rc]); } } /** fsl_match_vfile_or_dir(p1,p2) A helper for resolving expressions like: WHERE pathname='X' C OR (pathname>'X/' C AND pathname<'X0' C) i.e. is 'X' a match for the LHS or is it a directory prefix of LHS? C = empty or COLLATE NOCASE, depending on the case-sensitivity setting of the fsl_cx instance associated with sqlite3_user_data(context). p1 is typically vfile.pathname or vfile.origname, and p2 is the string being compared against that. Resolves to NULL if either argument is NULL, 0 if the comparison shown above is false, 1 if the comparison is an exact match, or 2 if p2 is a directory prefix part of p1. */ static void fsl_db_match_vfile_or_dir( sqlite3_context *context, int argc, sqlite3_value **argv ){ fsl_cx * f = (fsl_cx*)sqlite3_user_data(context); char const * p1; char const * p2; fsl_buffer * b = 0; int rc = 0; assert(f); if(2 != argc){ sqlite3_result_error(context, "Expecting two arguments", -1); return; } p1 = (const char*)sqlite3_value_text(argv[0]); p2 = (const char*)sqlite3_value_text(argv[1]); if(!p1 || !p2){ sqlite3_result_null(context); return; } int (*cmp)(char const *, char const *) = f->cache.caseInsensitive ? fsl_stricmp : fsl_strcmp; if(0==cmp(p1, p2)){ sqlite3_result_int(context, 1); return; } b = fsl__cx_scratchpad(f); rc = fsl_buffer_appendf(b, "%s/", p2); if(rc) goto oom; else if(cmp(p1, fsl_buffer_cstr(b))>0){ b->mem[b->used-1] = '0'; if(cmp(p1, fsl_buffer_cstr(b))<0) rc = 2; } assert(0==rc || 2==rc); sqlite3_result_int(context, rc); end: fsl__cx_scratchpad_yield(f, b); return; oom: sqlite3_result_error_nomem(context); goto end; } /** F(glob-list-name, filename) Returns 1 if the 2nd argument matches any glob in the fossil glob list named by the first argument. The first argument must be a name resolvable via fsl_glob_name_to_category() or an error is triggered. The second value is intended to be a string, but NULL is accepted (but never matches anything). If no match is found, 0 is returned. An empty glob list never matches anything. */ static void fsl_db_cx_glob_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ fsl_cx * const f = (fsl_cx*)sqlite3_user_data(context); fsl_list * li = NULL; fsl_glob_category_e globType; char const * p1; char const * p2; p2 = (const char*)sqlite3_value_text(argv[1])/*value to check*/; if(NULL==p2 || 0==p2[0]){ sqlite3_result_int(context, 0); return; } p1 = (const char*)sqlite3_value_text(argv[0])/*glob set name*/; globType = fsl_glob_name_to_category(p1); if(FSL_GLOBS_INVALID==globType){ char buf[100] = {0}; buf[sizeof(buf)-1] = 0; fsl_snprintf(buf, (fsl_size_t)sizeof(buf)-1, "Unknown glob pattern name: %#.*s", 50, p1 ? p1 : "NULL"); sqlite3_result_error(context, buf, -1); return; } fsl_cx_glob_list(f, globType, &li, false); assert(li); sqlite3_result_int(context, fsl_glob_list_matches(li, p2) ? 1 : 0); } fsl_db * fsl_db_malloc(){ fsl_db * rc = (fsl_db *)fsl_malloc(sizeof(fsl_db)); if(rc){ *rc = fsl_db_empty; rc->allocStamp = &fsl_db_empty; } return rc; } fsl_stmt * fsl_stmt_malloc(){ fsl_stmt * rc = (fsl_stmt *)fsl_malloc(sizeof(fsl_stmt)); if(rc){ *rc = fsl_stmt_empty; rc->allocStamp = &fsl_stmt_empty; } return rc; } /** Return true if the schema is out-of-date. db must be an opened repo db. */ static char fsl_db_repo_schema_is_outofdate(fsl_db *db){ return fsl_db_exists(db, "SELECT 1 FROM config " "WHERE name='aux-schema' " "AND value<>'%s'", FSL_AUX_SCHEMA); } /* Returns 0 if db appears to have a current repository schema, 1 if it appears to have an out of date schema, and -1 if it appears to not be a repository. */ int fsl__db_repo_verify_schema(fsl_db * db){ if(fsl_db_repo_schema_is_outofdate(db)) return 1; else return fsl_db_exists(db, "SELECT 1 FROM config " "WHERE name='project-code'") ? 0 : -1; } /** Callback for use with sqlite3_commit_hook(). The argument must be a (fsl_db*). This function returns 0 only if it surmises that fsl_db_transaction_end() triggered the COMMIT. On error it might assert() or abort() the application, so this really is just a sanity check for something which "must not happen." */ static int fsl_db_verify_begin_was_not_called(void * db_fsl){ #if 0 return 0; #else /* i cannot explain why, but the ptr i'm getting here is most definately not a proper fsl_db. */ fsl_db * db = (fsl_db *)db_fsl; assert(db && "What else could it be?"); assert(db->dbh && "Else we can't have been called by sqlite3, could we have?"); if(db->beginCount>0){ fsl__fatal(FSL_RC_MISUSE,"SQL: COMMIT was called from " "outside of fsl_db_transaction_end() while a " "fsl_db_transaction_begin()-started transaction " "is pending."); return 2; } /* we have no context: sqlite3_result_error(context, "fsl_mtime_of_manifest_file() failed", -1); */ else return 0; #endif } int fsl_db_open( fsl_db * db, char const * dbFile, int openFlags ){ int rc; fsl_dbh_t * dbh = NULL; int isMem = 0; if(!db || !dbFile) return FSL_RC_MISUSE; else if(db->dbh) return FSL_RC_MISUSE; else if(!(isMem = (!*dbFile || 0==fsl_strcmp(":memory:", dbFile))) && !(FSL_OPEN_F_CREATE & openFlags) && fsl_file_access(dbFile, 0)){ return fsl_error_set(&db->error, FSL_RC_NOT_FOUND, "DB file not found: %s", dbFile); } else{ int sOpenFlags = 0; if(isMem){ sOpenFlags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE; }else{ if(FSL_OPEN_F_RO & openFlags){ sOpenFlags |= SQLITE_OPEN_READONLY; }else{ if(FSL_OPEN_F_RW & openFlags){ sOpenFlags |= SQLITE_OPEN_READWRITE; } if(FSL_OPEN_F_CREATE & openFlags){ sOpenFlags |= SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE; } if(!sOpenFlags) sOpenFlags = SQLITE_OPEN_READONLY; } } rc = sqlite3_open_v2( dbFile, &dbh, sOpenFlags, NULL ); if(rc){ if(dbh){ /* By some complete coincidence, FSL_RC_DB==SQLITE_CANTOPEN. */ rc = fsl_error_set(&db->error, FSL_RC_DB, "Opening db file [%s] failed with " |
︙ | ︙ | |||
16071 16072 16073 16074 16075 16076 16077 | goto end; }else if(!db->filename){ rc = FSL_RC_OOM; goto end; } } db->dbh = dbh; | > > > > > > > > > > > > > > | > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < < < < < < < < < | | | < | < | | > | < < | < < | | | < < < | | | | 16183 16184 16185 16186 16187 16188 16189 16190 16191 16192 16193 16194 16195 16196 16197 16198 16199 16200 16201 16202 16203 16204 16205 16206 16207 16208 16209 16210 16211 16212 16213 16214 16215 16216 16217 16218 16219 16220 16221 16222 16223 16224 16225 16226 16227 16228 16229 16230 16231 16232 16233 16234 16235 16236 16237 16238 16239 16240 16241 16242 16243 16244 16245 16246 16247 16248 16249 16250 16251 16252 16253 16254 16255 16256 16257 16258 16259 16260 16261 16262 16263 16264 16265 16266 16267 16268 16269 16270 16271 16272 16273 16274 16275 16276 16277 16278 16279 16280 16281 16282 16283 16284 16285 16286 16287 16288 16289 16290 16291 16292 16293 16294 16295 16296 16297 16298 16299 16300 16301 16302 16303 16304 16305 16306 16307 16308 16309 16310 16311 16312 16313 16314 16315 16316 16317 16318 16319 16320 16321 16322 16323 16324 16325 16326 16327 16328 16329 16330 16331 16332 16333 16334 16335 16336 16337 16338 16339 16340 16341 16342 16343 16344 16345 16346 16347 16348 16349 16350 16351 16352 16353 16354 16355 16356 16357 16358 16359 16360 16361 16362 16363 16364 16365 16366 16367 16368 16369 16370 16371 16372 16373 16374 16375 16376 16377 16378 16379 16380 16381 16382 16383 16384 16385 16386 16387 16388 16389 16390 16391 16392 16393 16394 | goto end; }else if(!db->filename){ rc = FSL_RC_OOM; goto end; } } db->dbh = dbh; if(FSL_OPEN_F_SCHEMA_VALIDATE & openFlags){ int check; check = fsl__db_repo_verify_schema(db); if(0 != check){ rc = (check<0) ? fsl_error_set(&db->error, FSL_RC_NOT_A_REPO, "DB file [%s] does not appear to be " "a repository.", dbFile) : fsl_error_set(&db->error, FSL_RC_REPO_NEEDS_REBUILD, "DB file [%s] appears to be a fossil " "repsitory, but is out-of-date and needs " "a rebuild.", dbFile); assert(rc == db->error.code); goto end; } } if( (openFlags & FSL_OPEN_F_TRACE_SQL) || (db->f && db->f->cxConfig.traceSql) ){ fsl_db_sqltrace_enable(db, stdout); } if(db->f){ /* Plug in fsl_cx-specific functionality to this one. TODO: move this into the fsl_cx code. Its placement here is largely historical. */ fsl_cx * f = db->f; /* This all comes from db.c:db_open()... */ /* FIXME: check result codes here. */ sqlite3_commit_hook(dbh, fsl_db_verify_begin_was_not_called, db); sqlite3_busy_timeout(dbh, 5000 /* historical value */); sqlite3_wal_autocheckpoint(dbh, 1); /* Set to checkpoint frequently */ sqlite3_exec(dbh, "PRAGMA foreign_keys=OFF;", 0, 0, 0); sqlite3_create_function(dbh, "now", 0, SQLITE_ANY, 0, fsl_db_now_udf, 0, 0); sqlite3_create_function(dbh, "fsl_ci_mtime", 2, SQLITE_ANY | SQLITE_DETERMINISTIC, f, fsl_db_checkin_mtime_udf, 0, 0); sqlite3_create_function(dbh, "fsl_user", 0, SQLITE_ANY | SQLITE_DETERMINISTIC, f, fsl_db_user_udf, 0, 0); sqlite3_create_function(dbh, "fsl_print", -1, SQLITE_UTF8 /* not strictly SQLITE_DETERMINISTIC because it produces output */, f, fsl_db_sql_print,0,0); sqlite3_create_function(dbh, "fsl_content", 1, SQLITE_ANY | SQLITE_DETERMINISTIC, f, fsl_db_content_udf, 0, 0); sqlite3_create_function(dbh, "fsl_sym2rid", 1, SQLITE_ANY | SQLITE_DETERMINISTIC, f, fsl_db_sym2rid_udf, 0, 0); sqlite3_create_function(dbh, "fsl_dirpart", 1, SQLITE_ANY | SQLITE_DETERMINISTIC, NULL, fsl_db_dirpart_udf, 0, 0); sqlite3_create_function(dbh, "fsl_dirpart", 2, SQLITE_ANY | SQLITE_DETERMINISTIC, NULL, fsl_db_dirpart_udf, 0, 0); sqlite3_create_function(dbh, "fsl_j2u", 1, SQLITE_ANY | SQLITE_DETERMINISTIC, NULL, fsl_db_j2u_udf, 0, 0); /* fsl_i[sf]_selected() both require access to the f's list of files being considered for commit. */ sqlite3_create_function(dbh, "fsl_is_enqueued", 1, SQLITE_UTF8, f, fsl_db_selected_for_checkin_udf,0,0 ); sqlite3_create_function(dbh, "fsl_if_enqueued", 3, SQLITE_UTF8, f, fsl_db_selected_for_checkin_udf,0,0 ); sqlite3_create_function(dbh, "fsl_ckout_dir", -1, SQLITE_ANY /* | SQLITE_DETERMINISTIC ? */, f, fsl_db_cx_chkout_dir_udf,0,0 ); sqlite3_create_function(dbh, "fsl_match_vfile_or_dir", 2, SQLITE_ANY | SQLITE_DETERMINISTIC, f, fsl_db_match_vfile_or_dir,0,0 ); sqlite3_create_function(dbh, "fsl_glob", 2, SQLITE_UTF8 | SQLITE_DETERMINISTIC, /* noting that ^^^^^ it's only deterministic for a given statement execution IF no SQL triggers an effect which forces the globs to reload. That "shouldn't ever happen." */ f, fsl_db_cx_glob_udf, 0, 0 ); #if 0 /* functions registered in v1 by db.c:db_open(). */ /* porting cgi() requires access to the HTTP/CGI layer. i.e. this belongs downstream. */ sqlite3_create_function(dbh, "cgi", 1, SQLITE_ANY, 0, db_sql_cgi, 0, 0); sqlite3_create_function(dbh, "cgi", 2, SQLITE_ANY, 0, db_sql_cgi, 0, 0); re_add_sql_func(db) /* Requires the regex bits. */; #endif }/*if(db->f)*/ } end: if(rc){ #if 1 /* This is arguable... */ if(db->f && db->error.code && !db->f->error.code){ /* COPY db's error state as f's. */ fsl_error_copy( &db->error, &db->f->error ); } #endif if(dbh){ sqlite3_close(dbh); db->dbh = NULL; } }else{ assert(db->dbh); } return rc; } int fsl_db_exec_multiv( fsl_db * const db, const char * sql, va_list args){ if(!db || !db->dbh || !sql) return FSL_RC_MISUSE; else{ fsl_buffer buf = fsl_buffer_empty; int rc = 0; char const * z; char const * zEnd = NULL; rc = fsl_buffer_appendfv( &buf, sql, args ); if(rc){ fsl_buffer_clear(&buf); return rc; } z = fsl_buffer_cstr(&buf); while( (SQLITE_OK==rc) && *z ){ fsl_stmt_t * pStmt = NULL; rc = sqlite3_prepare_v2(db->dbh, z, buf.used, &pStmt, &zEnd); if( SQLITE_OK != rc ){ rc = fsl_err_from_db(db, rc); break; } if(pStmt){ while( SQLITE_ROW == sqlite3_step(pStmt) ){} rc = sqlite3_finalize(pStmt); if(rc) rc = fsl_err_from_db(db, rc); } buf.used -= (zEnd-z); z = zEnd; } fsl_buffer_reserve(&buf, 0); return rc; } } int fsl_db_exec_multi( fsl_db * const db, const char * sql, ...){ if(!db || !db->dbh || !sql) return FSL_RC_MISUSE; else{ int rc; va_list args; va_start(args,sql); rc = fsl_db_exec_multiv( db, sql, args ); va_end(args); return rc; } } int fsl_db_execv( fsl_db * const db, const char * sql, va_list args){ if(!db || !db->dbh || !sql) return FSL_RC_MISUSE; else{ fsl_stmt st = fsl_stmt_empty; int rc = 0; rc = fsl_db_preparev( db, &st, sql, args ); if(rc) return rc; /* rc = fsl_stmt_step( &st ); */ while(FSL_RC_STEP_ROW == (rc=fsl_stmt_step(&st))){} fsl_stmt_finalize(&st); return (FSL_RC_STEP_ERROR==rc) ? FSL_RC_DB : 0; } } int fsl_db_exec( fsl_db * const db, const char * sql, ...){ if(!db || !db->dbh || !sql) return FSL_RC_MISUSE; else{ int rc; va_list args; va_start(args,sql); rc = fsl_db_execv( db, sql, args ); va_end(args); return rc; } } int fsl_db_changes_recent(fsl_db * const db){ return (db && db->dbh) ? sqlite3_changes(db->dbh) : 0; } int fsl_db_changes_total(fsl_db * const db){ return (db && db->dbh) ? sqlite3_total_changes(db->dbh) : 0; } /** Sets db->priorChanges to sqlite3_total_changes(db->dbh). */ |
︙ | ︙ | |||
16227 16228 16229 16230 16231 16232 16233 | } int fsl_db_transaction_level(fsl_db * const db){ return db->doRollback ? -db->beginCount : db->beginCount; } int fsl_db_transaction_commit(fsl_db * const db){ | | | | < | | < | < < | | | | | | | | | | | | | | | | | | | | | | | | | | < < < < < < < < < < < < < < < < < < < < < < | 16412 16413 16414 16415 16416 16417 16418 16419 16420 16421 16422 16423 16424 16425 16426 16427 16428 16429 16430 16431 16432 16433 16434 16435 16436 16437 16438 16439 16440 16441 16442 16443 16444 16445 16446 16447 16448 16449 16450 16451 16452 16453 16454 16455 16456 16457 16458 16459 16460 16461 16462 16463 16464 16465 16466 16467 16468 16469 16470 16471 16472 16473 16474 16475 16476 16477 16478 16479 16480 16481 16482 16483 16484 16485 16486 16487 16488 16489 16490 16491 | } int fsl_db_transaction_level(fsl_db * const db){ return db->doRollback ? -db->beginCount : db->beginCount; } int fsl_db_transaction_commit(fsl_db * const db){ return (db && db->dbh) ? fsl_db_transaction_end(db, 0) : FSL_RC_MISUSE; } int fsl_db_transaction_rollback(fsl_db * const db){ return (db && db->dbh) ? fsl_db_transaction_end(db, 1) : FSL_RC_MISUSE; } int fsl_db_rollback_force( fsl_db * const db ){ if(!db || !db->dbh) return FSL_RC_MISUSE; else{ int rc; db->beginCount = 0; fsl_db_cleanup_beforeCommit(db); rc = fsl_db_exec(db, "ROLLBACK"); fsl_db_reset_change_count(db); return rc; } } int fsl_db_transaction_end(fsl_db * const db, bool doRollback){ int rc = 0; if(!db || !db->dbh) return FSL_RC_MISUSE; else if (db->beginCount<=0){ return fsl_error_set(&db->error, FSL_RC_RANGE, "No transaction is active."); } if(doRollback) ++db->doRollback /* ACHTUNG: note that db->dbRollback is set before continuing so that if we return due to a non-0 beginCount that the rollback flag propagates through the transaction's stack. */; if(--db->beginCount > 0) return 0; assert(0==db->beginCount && "The commit-hook check relies on this."); assert(db->doRollback>=0); if((0==db->doRollback) && (db->priorChanges < sqlite3_total_changes(db->dbh))){ /* Execute before-commit hooks and leaf checks */ fsl_size_t x = 0; for( ; !rc && (x < db->beforeCommit.used); ++x ){ char const * sql = (char const *)db->beforeCommit.list[x]; /* MARKER(("Running before-commit code: [%s]\n", sql)); */ if(sql) rc = fsl_db_exec_multi( db, "%s", sql ); } if(!rc && db->f && (FSL_DBROLE_REPO & db->role)){ /* i don't like this one bit - this is low-level SCM functionality in an otherwise generic routine. Maybe we need fsl_cx_transaction_begin/end() instead. Much later: we have that routine now but will need to replace all relevant calls to fsl_db_transaction_begin()/end() with those routines before we can consider moving this there. */ rc = fsl__repo_leafdo_pending_checks(db->f); if(!rc && db->f->cache.toVerify.used){ rc = fsl__repo_verify_at_commit(db->f); }else{ fsl_repo_verify_cancel(db->f); } } db->doRollback = rc ? 1 : 0; } fsl_db_cleanup_beforeCommit(db); fsl_db_reset_change_count(db); rc = fsl_db_exec(db, db->doRollback ? "ROLLBACK" : "COMMIT"); db->doRollback = 0; return rc; #if 0 |
︙ | ︙ | |||
16393 16394 16395 16396 16397 16398 16399 | va_list args; va_start(args,sql); rc = fsl_db_get_int32v(db, rv, sql, args); va_end(args); return rc; } | | | 16552 16553 16554 16555 16556 16557 16558 16559 16560 16561 16562 16563 16564 16565 16566 | va_list args; va_start(args,sql); rc = fsl_db_get_int32v(db, rv, sql, args); va_end(args); return rc; } int fsl_db_get_int64v( fsl_db * db, int64_t * rv, char const * sql, va_list args){ if(!db || !db->dbh || !rv || !sql || !*sql) return FSL_RC_MISUSE; else{ fsl_stmt st = fsl_stmt_empty; int rc = 0; rc = fsl_db_preparev( db, &st, sql, args ); if(rc) return rc; |
︙ | ︙ | |||
16418 16419 16420 16421 16422 16423 16424 | break; } fsl_stmt_finalize(&st); return rc; } } | | | > | | | 16577 16578 16579 16580 16581 16582 16583 16584 16585 16586 16587 16588 16589 16590 16591 16592 16593 16594 16595 16596 16597 16598 16599 16600 16601 16602 16603 16604 16605 16606 16607 16608 16609 16610 16611 16612 16613 16614 16615 16616 16617 16618 16619 16620 16621 16622 16623 16624 16625 16626 16627 16628 16629 16630 16631 16632 16633 16634 16635 16636 16637 16638 | break; } fsl_stmt_finalize(&st); return rc; } } int fsl_db_get_int64( fsl_db * db, int64_t * rv, char const * sql, ... ){ int rc; va_list args; va_start(args,sql); rc = fsl_db_get_int64v(db, rv, sql, args); va_end(args); return rc; } int fsl_db_get_idv( fsl_db * db, fsl_id_t * rv, char const * sql, va_list args){ if(!db || !db->dbh || !rv || !sql || !*sql) return FSL_RC_MISUSE; else{ fsl_stmt st = fsl_stmt_empty; int rc = 0; rc = fsl_db_preparev( db, &st, sql, args ); if(rc) return rc; rc = fsl_stmt_step( &st ); switch(rc){ case FSL_RC_STEP_ROW: *rv = (fsl_id_t)sqlite3_column_int64(st.stmt, 0); /* Fall through */ case FSL_RC_STEP_DONE: rc = 0; break; default: assert(FSL_RC_STEP_ERROR==rc); break; } fsl_stmt_finalize(&st); return rc; } } int fsl_db_get_id( fsl_db * db, fsl_id_t * rv, char const * sql, ... ){ int rc; va_list args; va_start(args,sql); rc = fsl_db_get_idv(db, rv, sql, args); va_end(args); return rc; } int fsl_db_get_sizev( fsl_db * db, fsl_size_t * rv, char const * sql, va_list args){ if(!db || !db->dbh || !rv || !sql || !*sql) return FSL_RC_MISUSE; else{ fsl_stmt st = fsl_stmt_empty; int rc = 0; rc = fsl_db_preparev( db, &st, sql, args ); if(rc) return rc; |
︙ | ︙ | |||
16496 16497 16498 16499 16500 16501 16502 | break; } fsl_stmt_finalize(&st); return rc; } } | | | | 16656 16657 16658 16659 16660 16661 16662 16663 16664 16665 16666 16667 16668 16669 16670 16671 16672 16673 16674 16675 16676 16677 16678 16679 16680 16681 | break; } fsl_stmt_finalize(&st); return rc; } } int fsl_db_get_size( fsl_db * db, fsl_size_t * rv, char const * sql, ... ){ int rc; va_list args; va_start(args,sql); rc = fsl_db_get_sizev(db, rv, sql, args); va_end(args); return rc; } int fsl_db_get_doublev( fsl_db * db, double * rv, char const * sql, va_list args){ if(!db || !db->dbh || !rv || !sql || !*sql) return FSL_RC_MISUSE; else{ fsl_stmt st = fsl_stmt_empty; int rc = 0; rc = fsl_db_preparev( db, &st, sql, args ); if(rc) return rc; |
︙ | ︙ | |||
16532 16533 16534 16535 16536 16537 16538 | break; } fsl_stmt_finalize(&st); return rc; } } | | | | 16692 16693 16694 16695 16696 16697 16698 16699 16700 16701 16702 16703 16704 16705 16706 16707 16708 16709 16710 16711 16712 16713 16714 16715 16716 16717 16718 | break; } fsl_stmt_finalize(&st); return rc; } } int fsl_db_get_double( fsl_db * db, double * rv, char const * sql, ... ){ int rc; va_list args; va_start(args,sql); rc = fsl_db_get_doublev(db, rv, sql, args); va_end(args); return rc; } int fsl_db_get_textv( fsl_db * db, char ** rv, fsl_size_t *rvLen, char const * sql, va_list args){ if(!db || !db->dbh || !rv || !sql || !*sql) return FSL_RC_MISUSE; else{ fsl_stmt st = fsl_stmt_empty; int rc = 0; rc = fsl_db_preparev( db, &st, sql, args ); |
︙ | ︙ | |||
16587 16588 16589 16590 16591 16592 16593 | break; } fsl_stmt_finalize(&st); return rc; } } | | | | 16747 16748 16749 16750 16751 16752 16753 16754 16755 16756 16757 16758 16759 16760 16761 16762 16763 16764 16765 16766 16767 16768 16769 16770 16771 16772 | break; } fsl_stmt_finalize(&st); return rc; } } int fsl_db_get_text( fsl_db * db, char ** rv, fsl_size_t * rvLen, char const * sql, ... ){ int rc; va_list args; va_start(args,sql); rc = fsl_db_get_textv(db, rv, rvLen, sql, args); va_end(args); return rc; } int fsl_db_get_blobv( fsl_db * db, void ** rv, fsl_size_t *rvLen, char const * sql, va_list args){ if(!db || !db->dbh || !rv || !sql || !*sql) return FSL_RC_MISUSE; else{ fsl_stmt st = fsl_stmt_empty; int rc = 0; rc = fsl_db_preparev( db, &st, sql, args ); |
︙ | ︙ | |||
16639 16640 16641 16642 16643 16644 16645 | break; } fsl_stmt_finalize(&st); return rc; } } | | | | < < < | | | < > | | | | | | | | | | | 16799 16800 16801 16802 16803 16804 16805 16806 16807 16808 16809 16810 16811 16812 16813 16814 16815 16816 16817 16818 16819 16820 16821 16822 16823 16824 16825 16826 16827 16828 16829 16830 16831 16832 16833 16834 16835 16836 16837 16838 16839 16840 16841 16842 16843 16844 16845 16846 16847 16848 16849 16850 16851 16852 16853 16854 16855 16856 16857 16858 16859 16860 16861 16862 16863 16864 16865 16866 16867 16868 16869 16870 16871 16872 16873 16874 16875 16876 16877 16878 16879 16880 16881 16882 16883 16884 16885 16886 16887 16888 16889 16890 16891 16892 16893 16894 16895 16896 16897 16898 16899 16900 16901 16902 16903 16904 16905 16906 16907 16908 16909 16910 16911 16912 16913 16914 16915 16916 16917 16918 16919 16920 16921 16922 16923 16924 16925 16926 16927 16928 16929 16930 16931 16932 16933 16934 16935 16936 16937 16938 16939 16940 16941 16942 16943 16944 16945 16946 16947 16948 16949 16950 16951 16952 16953 16954 | break; } fsl_stmt_finalize(&st); return rc; } } int fsl_db_get_blob( fsl_db * db, void ** rv, fsl_size_t * rvLen, char const * sql, ... ){ int rc; va_list args; va_start(args,sql); rc = fsl_db_get_blobv(db, rv, rvLen, sql, args); va_end(args); return rc; } int fsl_db_get_bufferv( fsl_db * db, fsl_buffer * b, char asBlob, char const * sql, va_list args){ if(!db || !db->dbh || !b || !sql || !*sql) return FSL_RC_MISUSE; else{ fsl_stmt st = fsl_stmt_empty; int rc = 0; rc = fsl_db_preparev( db, &st, sql, args ); if(rc) return rc; rc = fsl_stmt_step( &st ); switch(rc){ case FSL_RC_STEP_ROW:{ void const * str = asBlob ? sqlite3_column_blob(st.stmt, 0) : (void const *)sqlite3_column_text(st.stmt, 0); int const len = sqlite3_column_bytes(st.stmt,0); rc = 0; b->used = 0; rc = fsl_buffer_append( b, str, len ); break; } case FSL_RC_STEP_DONE: rc = 0; break; default: assert(FSL_RC_STEP_ERROR==rc); break; } fsl_stmt_finalize(&st); return rc; } } int fsl_db_get_buffer( fsl_db * db, fsl_buffer * b, char asBlob, char const * sql, ... ){ int rc; va_list args; va_start(args,sql); rc = fsl_db_get_bufferv(db, b, asBlob, sql, args); va_end(args); return rc; } int32_t fsl_db_g_int32( fsl_db * const db, int32_t dflt, char const * sql, ... ){ int32_t rv = dflt; va_list args; va_start(args,sql); fsl_db_get_int32v(db, &rv, sql, args); va_end(args); return rv; } int64_t fsl_db_g_int64( fsl_db * db, int64_t dflt, char const * sql, ... ){ int64_t rv = dflt; va_list args; va_start(args,sql); fsl_db_get_int64v(db, &rv, sql, args); va_end(args); return rv; } fsl_id_t fsl_db_g_id( fsl_db * db, fsl_id_t dflt, char const * sql, ... ){ fsl_id_t rv = dflt; va_list args; va_start(args,sql); fsl_db_get_idv(db, &rv, sql, args); va_end(args); return rv; } fsl_size_t fsl_db_g_size( fsl_db * db, fsl_size_t dflt, char const * sql, ... ){ fsl_size_t rv = dflt; va_list args; va_start(args,sql); fsl_db_get_sizev(db, &rv, sql, args); va_end(args); return rv; } double fsl_db_g_double( fsl_db * db, double dflt, char const * sql, ... ){ double rv = dflt; va_list args; va_start(args,sql); fsl_db_get_doublev(db, &rv, sql, args); va_end(args); return rv; } char * fsl_db_g_text( fsl_db * db, fsl_size_t * len, char const * sql, ... ){ char * rv = NULL; va_list args; va_start(args,sql); fsl_db_get_textv(db, &rv, len, sql, args); va_end(args); return rv; } void * fsl_db_g_blob( fsl_db * db, fsl_size_t * len, char const * sql, ... ){ void * rv = NULL; va_list args; va_start(args,sql); fsl_db_get_blob(db, &rv, len, sql, args); va_end(args); return rv; } double fsl_db_julian_now(fsl_db * db){ double rc = -1.0; if(db && db->dbh){ /* TODO? use cached statement? So far not used often enough to justify it. */ fsl_db_get_double( db, &rc, "SELECT julianday('now')"); } return rc; } double fsl_db_string_to_julian(fsl_db * db, char const * str){ double rc = -1.0; if(db && db->dbh){ /* TODO? use cached statement? So far not used often enough to justify it. */ fsl_db_get_double( db, &rc, "SELECT julianday(%Q)",str); } return rc; |
︙ | ︙ | |||
16821 16822 16823 16824 16825 16826 16827 | return rc; } bool fsl_db_table_exists(fsl_db * const db, fsl_dbrole_e whichDb, const char *zTable ){ | | | 16978 16979 16980 16981 16982 16983 16984 16985 16986 16987 16988 16989 16990 16991 16992 | return rc; } bool fsl_db_table_exists(fsl_db * const db, fsl_dbrole_e whichDb, const char *zTable ){ const char *zDb = fsl_db_role_label( whichDb ); int rc = db->dbh ? sqlite3_table_column_metadata(db->dbh, zDb, zTable, 0, 0, 0, 0, 0, 0) : !SQLITE_OK; return rc==SQLITE_OK ? true : false; } |
︙ | ︙ | |||
16848 16849 16850 16851 16852 16853 16854 | break; } } fsl_stmt_finalize(&q); return rv; } | | | | < | | 17005 17006 17007 17008 17009 17010 17011 17012 17013 17014 17015 17016 17017 17018 17019 17020 17021 17022 17023 17024 17025 17026 17027 17028 17029 17030 17031 17032 17033 17034 17035 17036 17037 17038 | break; } } fsl_stmt_finalize(&q); return rv; } char * fsl_db_random_hex(fsl_db * db, fsl_size_t n){ if(!db || !n) return NULL; else{ fsl_size_t rvLen = 0; char * rv = fsl_db_g_text(db, &rvLen, "SELECT lower(hex(" "randomblob(%"FSL_SIZE_T_PFMT")))", (fsl_size_t)(n/2+1)); if(rv){ assert(rvLen>=n); rv[n]=0; } return rv; } } int fsl_db_select_slistv( fsl_db * db, fsl_list * tgt, char const * fmt, va_list args ){ if(!db || !tgt || !fmt) return FSL_RC_MISUSE; else if(!*fmt) return FSL_RC_RANGE; else{ int rc; fsl_stmt st = fsl_stmt_empty; fsl_size_t nlen; char const * n; char * cp; |
︙ | ︙ | |||
16892 16893 16894 16895 16896 16897 16898 | } } fsl_stmt_finalize(&st); return rc; } } | | | | < | 17048 17049 17050 17051 17052 17053 17054 17055 17056 17057 17058 17059 17060 17061 17062 17063 17064 17065 17066 17067 17068 17069 17070 17071 17072 17073 17074 | } } fsl_stmt_finalize(&st); return rc; } } int fsl_db_select_slist( fsl_db * const db, fsl_list * tgt, char const * fmt, ... ){ int rc; va_list va; va_start (va,fmt); rc = fsl_db_select_slistv(db, tgt, fmt, va); va_end(va); return rc; } void fsl_db_sqltrace_enable( fsl_db * const db, FILE * outStream ){ if(db && db->dbh){ sqlite3_trace(db->dbh, fsl_db_sql_trace, outStream); } } int fsl_db_init( fsl_error * err, char const * zFilename, char const * zSchema, ... ){ |
︙ | ︙ | |||
16973 16974 16975 16976 16977 16978 16979 | } fsl_output(f, "\n", 1); return 0; } #undef MARKER | | | | | | | | > | > > > | < < > | 17128 17129 17130 17131 17132 17133 17134 17135 17136 17137 17138 17139 17140 17141 17142 17143 17144 17145 17146 17147 17148 17149 17150 17151 17152 17153 17154 17155 17156 17157 17158 17159 | } fsl_output(f, "\n", 1); return 0; } #undef MARKER /* end of file db.c */ /* start of file deck.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 Stephan Beal (https://wanderinghorse.net). This program is free software; you can redistribute it and/or modify it under the terms of the Simplified BSD License (also known as the "2-Clause License" or "FreeBSD License".) This program is distributed in the hope that it will be useful, but without any warranty; without even the implied warranty of merchantability or fitness for a particular purpose. ***************************************************************************** This file houses the manifest/control-artifact-related APIs. */ #include <assert.h> #include <stdlib.h> /* qsort() */ #include <memory.h> /* memcmp() */ /* Only for debugging */ |
︙ | ︙ | |||
17016 17017 17018 17019 17020 17021 17022 | FSL_CARD_F_LIST_NEEDS_SORT = 0x01 }; /** Transfers the contents of d into f->cache.mcache. If d is dynamically allocated then it is also freed. In any case, after calling this the caller must behave as if the deck had been passed | | < | | 17174 17175 17176 17177 17178 17179 17180 17181 17182 17183 17184 17185 17186 17187 17188 17189 17190 17191 17192 | FSL_CARD_F_LIST_NEEDS_SORT = 0x01 }; /** Transfers the contents of d into f->cache.mcache. If d is dynamically allocated then it is also freed. In any case, after calling this the caller must behave as if the deck had been passed to fsl_deck_finalize(). If manifest caching is disabled for f, d is immediately finalized. */ static void fsl__cx_mcache_insert(fsl_cx *f, fsl_deck * d){ if(!(f->flags & FSL_CX_F_MANIFEST_CACHE)){ fsl_deck_finalize(d); return; } static const unsigned cacheLen = (unsigned)(sizeof(fsl__mcache_empty.aAge) /sizeof(fsl__mcache_empty.aAge[0])); |
︙ | ︙ | |||
17057 17058 17059 17060 17061 17062 17063 | mc->decks[i] = *d; *d = fsl_deck_empty; if(&fsl_deck_empty == mc->decks[i].allocStamp){ /* d was fsl_deck_malloc()'d so we need to free it, but cannot send it through fsl_deck_finalize() because that would try to clean up the memory we just transferred ownership of to mc->decks[i]. So... */ | | | 17214 17215 17216 17217 17218 17219 17220 17221 17222 17223 17224 17225 17226 17227 17228 | mc->decks[i] = *d; *d = fsl_deck_empty; if(&fsl_deck_empty == mc->decks[i].allocStamp){ /* d was fsl_deck_malloc()'d so we need to free it, but cannot send it through fsl_deck_finalize() because that would try to clean up the memory we just transferred ownership of to mc->decks[i]. So... */ mc->decks[i].allocStamp = 0; fsl_free(d); } d = pBaseline; } } /** |
︙ | ︙ | |||
17442 17443 17444 17445 17446 17447 17448 | static void fsl_deck_clean_T(fsl_deck * const m){ fsl_list_clear(&m->T, fsl_list_v_card_T_free, NULL); } static void fsl_deck_clean_U(fsl_deck * const m){ fsl_deck_clean_string(m, &m->U); } static void fsl_deck_clean_W(fsl_deck * const m){ | < | < < < | 17599 17600 17601 17602 17603 17604 17605 17606 17607 17608 17609 17610 17611 17612 17613 | static void fsl_deck_clean_T(fsl_deck * const m){ fsl_list_clear(&m->T, fsl_list_v_card_T_free, NULL); } static void fsl_deck_clean_U(fsl_deck * const m){ fsl_deck_clean_string(m, &m->U); } static void fsl_deck_clean_W(fsl_deck * const m){ CBUF(W); } void fsl_deck_clean2(fsl_deck * const m, fsl_buffer * const xferBuf){ if(!m) return; fsl_deck_clean_version(m); fsl_deck_clean_A(m); fsl_deck_clean_B(m); |
︙ | ︙ | |||
17745 17746 17747 17748 17749 17750 17751 | /** If fsl_card_is_legal(d->type, card), returns true, else updates d->f->error with a description of the constraint violation and returns 0. */ | | | 17898 17899 17900 17901 17902 17903 17904 17905 17906 17907 17908 17909 17910 17911 17912 | /** If fsl_card_is_legal(d->type, card), returns true, else updates d->f->error with a description of the constraint violation and returns 0. */ static bool fsl_deck_check_type( fsl_deck * d, char card ){ if(fsl_card_is_legal(d->type, card)) return true; else{ fsl_cx_err_set(d->f, FSL_RC_TYPE, "Card type '%c' is not allowed " "in artifacts of type %s.", card, fsl_satype_cstr(d->type)); return false; |
︙ | ︙ | |||
17888 17889 17890 17891 17892 17893 17894 | int fsl_deck_I_set( fsl_deck * const mf, fsl_uuid_cstr uuid){ if(uuid && mf->H) return FSL_RC_SYNTAX; int const uLen = uuid ? fsl_is_uuid(uuid) : 0; return fsl_deck_sethex_impl(mf, uuid, 'I', uLen, &mf->I); } | | < | | | | < < < < < < < | 18041 18042 18043 18044 18045 18046 18047 18048 18049 18050 18051 18052 18053 18054 18055 18056 18057 18058 18059 18060 18061 18062 18063 18064 18065 18066 18067 18068 18069 18070 18071 18072 18073 18074 18075 18076 | int fsl_deck_I_set( fsl_deck * const mf, fsl_uuid_cstr uuid){ if(uuid && mf->H) return FSL_RC_SYNTAX; int const uLen = uuid ? fsl_is_uuid(uuid) : 0; return fsl_deck_sethex_impl(mf, uuid, 'I', uLen, &mf->I); } int fsl_deck_J_add( fsl_deck * const mf, char isAppend, char const * field, char const * value){ if(!field) return FSL_RC_MISUSE; else if(!*field) return FSL_RC_SYNTAX; else if(!fsl_deck_check_type(mf,'J')) return mf->f->error.code; else{ int rc; fsl_card_J * cp = fsl_card_J_malloc(isAppend, field, value); if(!cp) rc = FSL_RC_OOM; else if( 0 != (rc = fsl_list_append(&mf->J, cp))){ fsl_card_J_free(cp); } return rc; } } int fsl_deck_K_set( fsl_deck * const mf, fsl_uuid_cstr uuid){ int const uLen = fsl_is_uuid(uuid); return uLen ? fsl_deck_sethex_impl(mf, uuid, 'K', uLen, &mf->K) : FSL_RC_SYNTAX; } int fsl_deck_L_set( fsl_deck * const mf, char const * v, fsl_int_t n){ return mf ? fsl_deck_set_string(mf, 'L', &mf->L, v, n) : FSL_RC_SYNTAX; } |
︙ | ︙ | |||
18085 18086 18087 18088 18089 18090 18091 | }else if(!mf->F.used){ theHash = FSL_MD5_INITIAL_HASH; /* fall through and set hash */ }else{ int rc = 0; fsl_card_F const * fc; fsl_id_t fileRid; | | | 18230 18231 18232 18233 18234 18235 18236 18237 18238 18239 18240 18241 18242 18243 18244 | }else if(!mf->F.used){ theHash = FSL_MD5_INITIAL_HASH; /* fall through and set hash */ }else{ int rc = 0; fsl_card_F const * fc; fsl_id_t fileRid; fsl_buffer * const buf = &f->fileContent; unsigned char digest[16]; fsl_md5_cx md5 = fsl_md5_cx_empty; enum { NumBufSize = 40 }; char numBuf[NumBufSize] = {0}; assert(!buf->used && "Misuse of f->fileContent buffer."); rc = fsl_deck_F_rewind(mf); if(rc) goto end; |
︙ | ︙ | |||
18243 18244 18245 18246 18247 18248 18249 | unsigned len = 0; for(; z[len]; ++len){ if(z[len] <= 32) return false; } return len>0; } | | | 18388 18389 18390 18391 18392 18393 18394 18395 18396 18397 18398 18399 18400 18401 18402 | unsigned len = 0; for(; z[len]; ++len){ if(z[len] <= 32) return false; } return len>0; } int fsl_deck_branch_set( fsl_deck * d, char const * branchName ){ if(!fsl_is_valid_branchname(branchName)){ return fsl_cx_err_set(d->f, FSL_RC_RANGE, "Branch name contains " "invalid characters."); } int rc= fsl_deck_T_add(d, FSL_TAGTYPE_PROPAGATING, NULL, "branch", branchName); if(!rc){ |
︙ | ︙ | |||
18399 18400 18401 18402 18403 18404 18405 | if(rc){ fsl_card_F_list_pop(&mf->F); } return rc; } } | | | 18544 18545 18546 18547 18548 18549 18550 18551 18552 18553 18554 18555 18556 18557 18558 | if(rc){ fsl_card_F_list_pop(&mf->F); } return rc; } } int fsl_deck_F_foreach( fsl_deck * d, fsl_card_F_visitor_f cb, void * visitorState ){ if(!cb) return FSL_RC_MISUSE; else{ fsl_card_F const * fc; int rc = fsl_deck_F_rewind(d); while( !rc && !(rc=fsl_deck_F_next(d, &fc)) && fc) { rc = cb( fc, visitorState ); } |
︙ | ︙ | |||
18498 18499 18500 18501 18502 18503 18504 | return os->rc; } /** Internal helper for fsl_deck_output(). Appends formatted output to os->out() via fsl_output_f_mf(). Returns os->rc (0 on success). */ | | | | | | | | 18643 18644 18645 18646 18647 18648 18649 18650 18651 18652 18653 18654 18655 18656 18657 18658 18659 18660 18661 18662 18663 18664 18665 18666 18667 18668 18669 18670 18671 18672 18673 18674 18675 18676 18677 18678 18679 18680 18681 18682 18683 18684 18685 18686 18687 18688 18689 18690 18691 18692 18693 18694 18695 18696 18697 18698 18699 18700 18701 18702 18703 18704 18705 18706 18707 18708 18709 18710 18711 18712 18713 18714 18715 18716 18717 18718 | return os->rc; } /** Internal helper for fsl_deck_output(). Appends formatted output to os->out() via fsl_output_f_mf(). Returns os->rc (0 on success). */ static int fsl_deck_append( fsl_deck_out_state * os, char const * fmt, ... ){ fsl_int_t rc; va_list args; assert(os); assert(fmt && *fmt); va_start(args,fmt); rc = fsl_appendfv( fsl_output_f_mf, os, fmt, args); va_end(args); if(rc<0 && !os->rc) os->rc = FSL_RC_IO; return os->rc; } /** Fossilizes (inp, inp+len] bytes to os->scratch, overwriting any existing contents. Updates and returns os->rc. */ static int fsl_deck_fossilize( fsl_deck_out_state * os, unsigned char const * inp, fsl_int_t len){ fsl_buffer_reuse(os->scratch); return os->rc = len ? fsl_bytes_fossilize(inp, len, os->scratch) : 0; } /** Confirms that the given card letter is valid for od->d->type, and updates os->rc and os->error if it's not. Returns true if it's valid. */ static bool fsl_deck_out_tcheck(fsl_deck_out_state * os, char letter){ if(!fsl_card_is_legal(os->d->type, letter)){ os->rc = fsl_error_set(&os->error, FSL_RC_TYPE, "%c-card is not valid for deck type %s.", letter, fsl_satype_cstr(os->d->type)); } return os->rc ? false : true; } /* Appends a UUID-valued card to os from os->d->{{card}} if the given UUID is not NULL, else this is a no-op. */ static int fsl_deck_out_uuid( fsl_deck_out_state * os, char card, fsl_uuid_str uuid ){ if(uuid && fsl_deck_out_tcheck(os, card)){ if(!fsl_is_uuid(uuid)){ os->rc = fsl_error_set(&os->error, FSL_RC_RANGE, "Malformed UUID in %c card.", card); }else{ fsl_deck_append(os, "%c %s\n", card, uuid); } } return os->rc; } /* Appends the B card to os from os->d->B. */ static int fsl_deck_out_B( fsl_deck_out_state * os ){ return fsl_deck_out_uuid(os, 'B', os->d->B.uuid); } /* Appends the A card to os from os->d->A. */ static int fsl_deck_out_A( fsl_deck_out_state * os ){ if(os->d->A.name && fsl_deck_out_tcheck(os, 'A')){ if(!os->d->A.name || !*os->d->A.name){ os->rc = fsl_error_set(&os->error, FSL_RC_SYNTAX, "A-card is missing its name property"); }else if(!os->d->A.tgt || !*os->d->A.tgt){ os->rc = fsl_error_set(&os->error, FSL_RC_SYNTAX, |
︙ | ︙ | |||
18595 18596 18597 18598 18599 18600 18601 | /** Internal helper for outputing cards which are simple strings. str is the card to output (NULL values are ignored), letter is the card letter being output. If doFossilize is true then the output gets fossilize-formatted. */ | | | | | | 18740 18741 18742 18743 18744 18745 18746 18747 18748 18749 18750 18751 18752 18753 18754 18755 18756 18757 18758 18759 18760 18761 18762 18763 18764 18765 18766 18767 18768 18769 18770 18771 18772 18773 18774 18775 18776 18777 18778 18779 18780 18781 18782 18783 18784 18785 18786 18787 18788 18789 18790 18791 | /** Internal helper for outputing cards which are simple strings. str is the card to output (NULL values are ignored), letter is the card letter being output. If doFossilize is true then the output gets fossilize-formatted. */ static int fsl_deck_out_letter_str( fsl_deck_out_state * os, char letter, char const * str, char doFossilize ){ if(str && fsl_deck_out_tcheck(os, letter)){ if(doFossilize){ fsl_deck_fossilize(os, (unsigned char const *)str, -1); if(!os->rc){ fsl_deck_append(os, "%c %b\n", letter, os->scratch); } }else{ fsl_deck_append(os, "%c %s\n", letter, str); } } return os->rc; } /* Appends the C card to os from os->d->C. */ static int fsl_deck_out_C( fsl_deck_out_state * os ){ return fsl_deck_out_letter_str( os, 'C', os->d->C, 1 ); } /* Appends the D card to os from os->d->D. */ static int fsl_deck_out_D( fsl_deck_out_state * os ){ if((os->d->D > 0.0) && fsl_deck_out_tcheck(os, 'D')){ char ds[24]; if(!fsl_julian_to_iso8601(os->d->D, ds, 1)){ os->rc = fsl_error_set(&os->error, FSL_RC_RANGE, "D-card contains invalid " "Julian Day value."); }else{ fsl_deck_append(os, "D %s\n", ds); } } return os->rc; } /* Appends the E card to os from os->d->E. */ static int fsl_deck_out_E( fsl_deck_out_state * os ){ if(os->d->E.uuid && fsl_deck_out_tcheck(os, 'E')){ char ds[24]; char msPrecision = FSL_SATYPE_EVENT!=os->d->type /* The timestamps on Events historically have seconds precision, not ms. */; if(!fsl_is_uuid(os->d->E.uuid)){ |
︙ | ︙ | |||
18656 18657 18658 18659 18660 18661 18662 | fsl_deck_append(os, "E %s %s\n", ds, os->d->E.uuid); } } return os->rc; } /* Appends the G card to os from os->d->G. */ | | | | | 18801 18802 18803 18804 18805 18806 18807 18808 18809 18810 18811 18812 18813 18814 18815 18816 18817 18818 18819 18820 18821 18822 18823 18824 18825 18826 18827 18828 18829 | fsl_deck_append(os, "E %s %s\n", ds, os->d->E.uuid); } } return os->rc; } /* Appends the G card to os from os->d->G. */ static int fsl_deck_out_G( fsl_deck_out_state * os ){ return fsl_deck_out_uuid(os, 'G', os->d->G); } /* Appends the H card to os from os->d->H. */ static int fsl_deck_out_H( fsl_deck_out_state * os ){ if(os->d->H && os->d->I){ return os->rc = fsl_error_set(&os->error, FSL_RC_SYNTAX, "Forum post may not have both H- and I-cards."); } return fsl_deck_out_letter_str( os, 'H', os->d->H, 1 ); } /* Appends the I card to os from os->d->I. */ static int fsl_deck_out_I( fsl_deck_out_state * os ){ if(os->d->I && os->d->H){ return os->rc = fsl_error_set(&os->error, FSL_RC_SYNTAX, "Forum post may not have both H- and I-cards."); } return fsl_deck_out_uuid(os, 'I', os->d->I); } |
︙ | ︙ | |||
18742 18743 18744 18745 18746 18747 18748 | if(!rc) rc = fsl_deck_append( os, " %b", os->scratch); } } if(!rc) fsl_output_f_mf(os, "\n", 1); return os->rc; } | | | | 18887 18888 18889 18890 18891 18892 18893 18894 18895 18896 18897 18898 18899 18900 18901 18902 18903 18904 18905 18906 18907 18908 18909 18910 18911 | if(!rc) rc = fsl_deck_append( os, " %b", os->scratch); } } if(!rc) fsl_output_f_mf(os, "\n", 1); return os->rc; } static int fsl_deck_out_list_obj( fsl_deck_out_state * os, char letter, fsl_list const * li, fsl_list_visitor_f visitor){ if(li->used && fsl_deck_out_tcheck(os, letter)){ os->rc = fsl_list_visit( li, 0, visitor, os ); } return os->rc; } static int fsl_deck_out_F( fsl_deck_out_state * os ){ if(os->d->F.used && fsl_deck_out_tcheck(os, 'F')){ uint32_t i; for(i=0; !os->rc && i <os->d->F.used; ++i){ os->rc = fsl_deck_out_F_one(os, F_at(&os->d->F, i)); } } return os->rc; |
︙ | ︙ | |||
18793 18794 18795 18796 18797 18798 18799 | } /** fsl_list_visitor_f() impl for outputing J cards. obj must be a (fsl_card_J *). */ static int fsl_list_v_mf_output_card_J(void * obj, void * visitorState ){ | | | | | | | | | 18938 18939 18940 18941 18942 18943 18944 18945 18946 18947 18948 18949 18950 18951 18952 18953 18954 18955 18956 18957 18958 18959 18960 18961 18962 18963 18964 18965 18966 18967 18968 18969 18970 18971 18972 18973 18974 18975 18976 18977 18978 18979 18980 18981 18982 18983 18984 18985 18986 18987 18988 18989 18990 18991 18992 18993 18994 18995 18996 18997 18998 18999 19000 19001 19002 19003 19004 19005 19006 19007 19008 19009 19010 19011 19012 19013 19014 19015 19016 19017 19018 19019 19020 19021 19022 19023 19024 | } /** fsl_list_visitor_f() impl for outputing J cards. obj must be a (fsl_card_J *). */ static int fsl_list_v_mf_output_card_J(void * obj, void * visitorState ){ fsl_deck_out_state * os = (fsl_deck_out_state *)visitorState; fsl_card_J const * c = (fsl_card_J const *)obj; fsl_deck_fossilize( os, (unsigned char const *)c->field, -1 ); if(!os->rc){ fsl_deck_append(os, "J %s%b", c->append ? "+" : "", os->scratch); if(!os->rc){ if(c->value && *c->value){ fsl_deck_fossilize( os, (unsigned char const *)c->value, -1 ); if(!os->rc){ fsl_deck_append(os, " %b\n", os->scratch); } }else{ fsl_deck_append(os, "\n"); } } } return os->rc; } static int fsl_deck_out_J( fsl_deck_out_state * os ){ return fsl_deck_out_list_obj(os, 'J', &os->d->J, fsl_list_v_mf_output_card_J); } /* Appends the K card to os from os->d->K. */ static int fsl_deck_out_K( fsl_deck_out_state * os ){ if(os->d->K && fsl_deck_out_tcheck(os, 'K')){ if(!fsl_is_uuid(os->d->K)){ os->rc = fsl_error_set(&os->error, FSL_RC_RANGE, "Invalid UUID in K card."); } else{ fsl_deck_append(os, "K %s\n", os->d->K); } } return os->rc; } /* Appends the L card to os from os->d->L. */ static int fsl_deck_out_L( fsl_deck_out_state * os ){ return fsl_deck_out_letter_str(os, 'L', os->d->L, 1); } /* Appends the N card to os from os->d->N. */ static int fsl_deck_out_N( fsl_deck_out_state * os ){ return fsl_deck_out_letter_str( os, 'N', os->d->N, 1 ); } /** fsl_list_visitor_f() impl for outputing P cards. obj must be a (fsl_deck_out_state *) and obj->counter must be set to 0 before running the visit iteration. */ static int fsl_list_v_mf_output_card_P(void * obj, void * visitorState ){ fsl_deck_out_state * os = (fsl_deck_out_state *)visitorState; char const * uuid = (char const *)obj; int const uLen = uuid ? fsl_is_uuid(uuid) : 0; if(!uLen){ os->rc = fsl_error_set(&os->error, FSL_RC_RANGE, "Invalid UUID in P card."); } else if(!os->counter++) fsl_output_f_mf(os, "P ", 2); else fsl_output_f_mf(os, " ", 1); /* Reminder: fsl_appendf_f_mf() updates os->rc. */ if(!os->rc){ fsl_output_f_mf(os, uuid, (fsl_size_t)uLen); } return os->rc; } static int fsl_deck_out_P( fsl_deck_out_state * os ){ if(!fsl_deck_out_tcheck(os, 'P')) return os->rc; else if(os->d->P.used){ os->counter = 0; os->rc = fsl_list_visit( &os->d->P, 0, fsl_list_v_mf_output_card_P, os ); assert(os->counter); if(!os->rc) fsl_output_f_mf(os, "\n", 1); } |
︙ | ︙ | |||
18909 18910 18911 18912 18913 18914 18915 | assert(l); assert(r); if(!l) return r ? 1 : 0; else if(!r) return -1; else{ /* Lexical sorting must account for the +/- characters, and a '+' sorts before '-', which is why this next part may seem | | > | | 19054 19055 19056 19057 19058 19059 19060 19061 19062 19063 19064 19065 19066 19067 19068 19069 19070 19071 19072 19073 19074 19075 19076 19077 19078 19079 19080 19081 19082 19083 | assert(l); assert(r); if(!l) return r ? 1 : 0; else if(!r) return -1; else{ /* Lexical sorting must account for the +/- characters, and a '+' sorts before '-', which is why this next part may seem backwards at first. */ assert(l->type); assert(r->type); if(l->type<0 && r->type>0) return 1; else if(l->type>0 && r->type<0) return -1; else return fsl_strcmp(l->target, r->target); } } /** fsl_list_visitor_f() impl for outputing Q cards. obj must be a (fsl_deck_out_state *). */ static int fsl_list_v_mf_output_card_Q(void * obj, void * visitorState ){ fsl_deck_out_state * os = (fsl_deck_out_state *)visitorState; fsl_card_Q const * cp = (fsl_card_Q const *)obj; char const prefix = (cp->type==FSL_CHERRYPICK_ADD) ? '+' : '-'; assert(cp->type); assert(cp->target); if(cp->type != FSL_CHERRYPICK_ADD && cp->type != FSL_CHERRYPICK_BACKOUT){ |
︙ | ︙ | |||
18955 18956 18957 18958 18959 18960 18961 | } }else{ fsl_deck_append(os, "Q %c%s\n", prefix, cp->target); } return os->rc; } | | | | | 19101 19102 19103 19104 19105 19106 19107 19108 19109 19110 19111 19112 19113 19114 19115 19116 19117 19118 19119 19120 19121 19122 19123 19124 19125 19126 19127 19128 19129 19130 19131 19132 19133 19134 19135 19136 19137 19138 19139 19140 19141 19142 | } }else{ fsl_deck_append(os, "Q %c%s\n", prefix, cp->target); } return os->rc; } static int fsl_deck_out_Q( fsl_deck_out_state * os ){ return fsl_deck_out_list_obj(os, 'Q', &os->d->Q, fsl_list_v_mf_output_card_Q); } /** Appends the R card from os->d->R to os. */ static int fsl_deck_out_R( fsl_deck_out_state * os ){ if(os->d->R && fsl_deck_out_tcheck(os, 'R')){ if((FSL_STRLEN_MD5!=fsl_strlen(os->d->R)) || !fsl_validate16(os->d->R, FSL_STRLEN_MD5)){ os->rc = fsl_error_set(&os->error, FSL_RC_RANGE, "Malformed MD5 in R-card."); } else{ fsl_deck_append(os, "R %s\n", os->d->R); } } return os->rc; } /** fsl_list_visitor_f() impl for outputing T cards. obj must be a (fsl_deck_out_state *). */ static int fsl_list_v_mf_output_card_T(void * obj, void * visitorState ){ fsl_deck_out_state * os = (fsl_deck_out_state *)visitorState; fsl_card_T * t = (fsl_card_T *)obj; char prefix = 0; switch(os->d->type){ case FSL_SATYPE_TECHNOTE: if( t->uuid ){ return os->rc = fsl_error_set(&os->error, FSL_RC_SYNTAX, "Non-self-referential T-card is not " |
︙ | ︙ | |||
19184 19185 19186 19187 19188 19189 19190 | } } return rc; } } /* Appends the T cards to os from os->d->T. */ | | | | | | | | | | | | | | | | 19330 19331 19332 19333 19334 19335 19336 19337 19338 19339 19340 19341 19342 19343 19344 19345 19346 19347 19348 19349 19350 19351 19352 19353 19354 19355 19356 19357 19358 19359 19360 19361 19362 19363 19364 19365 19366 19367 19368 19369 19370 19371 19372 19373 19374 19375 19376 19377 19378 19379 19380 19381 19382 19383 19384 19385 19386 19387 19388 19389 19390 19391 19392 19393 19394 19395 19396 19397 19398 19399 19400 19401 19402 19403 19404 19405 19406 19407 19408 19409 19410 19411 19412 19413 19414 19415 19416 19417 19418 19419 19420 19421 19422 19423 19424 19425 19426 19427 19428 19429 19430 19431 19432 19433 19434 19435 19436 19437 19438 19439 19440 19441 19442 19443 19444 19445 19446 19447 19448 19449 19450 19451 19452 19453 19454 19455 19456 19457 19458 19459 19460 19461 19462 19463 19464 19465 19466 19467 19468 19469 19470 19471 19472 19473 19474 19475 19476 19477 19478 19479 19480 19481 19482 19483 19484 19485 19486 19487 19488 19489 19490 19491 19492 19493 19494 19495 19496 19497 19498 19499 19500 19501 19502 19503 | } } return rc; } } /* Appends the T cards to os from os->d->T. */ static int fsl_deck_out_T( fsl_deck_out_state * os ){ os->rc = fsl_deck_T_verify_order( os->d, &os->error); return os->rc ? os->rc : fsl_deck_out_list_obj(os, 'T', &os->d->T, fsl_list_v_mf_output_card_T); } /* Appends the U card to os from os->d->U. */ static int fsl_deck_out_U( fsl_deck_out_state * os ){ return fsl_deck_out_letter_str(os, 'U', os->d->U, 1); } /* Appends the W card to os from os->d->W. */ static int fsl_deck_out_W( fsl_deck_out_state * os ){ if(os->d->W.used && fsl_deck_out_tcheck(os, 'W')){ fsl_deck_append(os, "W %"FSL_SIZE_T_PFMT"\n%b\n", (fsl_size_t)os->d->W.used, &os->d->W ); } return os->rc; } /* Appends the Z card to os from os' accummulated md5 hash. */ static int fsl_deck_out_Z( fsl_deck_out_state * os ){ unsigned char digest[16]; char md5[FSL_STRLEN_MD5+1]; fsl_md5_final(&os->md5, digest); fsl_md5_digest_to_base16(digest, md5); assert(!md5[32]); os->md5.isInit = 0 /* Keep further output from updating the MD5 */; return fsl_deck_append(os, "Z %.*s\n", FSL_STRLEN_MD5, md5); } static int qsort_cmp_strings( void const * lhs, void const * rhs ){ char const * l = *((char const **)lhs); char const * r = *((char const **)rhs); return fsl_strcmp(l,r); } static int fsl_list_v_mf_output_card_M(void * obj, void * visitorState ){ fsl_deck_out_state * os = (fsl_deck_out_state *)visitorState; char const * m = (char const *)obj; return fsl_deck_append(os, "M %s\n", m); } static int fsl_deck_output_cluster( fsl_deck_out_state * os ){ if(!os->d->M.used){ os->rc = fsl_error_set(&os->error, FSL_RC_RANGE, "M-card list may not be empty."); }else{ fsl_deck_out_list_obj(os, 'M', &os->d->M, fsl_list_v_mf_output_card_M); } return os->rc; } /* Helper for fsl_deck_output_CATYPE() */ #define DOUT(LETTER) rc = fsl_deck_out_##LETTER(os); \ if(rc || os->rc) return os->rc ? os->rc : rc static int fsl_deck_output_control( fsl_deck_out_state * os ){ int rc; /* Reminder: cards must be output in strict lexical order. */ DOUT(D); DOUT(T); DOUT(U); return os->rc; } static int fsl_deck_output_event( fsl_deck_out_state * os ){ int rc = 0; /* Reminder: cards must be output in strict lexical order. */ DOUT(C); DOUT(D); DOUT(E); DOUT(N); DOUT(P); DOUT(T); DOUT(U); DOUT(W); return os->rc; } static int fsl_deck_output_mf( fsl_deck_out_state * os ){ int rc = 0; /* Reminder: cards must be output in strict lexical order. */ DOUT(B); DOUT(C); DOUT(D); DOUT(F); DOUT(K); DOUT(L); DOUT(N); DOUT(P); DOUT(Q); DOUT(R); DOUT(T); DOUT(U); DOUT(W); return os->rc; } static int fsl_deck_output_ticket( fsl_deck_out_state * os ){ int rc; /* Reminder: cards must be output in strict lexical order. */ DOUT(D); DOUT(J); DOUT(K); DOUT(U); return os->rc; } static int fsl_deck_output_wiki( fsl_deck_out_state * os ){ int rc; /* Reminder: cards must be output in strict lexical order. */ DOUT(C); DOUT(D); DOUT(L); DOUT(N); DOUT(P); DOUT(U); DOUT(W); return os->rc; } static int fsl_deck_output_attachment( fsl_deck_out_state * os ){ int rc = 0; /* Reminder: cards must be output in strict lexical order. */ DOUT(A); DOUT(C); DOUT(D); DOUT(N); DOUT(U); return os->rc; } static int fsl_deck_output_forumpost( fsl_deck_out_state * os ){ int rc; /* Reminder: cards must be output in strict lexical order. */ DOUT(D); DOUT(G); DOUT(H); DOUT(I); DOUT(N); DOUT(P); DOUT(U); DOUT(W); return os->rc; } /** Only for testing/debugging purposes, as it allows constructs which are not semantically legal and are CERTAINLY not legal to stuff in the database. */ static int fsl_deck_output_any( fsl_deck_out_state * os ){ int rc = 0; /* Reminder: cards must be output in strict lexical order. */ DOUT(B); DOUT(C); DOUT(D); DOUT(E); DOUT(F); |
︙ | ︙ | |||
19367 19368 19369 19370 19371 19372 19373 | DOUT(W); return os->rc; } #undef DOUT | | | 19513 19514 19515 19516 19517 19518 19519 19520 19521 19522 19523 19524 19525 19526 19527 | DOUT(W); return os->rc; } #undef DOUT int fsl_deck_unshuffle( fsl_deck * d, bool calculateRCard ){ fsl_list * li; int rc = 0; if(!d || !d->f) return FSL_RC_MISUSE; fsl_cx_err_reset(d->f); #define SORT(CARD,CMP) li = &d->CARD; fsl_list_sort(li, CMP) SORT(J,fsl__qsort_cmp_J_cards); SORT(M,qsort_cmp_strings); |
︙ | ︙ | |||
19409 19410 19411 19412 19413 19414 19415 | */; } } } return rc; } | | < < < < < | 19555 19556 19557 19558 19559 19560 19561 19562 19563 19564 19565 19566 19567 19568 19569 19570 19571 19572 19573 19574 19575 19576 19577 19578 19579 19580 | */; } } } return rc; } int fsl_deck_output( fsl_deck * d, fsl_output_f out, void * outputState ){ static const bool allowTypeAny = false /* Only enable for debugging/testing. Allows outputing decks of type FSL_SATYPE_ANY, which bypasses some validation checks and may trigger other validation assertions. And may allow you to inject garbage into the repo. So be careful. */; fsl_deck_out_state OS = fsl_deck_out_state_empty; fsl_deck_out_state * const os = &OS; fsl_cx * const f = d->f; int rc = 0; if(!f || !out) return FSL_RC_MISUSE; else if(FSL_SATYPE_ANY==d->type){ if(!allowTypeAny){ return fsl_cx_err_set(d->f, FSL_RC_TYPE, "Artifact type ANY cannot be" "output unless it is enabled in this " "code (it's dangerous)."); |
︙ | ︙ | |||
19516 19517 19518 19519 19520 19521 19522 19523 | /** Adds a record in the pending_xlink temp table, to be processed when crosslinking is completed. Returns 0 on success, non-0 for db error. */ static int fsl__deck_crosslink_add_pending(fsl_cx * f, char cType, fsl_uuid_cstr uuid){ assert(f->cache.isCrosslinking); | > | > > | 19657 19658 19659 19660 19661 19662 19663 19664 19665 19666 19667 19668 19669 19670 19671 19672 19673 19674 19675 19676 19677 19678 | /** Adds a record in the pending_xlink temp table, to be processed when crosslinking is completed. Returns 0 on success, non-0 for db error. */ static int fsl__deck_crosslink_add_pending(fsl_cx * f, char cType, fsl_uuid_cstr uuid){ int rc = 0; assert(f->cache.isCrosslinking); rc = fsl_db_exec(f->dbMain, "INSERT OR IGNORE INTO pending_xlink VALUES('%c%q')", cType, uuid); return fsl_cx_uplift_db_error2(f, 0, rc); } /** @internal Add a single entry to the mlink table. Also add the filename to the filename table if it is not there already. Parameters: |
︙ | ︙ | |||
19830 19831 19832 19833 19834 19835 19836 | fc->perm = perms; return 0; }else{ return fsl_deck_F_add(d, zName, uuid, perms, priorName); } } | | | < < < < < | 19974 19975 19976 19977 19978 19979 19980 19981 19982 19983 19984 19985 19986 19987 19988 19989 19990 19991 19992 19993 19994 19995 19996 19997 19998 19999 20000 20001 20002 20003 | fc->perm = perms; return 0; }else{ return fsl_deck_F_add(d, zName, uuid, perms, priorName); } } int fsl_deck_F_set_content( fsl_deck * d, char const * zName, fsl_buffer const * src, fsl_fileperm_e perm, char const * priorName){ fsl_uuid_str zHash = 0; fsl_id_t rid = 0; fsl_id_t prevRid = 0; int rc = 0; if(d->rid>0){ return fsl_cx_err_set(d->f, FSL_RC_MISUSE, "%s() cannot be applied to a saved deck.", __func__); }else if(!fsl_cx_transaction_level(d->f)){ return fsl_cx_err_set(d->f, FSL_RC_MISUSE, "%s() requires that a transaction is active.", __func__); } rc = fsl_repo_blob_lookup(d->f, src, &rid, &zHash); if(rc && FSL_RC_NOT_FOUND!=rc) goto end; assert(zHash); if(!rid){ fsl_card_F const * fc; /* This is new content. Save it, then see if we have a previous version |
︙ | ︙ | |||
20588 20589 20590 20591 20592 20593 20594 | } if(!rc && parentId){ rc = fsl__tag_propagate_all(d->f, parentId); } return rc; } | < < < < < < < < < < < < < < < < < < | | | | | | | | | | | 20727 20728 20729 20730 20731 20732 20733 20734 20735 20736 20737 20738 20739 20740 20741 20742 20743 20744 20745 20746 20747 20748 20749 20750 20751 20752 20753 20754 20755 20756 20757 20758 20759 20760 20761 20762 20763 20764 20765 20766 20767 20768 20769 20770 20771 20772 20773 20774 20775 20776 20777 20778 20779 20780 20781 20782 20783 20784 20785 20786 20787 20788 20789 20790 20791 20792 20793 20794 20795 20796 20797 20798 20799 20800 20801 20802 20803 20804 20805 20806 20807 20808 20809 20810 20811 20812 20813 20814 20815 20816 | } if(!rc && parentId){ rc = fsl__tag_propagate_all(d->f, parentId); } return rc; } /** Overrideable crosslink listener which updates the timeline for attachment records. */ static int fsl_deck_xlink_f_attachment(fsl_deck * const d, void * state){ if(FSL_SATYPE_ATTACHMENT!=d->type) return 0; int rc; fsl_db * const db = fsl_cx_db_repo(d->f); fsl_buffer comment = fsl_buffer_empty; const char isAdd = (d->A.src && *d->A.src) ? 1 : 0; char attachToType = 'w' /* Assume wiki until we know otherwise, keeping in mind that the d->A.tgt might not yet be in the blob table, in which case we are unable to know, for certain, what the target is. That only affects the timeline (event table), though, not the crosslinking of the attachment itself. */; assert(db); if(fsl_is_uuid(d->A.tgt)){ if( fsl_db_exists(db, "SELECT 1 FROM tag WHERE tagname='tkt-%q'", d->A.tgt)){ attachToType = 't' /* attach to a known ticket */; }else if( fsl_db_exists(db, "SELECT 1 FROM tag WHERE tagname='event-%q'", d->A.tgt)){ attachToType = 'e' /* attach to a known technote (event) */; } } if('w'==attachToType){ /* Attachment applies to a wiki page */ if(isAdd){ rc = fsl_buffer_appendf(&comment, "Add attachment \"%h\" " "to wiki page [%h]", d->A.name, d->A.tgt); }else{ rc = fsl_buffer_appendf(&comment, "Delete attachment \"%h\" " "from wiki page [%h]", d->A.name, d->A.tgt); } }else if('e' == attachToType){/*technote*/ if(isAdd){ rc = fsl_buffer_appendf(&comment, "Add attachment [/artifact/%!S|%h] to " "tech note [/technote/%!S|%S]", d->A.src, d->A.name, d->A.tgt, d->A.tgt); }else{ rc = fsl_buffer_appendf(&comment, "Delete attachment \"/artifact/%!S|%h\" " "from tech note [/technote/%!S|%S]", d->A.name, d->A.name, d->A.tgt, d->A.tgt); } }else{ /* Attachment applies to a ticket */ if(isAdd){ rc = fsl_buffer_appendf(&comment, "Add attachment [/artifact/%!S|%h] " "to ticket [%!S|%S]", d->A.src, d->A.name, d->A.tgt, d->A.tgt); }else{ rc = fsl_buffer_appendf(&comment, "Delete attachment \"%h\" " "from ticket [%!S|%S]", d->A.name, d->A.tgt, d->A.tgt); } } if(!rc){ rc = fsl_db_exec(db, "REPLACE INTO event(type,mtime,objid,user,comment)" "VALUES(" "'%c',%"FSL_JULIAN_T_PFMT",%"FSL_ID_T_PFMT"," "%Q,%B)", attachToType, d->D, d->rid, d->U, &comment); } fsl_buffer_clear(&comment); return rc; } /** Overrideable crosslink listener which updates the timeline for checkin records. */ |
︙ | ︙ | |||
20748 20749 20750 20751 20752 20753 20754 | construct. Note that we are using a lot of historical code which hard-codes english-lanuage text and links which only work in fossil(1). i would prefer to farm this out to a crosslink callback, and provide a default implementation which more or less mimics fossil(1). */ int rc = 0; | | | 20869 20870 20871 20872 20873 20874 20875 20876 20877 20878 20879 20880 20881 20882 20883 | construct. Note that we are using a lot of historical code which hard-codes english-lanuage text and links which only work in fossil(1). i would prefer to farm this out to a crosslink callback, and provide a default implementation which more or less mimics fossil(1). */ int rc = 0; fsl_buffer comment = fsl_buffer_empty; fsl_size_t i; const char *zName; const char *zValue; const char *zUuid; int branchMove = 0; int const uuidLen = 8; fsl_card_T const * tag = NULL; |
︙ | ︙ | |||
20785 20786 20787 20788 20789 20790 20791 | That said, sorting by UUID would have a nice side-effect on the output of grouping tags by the UUID they tag. So far (201404) such groups of tags have not appeared in the wild because fossil(1) has no mechanism for creating them. */ for( i = 0; !rc && (i < li->used); ++i, prevTag = tag){ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20906 20907 20908 20909 20910 20911 20912 20913 20914 20915 20916 20917 20918 20919 20920 20921 20922 20923 20924 20925 20926 20927 20928 20929 20930 20931 20932 20933 20934 20935 20936 20937 20938 20939 20940 20941 20942 20943 20944 20945 20946 20947 20948 20949 20950 20951 20952 20953 20954 20955 20956 20957 20958 20959 20960 20961 20962 20963 20964 20965 20966 20967 20968 20969 20970 20971 20972 20973 20974 20975 20976 20977 20978 20979 20980 20981 20982 20983 20984 20985 20986 20987 20988 20989 20990 20991 20992 20993 20994 20995 20996 20997 20998 20999 21000 21001 21002 21003 21004 21005 21006 21007 21008 21009 21010 21011 21012 21013 21014 | That said, sorting by UUID would have a nice side-effect on the output of grouping tags by the UUID they tag. So far (201404) such groups of tags have not appeared in the wild because fossil(1) has no mechanism for creating them. */ for( i = 0; !rc && (i < li->used); ++i, prevTag = tag){ char isProp = 0, isAdd = 0, isCancel = 0; tag = (fsl_card_T const *)li->list[i]; zUuid = tag->uuid; if(!zUuid /*tag on self*/) continue; if( i==0 || 0!=fsl_uuidcmp(tag->uuid, prevTag->uuid)){ rc = fsl_buffer_appendf(&comment, " Edit [%.*s]:", uuidLen, zUuid); branchMove = 0; } if(rc) goto end; isProp = FSL_TAGTYPE_PROPAGATING==tag->type; isAdd = FSL_TAGTYPE_ADD==tag->type; isCancel = FSL_TAGTYPE_CANCEL==tag->type; assert(isProp || isAdd || isCancel); zName = tag->name; zValue = tag->value; if( isProp && 0==fsl_strcmp(zName, "branch")){ rc = fsl_buffer_appendf(&comment, " Move to branch %s" "[/timeline?r=%h&nd&dp=%.*s | %h].", zValue, zValue, uuidLen, zUuid, zValue); branchMove = 1; }else if( isProp && fsl_strcmp(zName, "bgcolor")==0 ){ rc = fsl_buffer_appendf(&comment, " Change branch background color to \"%h\".", zValue); }else if( isAdd && fsl_strcmp(zName, "bgcolor")==0 ){ rc = fsl_buffer_appendf(&comment, " Change background color to \"%h\".", zValue); }else if( isCancel && fsl_strcmp(zName, "bgcolor")==0 ){ rc = fsl_buffer_appendf(&comment, " Cancel background color."); }else if( isAdd && fsl_strcmp(zName, "comment")==0 ){ rc = fsl_buffer_appendf(&comment, " Edit check-in comment."); }else if( isAdd && fsl_strcmp(zName, "user")==0 ){ rc = fsl_buffer_appendf(&comment, " Change user to \"%h\".", zValue); }else if( isAdd && fsl_strcmp(zName, "date")==0 ){ rc = fsl_buffer_appendf(&comment, " Timestamp %h.", zValue); }else if( isCancel && memcmp(zName, "sym-",4)==0 ){ if( !branchMove ){ rc = fsl_buffer_appendf(&comment, " Cancel tag %h.", zName+4); } }else if( isProp && memcmp(zName, "sym-",4)==0 ){ if( !branchMove ){ rc = fsl_buffer_appendf(&comment, " Add propagating tag \"%h\".", zName+4); } }else if( isAdd && memcmp(zName, "sym-",4)==0 ){ rc = fsl_buffer_appendf(&comment, " Add tag \"%h\".", zName+4); }else if( isCancel && memcmp(zName, "sym-",4)==0 ){ rc = fsl_buffer_appendf(&comment, " Cancel tag \"%h\".", zName+4); }else if( isAdd && fsl_strcmp(zName, "closed")==0 ){ rc = fsl_buffer_append(&comment, " Marked \"Closed\"", -1); if( !rc && zValue && *zValue ){ rc = fsl_buffer_appendf(&comment, " with note \"%h\"", zValue); } if(!rc) rc = fsl_buffer_append(&comment, ".", 1); }else if( isCancel && fsl_strcmp(zName, "closed")==0 ){ rc = fsl_buffer_append(&comment, " Removed the \"Closed\" mark", -1); if( !rc && zValue && *zValue ){ rc = fsl_buffer_appendf(&comment, " with note \"%h\"", zValue); } if(!rc) rc = fsl_buffer_append(&comment, ".", 1); }else { if( isCancel ){ rc = fsl_buffer_appendf(&comment, " Cancel \"%h\"", zName); }else if( isAdd ){ rc = fsl_buffer_appendf(&comment, " Add \"%h\"", zName); }else{ assert(isProp); rc = fsl_buffer_appendf(&comment, " Add propagating \"%h\"", zName); } if(rc) goto end; if( zValue && zValue[0] ){ rc = fsl_buffer_appendf(&comment, " with value \"%h\".", zValue); }else{ rc = fsl_buffer_append(&comment, ".", 1); } } } /* foreach tag loop */ if(!rc){ /* TODO: cached statement */ rc = fsl_db_exec(db, "REPLACE INTO event" "(type,mtime,objid,user,comment) " "VALUES('g'," "%"FSL_JULIAN_T_PFMT"," "%"FSL_ID_T_PFMT"," "%Q,%Q)", mtime, d->rid, d->U, (comment.used>1) ? (fsl_buffer_cstr(&comment) +1/*leading space on all entries*/) : NULL); } end: fsl_buffer_clear(&comment); return rc; } static int fsl_deck_xlink_f_forum(fsl_deck * const d, void * state){ if(FSL_SATYPE_FORUMPOST!=d->type) return 0; int rc = 0; |
︙ | ︙ | |||
21077 21078 21079 21080 21081 21082 21083 | to do all updates to the event (timeline) table via these crosslinkers and perform the core, UI-agnostic, crosslinking bits in the internal fsl__deck_crosslink_XXX() functions. That should allow clients to override how the timeline is updated without requiring them to understand the rest of the required schema updates. */ | | | 21198 21199 21200 21201 21202 21203 21204 21205 21206 21207 21208 21209 21210 21211 21212 | to do all updates to the event (timeline) table via these crosslinkers and perform the core, UI-agnostic, crosslinking bits in the internal fsl__deck_crosslink_XXX() functions. That should allow clients to override how the timeline is updated without requiring them to understand the rest of the required schema updates. */ int fsl_cx_install_timeline_crosslinkers(fsl_cx * const f){ int rc; assert(!f->xlinkers.used); assert(!f->xlinkers.list); rc = fsl_xlink_listener(f, "fsl/attachment/timeline", fsl_deck_xlink_f_attachment, 0); if(!rc) rc = fsl_xlink_listener(f, "fsl/checkin/timeline", fsl_deck_xlink_f_checkin, 0); |
︙ | ︙ | |||
21379 21380 21381 21382 21383 21384 21385 | end: return rc; } static int fsl__deck_crosslink_ticket(fsl_deck * const d){ int rc; fsl_cx * const f = d->f; | | | | > | < | | | | | | < < < < < < < < < < < < < | < < < < < < < < < < < | | | | < < < < < < > > > | 21500 21501 21502 21503 21504 21505 21506 21507 21508 21509 21510 21511 21512 21513 21514 21515 21516 21517 21518 21519 21520 21521 21522 21523 21524 21525 21526 21527 21528 21529 21530 21531 21532 | end: return rc; } static int fsl__deck_crosslink_ticket(fsl_deck * const d){ int rc; fsl_cx * const f = d->f; #if 0 fsl_db * const db = fsl_cx_db_repo(f); #endif /* TODO: huge block from manifest_crosslink(). A full port requires other infrastructure for collapsing relatively close time values into the same time for timeline purposes. i'd prefer to farm this out to a crosslink callback. Even then, the future of tickets in libfossil is uncertain, but we should crosslink them so that repos stay compatible with fossil(1) without requiring a rebuild using fossil(1). */ if(f->flags & FSL_CX_F_SKIP_UNKNOWN_CROSSLINKS){ return 0; } rc = fsl_cx_err_set(f, FSL_RC_NYI, "MISSING: a huge block of TICKET stuff from " "manifest_crosslink(). It requires infrastructure " "libfossil does not yet have."); return rc; } int fsl__deck_crosslink_one( fsl_deck * const d ){ int rc; assert(d->f && "API misuse:fsl_deck::f == NULL"); rc = fsl__crosslink_begin(d->f); |
︙ | ︙ | |||
21512 21513 21514 21515 21516 21517 21518 21519 | rc = fsl__deck_crosslink_attachment(d); break; /* FSL_SATYPE_CONTROL is handled above except for the timeline update, which is handled by a callback below */ default: break; } /* Call any crosslink callbacks... */ | > > | < | | > > | | > > > > > > > > > > > > > > > | > | 21606 21607 21608 21609 21610 21611 21612 21613 21614 21615 21616 21617 21618 21619 21620 21621 21622 21623 21624 21625 21626 21627 21628 21629 21630 21631 21632 21633 21634 21635 21636 21637 21638 21639 21640 21641 21642 21643 21644 21645 21646 21647 21648 21649 21650 21651 21652 21653 21654 21655 21656 | rc = fsl__deck_crosslink_attachment(d); break; /* FSL_SATYPE_CONTROL is handled above except for the timeline update, which is handled by a callback below */ default: break; } if(rc) goto end; /* Call any crosslink callbacks... */ if(f->xlinkers.list){ fsl_size_t i; fsl_xlinker * xl = NULL; for( i = 0; !rc && (i < f->xlinkers.used); ++i ){ xl = f->xlinkers.list+i; rc = xl->f( d, xl->state ); } if(rc){ assert(xl); if(!f->error.code){ if(f->dbMain->error.code){ fsl_cx_uplift_db_error(f, f->dbMain); }else{ fsl_cx_err_set(f, rc, "Crosslink callback handler " "'%s' failed with code %d (%s) for " "artifact RID #%" FSL_ID_T_PFMT ".", xl->name, rc, fsl_rc_cstr(rc), d->rid); } } } }/*end crosslink callbacks*/ end: if(!rc){ rc = fsl_db_transaction_end(db, false); }else{ if(db->error.code && !f->error.code){ fsl_cx_uplift_db_error(f,db); } fsl_db_transaction_end(db, true); } return rc; }/*end fsl__deck_crosslink()*/ /** Return true if z points to the first character after a blank line. Tolerate either \r\n or \n line endings. As this looks backwards in z, z must point to at least 3 characters past the beginning of a legal string. |
︙ | ︙ | |||
21632 21633 21634 21635 21636 21637 21638 | *pn = (fsl_size_t)n; return; } /** Internal helper for parsing manifests. Holds a source file (memory | | | | | | | < | | < | < < < | | > > > | | | | | | 21745 21746 21747 21748 21749 21750 21751 21752 21753 21754 21755 21756 21757 21758 21759 21760 21761 21762 21763 21764 21765 21766 21767 21768 21769 21770 21771 21772 21773 21774 21775 21776 21777 21778 21779 21780 21781 21782 21783 21784 21785 21786 21787 21788 21789 21790 21791 21792 21793 21794 21795 21796 21797 21798 21799 21800 21801 21802 21803 21804 21805 21806 21807 21808 21809 21810 21811 | *pn = (fsl_size_t)n; return; } /** Internal helper for parsing manifests. Holds a source file (memory range) and gets updated by fsl_deck_next_token() and friends. */ struct fsl_src { /** First char of the next token. */ unsigned char * z; /** One-past-the-end of the manifest. */ unsigned char * zEnd; /** True if z points to the start of a new line. */ char atEol; }; typedef struct fsl_src fsl_src; static const fsl_src fsl_src_empty = {NULL,NULL,0}; /** Return a pointer to the next token. The token is zero-terminated. Return NULL if there are no more tokens on the current line. If pLen is not NULL and this function returns non-NULL then *pLen is set to the byte length of the new token. */ static unsigned char *fsl_deck_next_token(fsl_src *p, fsl_size_t *pLen){ unsigned char *z; unsigned char *zStart; int c; if( p->atEol ) return NULL; zStart = z = p->z; while( (c=(*z))!=' ' && c!='\n' ){ ++z; } *z = 0; p->z = &z[1]; p->atEol = c=='\n'; if( pLen ) *pLen = z - zStart; return zStart; } /** Return the card-type for the next card. Return 0 if there are no more cards or if we are not at the end of the current card. */ static unsigned char mf_next_card(fsl_src *p){ unsigned char c; if( !p->atEol || p->z>=p->zEnd ) return 0; c = p->z[0]; if( p->z[1]==' ' ){ p->z += 2; p->atEol = 0; }else if( p->z[1]=='\n' ){ p->z += 2; p->atEol = 1; }else{ c = 0; } return c; } /** |
︙ | ︙ | |||
21767 21768 21769 21770 21771 21772 21773 | #ifdef ERROR # undef ERROR #endif #define ERROR(RC,MSG) do{ rc = (RC); zMsg = (MSG); goto bailout; } while(0) #define SYNTAX(MSG) ERROR(rc ? rc : FSL_RC_SYNTAX,MSG) bool isRepeat = 0/* , hasSelfRefTag = 0 */; int rc = 0; | | > | | | > > > > > > > | < | | | | | > > > | | < < | < < > > > > > > | | > > < < < | 21878 21879 21880 21881 21882 21883 21884 21885 21886 21887 21888 21889 21890 21891 21892 21893 21894 21895 21896 21897 21898 21899 21900 21901 21902 21903 21904 21905 21906 21907 21908 21909 21910 21911 21912 21913 21914 21915 21916 21917 21918 21919 21920 21921 21922 21923 21924 21925 21926 21927 21928 21929 21930 21931 21932 21933 21934 21935 21936 21937 21938 21939 21940 21941 21942 21943 21944 21945 21946 21947 21948 21949 21950 21951 21952 21953 21954 21955 21956 21957 21958 21959 21960 21961 21962 21963 21964 21965 21966 21967 21968 | #ifdef ERROR # undef ERROR #endif #define ERROR(RC,MSG) do{ rc = (RC); zMsg = (MSG); goto bailout; } while(0) #define SYNTAX(MSG) ERROR(rc ? rc : FSL_RC_SYNTAX,MSG) bool isRepeat = 0/* , hasSelfRefTag = 0 */; int rc = 0; fsl_src x = fsl_src_empty; char const * zMsg = NULL; fsl_id_bag * seen; char cType = 0, cPrevType = 0; unsigned char * z = src ? src->mem : NULL; fsl_size_t tokLen = 0; unsigned char * token; fsl_size_t n = z ? src->used : 0; unsigned char * uuid; double ts; int cardCount = 0; fsl_cx * f; fsl_error * err; int stealBuf = 0 /* gets incremented if we need to steal src->mem. */; unsigned nSelfTag = 0 /* number of T cards which refer to '*' (this artifact). */; unsigned nSimpleTag = 0 /* number of T cards with "+" prefix */; /* lettersSeen keeps track of the card letters we have seen so that we can then relatively quickly figure out what type of manifest we have parsed without having to inspect the card contents. Each index records a count of how many of that card we've seen. */ int lettersSeen[27] = {0/*A*/,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0/*Z*/, 0 /* sentinel element for reasons lost to history but removing it breaks stuff. */}; if(!d->f || !z) return FSL_RC_MISUSE; /* Every control artifact ends with a '\n' character. Exit early if that is not the case for this artifact. */ f = d->f; if(rid>0){ d->rid = rid; #if 1 if(fsl__cx_mcache_search2(f, rid, d, FSL_SATYPE_ANY, &rc) || rc){ if(0==rc){ assert(d->rid == rid); fsl_buffer_clear(src); } return rc; } #endif } err = &f->error; if(!*z || !n || ( '\n' != z[n-1]) ){ return fsl_error_set(err, FSL_RC_SYNTAX, "%s.", n ? "Not terminated with \\n" : "Zero-length input"); } else if(rid<0){ return fsl_error_set(err, FSL_RC_RANGE, "Invalid (negative) RID %"FSL_ID_T_PFMT " for fsl_deck_parse()", rid); } seen = &f->cache.mfSeen; if((0==rid) || fsl_id_bag_contains(seen,rid)){ isRepeat = 1; }else{ isRepeat = 0; rc = fsl_id_bag_insert(seen, rid); if(rc){ assert(FSL_RC_OOM==rc); return rc; } } fsl_deck_clean(d); fsl_deck_init(f, d, FSL_SATYPE_ANY); /* Verify that the first few characters of the artifact look like a control artifact. */ if( !fsl_might_be_artifact(src) ){ SYNTAX("Content does not look like a structural artifact"); } /* Strip off the PGP signature if there is one. Example of signed manifest: https://fossil-scm.org/index.html/artifact/28987096ac */ { |
︙ | ︙ | |||
21858 21859 21860 21861 21862 21863 21864 | if( !isRepeat ) g.parseCnt[0]++; */ /* Reminder: parsing modifies the input (to simplify the tokenization/parsing). As of mid-201403, we recycle as much as possible from the source | | | | | | 21980 21981 21982 21983 21984 21985 21986 21987 21988 21989 21990 21991 21992 21993 21994 21995 21996 21997 21998 21999 22000 22001 22002 22003 22004 22005 22006 22007 22008 22009 22010 22011 22012 22013 22014 22015 22016 22017 22018 22019 22020 22021 | if( !isRepeat ) g.parseCnt[0]++; */ /* Reminder: parsing modifies the input (to simplify the tokenization/parsing). As of mid-201403, we recycle as much as possible from the source buffer and take over ownership _if_ we do so. */ /* Now parse, card by card... */ x.z = z; x.zEnd = z+n; x.atEol= 1; /* Parsing helpers... */ #define TOKEN(DEFOS) tokLen=0; token = fsl_deck_next_token(&x,&tokLen); \ if(token && tokLen && (DEFOS)) fsl_bytes_defossilize(token, &tokLen) #define TOKEN_EXISTS(MSG_IF_NOT) if(!token){ SYNTAX(MSG_IF_NOT); }(void)0 #define TOKEN_CHECKHEX(MSG) if(token && (int)tokLen!=fsl_is_uuid((char const *)token))\ { SYNTAX(MSG); } #define TOKEN_UUID(CARD) TOKEN_CHECKHEX("Malformed UUID in " #CARD "-card") #define TOKEN_MD5(ERRMSG) if(!token || FSL_STRLEN_MD5!=(int)tokLen) \ {SYNTAX(ERRMSG);} /** Reminder: we do not know the type of the manifest at this point, so all of the fsl_deck_add/set() bits below can't do their validation. We have to determine at parse-time (or afterwards) which type of deck it is based on the cards we've seen. We guess the type as early as possible to enable during-parse validation, and do a post-parse check for the legality of cards added before validation became possible. */ #define SEEN(CARD) lettersSeen[*#CARD - 'A'] for( cPrevType=1; !rc && (0 < (cType = mf_next_card(&x))); cPrevType = cType ){ ++cardCount; if(cType<cPrevType){ if(d->E.uuid && 'N'==cType && 'P'==cPrevType){ /* Workaround for a pair of historical fossil bugs which synergized to allow malformed technotes to be saved: |
︙ | ︙ | |||
21907 21908 21909 21910 21911 21912 21913 | ++lettersSeen[cType-'A']; }else{ SYNTAX("Invalid card name"); } switch(cType){ /* A <filename> <target> ?<source>? | | | 22029 22030 22031 22032 22033 22034 22035 22036 22037 22038 22039 22040 22041 22042 22043 | ++lettersSeen[cType-'A']; }else{ SYNTAX("Invalid card name"); } switch(cType){ /* A <filename> <target> ?<source>? Identifies an attachment to either a wiki page, a ticket, or a technote. <source> is the artifact that is the attachment. <source> is omitted to delete an attachment. <target> is the name of a wiki page, technote, or ticket to which that attachment is connected. */ case 'A':{ |
︙ | ︙ | |||
21942 21943 21944 21945 21946 21947 21948 | /*rc = fsl_deck_A_set(d, (char const *)name, (char const *)uuid, (char const *)src);*/ d->type = FSL_SATYPE_ATTACHMENT; break; } /* B <uuid> | | | | | 22064 22065 22066 22067 22068 22069 22070 22071 22072 22073 22074 22075 22076 22077 22078 22079 22080 22081 22082 22083 22084 22085 22086 22087 22088 22089 22090 22091 22092 22093 22094 22095 22096 22097 22098 22099 22100 22101 22102 22103 22104 22105 22106 22107 22108 22109 22110 22111 22112 22113 22114 | /*rc = fsl_deck_A_set(d, (char const *)name, (char const *)uuid, (char const *)src);*/ d->type = FSL_SATYPE_ATTACHMENT; break; } /* B <uuid> A B-line gives the UUID for the baseline of a delta-manifest. */ case 'B':{ if(d->B.uuid){ SYNTAX("Multiple B-cards"); } TOKEN(0); TOKEN_UUID(B); d->B.uuid = (char *)token; ++stealBuf; d->type = FSL_SATYPE_CHECKIN; /* rc = fsl_deck_B_set(d, (char const *)token); */ break; } /* C <comment> Comment text is fossil-encoded. There may be no more than one C line. C lines are required for manifests, are optional for Events and Attachments, and are disallowed on all other control files. */ case 'C':{ if( d->C ){ SYNTAX("more than one C-card"); } TOKEN(1); TOKEN_EXISTS("Missing comment text for C-card"); /* rc = fsl_deck_C_set(d, (char const *)token, (fsl_int_t)tokLen); */ d->C = (char *)token; ++stealBuf; break; } /* D <timestamp> The timestamp should be ISO 8601. YYYY-MM-DDtHH:MM:SS There can be no more than 1 D line. D lines are required for all control files except for clusters. */ case 'D':{ #define TOKEN_DATETIME(LETTER,MEMBER) \ if( d->MEMBER>0.0 ) { SYNTAX("More than one "#LETTER"-card"); } \ |
︙ | ︙ | |||
22001 22002 22003 22004 22005 22006 22007 | TOKEN_DATETIME(D,D); rc = fsl_deck_D_set(d, ts); break; } /* E <timestamp> <uuid> | | | | | < | | | < < | | | | < | > > | 22123 22124 22125 22126 22127 22128 22129 22130 22131 22132 22133 22134 22135 22136 22137 22138 22139 22140 22141 22142 22143 22144 22145 22146 22147 22148 22149 22150 22151 22152 22153 22154 22155 22156 22157 22158 22159 22160 22161 22162 22163 22164 22165 22166 22167 22168 22169 22170 22171 22172 22173 22174 22175 22176 22177 22178 | TOKEN_DATETIME(D,D); rc = fsl_deck_D_set(d, ts); break; } /* E <timestamp> <uuid> An "event" card that contains the timestamp of the event in the format YYYY-MM-DDtHH:MM:SS and a unique identifier for the event. The event timestamp is distinct from the D timestamp. The D timestamp is when the artifact was created whereas the E timestamp is when the specific event is said to occur. */ case 'E':{ TOKEN_DATETIME(E,E.julian); TOKEN(0); TOKEN_EXISTS("Missing UUID part of E-card"); TOKEN_UUID(E); d->E.julian = ts; d->E.uuid = (char *)token; ++stealBuf; d->type = FSL_SATYPE_EVENT; break; } /* F <filename> ?<uuid>? ?<permissions>? ?<old-name>? Identifies a file in a manifest. Multiple F lines are allowed in a manifest. F lines are not allowed in any other control file. The filename and old-name are fossil-encoded. In delta manifests, deleted files are denoted by the 1-arg form. In baseline manifests, deleted files simply are not in the manifest. */ case 'F':{ char * name; char * perms = NULL; char * priorName = NULL; fsl_fileperm_e perm = FSL_FILE_PERM_REGULAR; fsl_card_F * fc = NULL; /** Basic tests with various repos have shown that the approximate number of F-cards in a manifest is rougly the manifest size/75. We'll use that as an initial alloc size. */ rc = 0; if(!d->F.capacity){ rc = fsl_card_F_list_reserve(&d->F, src->used/75+10); } TOKEN(0); TOKEN_EXISTS("Missing name for F-card"); name = (char *)token; TOKEN(0); TOKEN_UUID(F); |
︙ | ︙ | |||
22075 22076 22077 22078 22079 22080 22081 22082 22083 22084 22085 22086 22087 22088 | /*MARKER(("Unmatched perms string character: %d / %c !", (int)*perms, *perms));*/ SYNTAX("Invalid perms string character"); } TOKEN(0); if(token) priorName = (char *)token; } fsl_bytes_defossilize( (unsigned char *)name, 0 ); if(fsl_is_reserved_fn(name, -1)){ /* Some historical (pre-late-2020) manifests contain files they really shouldn't, like _FOSSIL_ and .fslckout. Since late 2020, fossil simply skips over these when parsing manifests, so we'll do the same. */ break; } | > < | | | | | | 22195 22196 22197 22198 22199 22200 22201 22202 22203 22204 22205 22206 22207 22208 22209 22210 22211 22212 22213 22214 22215 22216 22217 22218 22219 22220 22221 22222 22223 22224 22225 22226 22227 22228 22229 22230 22231 22232 22233 22234 22235 22236 22237 22238 22239 22240 22241 22242 22243 22244 22245 22246 22247 22248 22249 22250 22251 22252 22253 22254 22255 22256 22257 22258 22259 22260 22261 22262 22263 22264 22265 22266 22267 22268 22269 22270 22271 22272 22273 22274 22275 22276 22277 22278 22279 22280 22281 22282 22283 22284 22285 22286 22287 22288 22289 | /*MARKER(("Unmatched perms string character: %d / %c !", (int)*perms, *perms));*/ SYNTAX("Invalid perms string character"); } TOKEN(0); if(token) priorName = (char *)token; } fsl_bytes_defossilize( (unsigned char *)name, 0 ); if(priorName) fsl_bytes_defossilize( (unsigned char *)priorName, 0 ); if(fsl_is_reserved_fn(name, -1)){ /* Some historical (pre-late-2020) manifests contain files they really shouldn't, like _FOSSIL_ and .fslckout. Since late 2020, fossil simply skips over these when parsing manifests, so we'll do the same. */ break; } fc = rc ? 0 : fsl_card_F_list_push(&d->F); if(!fc){ zMsg = "OOM"; goto bailout; } ++stealBuf; assert(d->F.used>1 ? (FSL_CARD_F_LIST_NEEDS_SORT & d->F.flags) : 1); fc->deckOwnsStrings = true; fc->name = name; fc->priorName = priorName; fc->perm = perm; fc->uuid = (fsl_uuid_str)uuid; d->type = FSL_SATYPE_CHECKIN; break; } /* G <uuid> A G-line gives the UUID for the thread root of a forum post. */ case 'G':{ if(d->G){ SYNTAX("Multiple G-cards"); } TOKEN(0); TOKEN_EXISTS("Missing UUID in G-card"); TOKEN_UUID(G); d->G = (char*)token; ++stealBuf; d->type = FSL_SATYPE_FORUMPOST; break; } /* H <forum post title> H text is fossil-encoded. There may be no more than one H line. H lines are optional for forum posts and are disallowed on all other control files. */ case 'H':{ if( d->H ){ SYNTAX("more than one H-card"); } TOKEN(1); TOKEN_EXISTS("Missing text for H-card"); d->H = (char *)token; ++stealBuf; d->type = FSL_SATYPE_FORUMPOST; break; } /* I <uuid> A I-line gives the UUID for the in-response-to UUID for a forum post. */ case 'I':{ if(d->I){ SYNTAX("Multiple I-cards"); } TOKEN(0); TOKEN_EXISTS("Missing UUID in I-card"); TOKEN_UUID(I); d->I = (char*)token; ++stealBuf; d->type = FSL_SATYPE_FORUMPOST; break; } /* J <name> ?<value>? Specifies a name value pair for ticket. If the first character of <name> is "+" then the <value> is appended to any preexisting value. If <value> is omitted then it is understood to be an empty string. */ case 'J':{ char const * field; |
︙ | ︙ | |||
22178 22179 22180 22181 22182 22183 22184 | TOKEN(1); rc = fsl_deck_J_add(d, isAppend, field, (char const *)token); d->type = FSL_SATYPE_TICKET; break; } /* | | | | | | | | | | | | 22298 22299 22300 22301 22302 22303 22304 22305 22306 22307 22308 22309 22310 22311 22312 22313 22314 22315 22316 22317 22318 22319 22320 22321 22322 22323 22324 22325 22326 22327 22328 22329 22330 22331 22332 22333 22334 22335 22336 22337 22338 22339 22340 22341 22342 22343 22344 22345 22346 22347 22348 22349 22350 22351 22352 22353 22354 22355 22356 22357 22358 22359 22360 22361 22362 22363 22364 22365 22366 22367 22368 22369 22370 22371 22372 22373 22374 22375 22376 22377 22378 22379 22380 22381 22382 22383 22384 | TOKEN(1); rc = fsl_deck_J_add(d, isAppend, field, (char const *)token); d->type = FSL_SATYPE_TICKET; break; } /* K <uuid> A K-line gives the UUID for the ticket which this control file is amending. */ case 'K':{ if(d->K){ SYNTAX("Multiple K-cards"); } TOKEN(0); TOKEN_EXISTS("Missing UUID in K-card"); TOKEN_UUID(K); d->K = (char*)token; ++stealBuf; d->type = FSL_SATYPE_TICKET; break; } /* L <wikititle> The wiki page title is fossil-encoded. There may be no more than one L line. */ case 'L':{ if(d->L){ SYNTAX("Multiple L-cards"); } TOKEN(1); TOKEN_EXISTS("Missing text for L-card"); d->L = (char*)token; ++stealBuf; d->type = FSL_SATYPE_WIKI; break; } /* M <uuid> An M-line identifies another artifact by its UUID. M-lines occur in clusters only. */ case 'M':{ TOKEN(0); TOKEN_EXISTS("Missing UUID for M-card"); TOKEN_UUID(M); ++stealBuf; d->type = FSL_SATYPE_CLUSTER; rc = fsl_list_append(&d->M, token); if( !rc && d->M.used>1 && fsl_strcmp((char const *)d->M.list[d->M.used-2], (char const *)token)>=0 ){ SYNTAX("M-card in the wrong order"); } break; } /* N <uuid> An N-line identifies the mimetype of wiki or comment text. */ case 'N':{ if(1<SEEN(N)){ SYNTAX("Multiple N-cards"); } TOKEN(0); TOKEN_EXISTS("Missing UUID on N-card"); ++stealBuf; d->N = (char *)token; break; } /* P <uuid> ... Specify one or more other artifacts which are the parents of this artifact. The first parent is the primary parent. All others are parents by merge. */ case 'P':{ if(1<SEEN(P)){ SYNTAX("More than one P-card"); |
︙ | ︙ | |||
22280 22281 22282 22283 22284 22285 22286 | if(!rc){ TOKEN(0); } } break; } /* | | | | 22400 22401 22402 22403 22404 22405 22406 22407 22408 22409 22410 22411 22412 22413 22414 22415 | if(!rc){ TOKEN(0); } } break; } /* Q (+|-)<uuid> ?<uuid>? Specify one or a range of checkins that are cherrypicked into this checkin ("+") or backed out of this checkin ("-"). */ case 'Q':{ fsl_cherrypick_type_e qType = FSL_CHERRYPICK_INVALID; TOKEN(0); TOKEN_EXISTS("Missing target UUID for Q-card"); |
︙ | ︙ | |||
22308 22309 22310 22311 22312 22313 22314 | } d->type = FSL_SATYPE_CHECKIN; rc = fsl_deck_Q_add(d, qType, (char const *)uuid, (char const *)token); break; } /* | | | | | | | | | | | 22428 22429 22430 22431 22432 22433 22434 22435 22436 22437 22438 22439 22440 22441 22442 22443 22444 22445 22446 22447 22448 22449 22450 22451 22452 22453 22454 22455 22456 22457 22458 22459 22460 22461 22462 22463 22464 22465 22466 22467 22468 22469 22470 22471 | } d->type = FSL_SATYPE_CHECKIN; rc = fsl_deck_Q_add(d, qType, (char const *)uuid, (char const *)token); break; } /* R <md5sum> Specify the MD5 checksum over the name and content of all files in the manifest. */ case 'R':{ if(1<SEEN(R)){ SYNTAX("More than one R-card"); } TOKEN(0); TOKEN_EXISTS("Missing MD5 token in R-card"); TOKEN_MD5("Malformed MD5 token in R-card"); d->R = (char *)token; ++stealBuf; d->type = FSL_SATYPE_CHECKIN; break; } /* T (+|*|-)<tagname> <uuid> ?<value>? Create or cancel a tag or property. The tagname is fossil-encoded. The first character of the name must be either "+" to create a singleton tag, "*" to create a propagating tag, or "-" to create anti-tag that undoes a prior "+" or blocks propagation of of a "*". The tag is applied to <uuid>. If <uuid> is "*" then the tag is applied to the current manifest. If <value> is provided then the tag is really a property with the given value. Tags are not allowed in clusters. Multiple T lines are allowed. */ case 'T':{ unsigned char * name, * value; fsl_tagtype_e tagType = FSL_TAGTYPE_INVALID; TOKEN(1); TOKEN_EXISTS("Missing name for T-card"); |
︙ | ︙ | |||
22374 22375 22376 22377 22378 22379 22380 | case '+': tagType = FSL_TAGTYPE_ADD; ++nSimpleTag; break; case '-': tagType = FSL_TAGTYPE_CANCEL; break; default: SYNTAX("Malformed tag name"); } ++name /* skip type marker byte */; | | | | < < < < < < < < < < < < < < < < < < < < < < < | | | 22494 22495 22496 22497 22498 22499 22500 22501 22502 22503 22504 22505 22506 22507 22508 22509 22510 22511 22512 22513 22514 22515 22516 22517 22518 22519 | case '+': tagType = FSL_TAGTYPE_ADD; ++nSimpleTag; break; case '-': tagType = FSL_TAGTYPE_CANCEL; break; default: SYNTAX("Malformed tag name"); } ++name /* skip type marker byte */; /* Potential todo: add the order check from this commit: https://fossil-scm.org/index.html/info/55cacfcace */ rc = fsl_deck_T_add(d, tagType, (fsl_uuid_cstr)uuid, (char const *)name, (char const *)value); break; } /* U ?<login>? Identify the user who created this control file by their login. Only one U line is allowed. Prohibited in clusters. If the user name is omitted, take that to be "anonymous". */ case 'U':{ if(d->U) SYNTAX("More than one U-card"); TOKEN(1); |
︙ | ︙ | |||
22446 22447 22448 22449 22450 22451 22452 | wlen = fsl_str_to_size((char const *)token); if((fsl_size_t)-1==wlen){ SYNTAX("Wiki size token is invalid"); } if( (&x.z[wlen+1]) > x.zEnd){ SYNTAX("Not enough content after W-card"); } | | | < < | | 22543 22544 22545 22546 22547 22548 22549 22550 22551 22552 22553 22554 22555 22556 22557 22558 22559 22560 22561 22562 22563 22564 22565 22566 22567 22568 22569 | wlen = fsl_str_to_size((char const *)token); if((fsl_size_t)-1==wlen){ SYNTAX("Wiki size token is invalid"); } if( (&x.z[wlen+1]) > x.zEnd){ SYNTAX("Not enough content after W-card"); } rc = fsl_buffer_append(&d->W, x.z, wlen); if(rc) goto bailout; x.z += wlen; if( '\n' != x.z[0] ){ SYNTAX("W-card content not \\n terminated"); } x.z[0] = 0; ++x.z; break; } /* Z <md5sum> MD5 checksum on this control file. The checksum is over all lines (other than PGP-signature lines) prior to the current line. This must be the last record. This card is required for all control file types except for Manifest. It is not required for manifest only for historical compatibility reasons. |
︙ | ︙ | |||
22515 22516 22517 22518 22519 22520 22521 | rc = d->f->error.code; goto bailout; } if(FSL_SATYPE_ANY==d->type){ rc = fsl_cx_err_set(f, FSL_RC_ERROR, "Internal error: could not determine type of " | | > | 22610 22611 22612 22613 22614 22615 22616 22617 22618 22619 22620 22621 22622 22623 22624 22625 | rc = d->f->error.code; goto bailout; } if(FSL_SATYPE_ANY==d->type){ rc = fsl_cx_err_set(f, FSL_RC_ERROR, "Internal error: could not determine type of " "control artifact we just (successfully!) " "parsed."); goto bailout; }else { /* Make sure we didn't pick up any cards which were picked up before d->type was guessed and are invalid for the post-guessed type. */ |
︙ | ︙ | |||
22549 22550 22551 22552 22553 22554 22555 | FSL_SATYPE_FORUMPOST==d->type); assert(0==rc); /* Additional checks based on artifact type */ switch( d->type ){ case FSL_SATYPE_CONTROL: { if( nSelfTag ){ | | | | | | 22645 22646 22647 22648 22649 22650 22651 22652 22653 22654 22655 22656 22657 22658 22659 22660 22661 22662 22663 22664 22665 22666 22667 22668 22669 22670 22671 22672 22673 22674 22675 | FSL_SATYPE_FORUMPOST==d->type); assert(0==rc); /* Additional checks based on artifact type */ switch( d->type ){ case FSL_SATYPE_CONTROL: { if( nSelfTag ){ SYNTAX("self-referential T-card in control artifact"); } break; } case FSL_SATYPE_TECHNOTE: { if( d->T.used!=nSelfTag ){ SYNTAX("non-self-referential T-card in technote"); }else if( d->T.used!=nSimpleTag ){ SYNTAX("T-card with '*' or '-' in technote"); } break; } case FSL_SATYPE_FORUMPOST: { if( d->H && d->I ){ SYNTAX("cannot have I-card and H-card in a forum post"); }else if( d->P.used>1 ){ SYNTAX("too many arguments to P-card"); } break; } default: break; } assert(!d->content.mem); |
︙ | ︙ | |||
22834 22835 22836 22837 22838 22839 22840 | #undef FCARD } int fsl_deck_save( fsl_deck * const d, bool isPrivate ){ int rc; fsl_cx * const f = d->f; fsl_db * const db = fsl_needs_repo(f); | | | 22930 22931 22932 22933 22934 22935 22936 22937 22938 22939 22940 22941 22942 22943 22944 | #undef FCARD } int fsl_deck_save( fsl_deck * const d, bool isPrivate ){ int rc; fsl_cx * const f = d->f; fsl_db * const db = fsl_needs_repo(f); fsl_buffer * const buf = &d->f->fileContent; fsl_id_t newRid = 0; bool const oldPrivate = f->cache.markPrivate; if(!f || !d ) return FSL_RC_MISUSE; else if(!db) return FSL_RC_NOT_A_REPO; if(d->rid>0){ #if 1 return 0; |
︙ | ︙ | |||
23012 23013 23014 23015 23016 23017 23018 | if(rc) break; } fsl_stmt_finalize(&q); if(rc) goto end; /* Process entries from pending_xlink temp table... */ rc = fsl_cx_prepare(f, &q, "SELECT id FROM pending_xlink"); | > | > | | < | | 23108 23109 23110 23111 23112 23113 23114 23115 23116 23117 23118 23119 23120 23121 23122 23123 23124 23125 23126 23127 23128 23129 23130 23131 23132 23133 23134 23135 23136 23137 23138 23139 23140 | if(rc) break; } fsl_stmt_finalize(&q); if(rc) goto end; /* Process entries from pending_xlink temp table... */ rc = fsl_cx_prepare(f, &q, "SELECT id FROM pending_xlink"); if(rc) goto end; while( FSL_RC_STEP_ROW==fsl_stmt_step(&q) ){ const char *zId = fsl_stmt_g_text(&q, 0, NULL); char cType; if(!zId || !*zId) continue; cType = zId[0]; ++zId; if('t'==cType){ /* FSL-MISSING: ticket_rebuild_entry(zId) */ continue; }else if('w'==cType){ /* FSL-MISSING: backlink_wiki_refresh(zId) */ continue; } } fsl_stmt_finalize(&q); rc = fsl_cx_exec(f, "DROP TABLE pending_xlink"); if(rc) goto end; /* If multiple check-ins happen close together in time, adjust their times by a few milliseconds to make sure they appear in chronological order. */ rc = fsl_cx_prepare(f, &q, "UPDATE time_fudge SET m1=m2-:incr " |
︙ | ︙ | |||
23067 23068 23069 23070 23071 23072 23073 | rc = fsl_cx_exec(f, "UPDATE event SET" " mtime=(SELECT m1 FROM time_fudge WHERE mid=objid)" " WHERE objid IN (SELECT mid FROM time_fudge)" " AND (mtime=omtime OR omtime IS NULL)" ); } end: | > | > < | | | < < | | | 23164 23165 23166 23167 23168 23169 23170 23171 23172 23173 23174 23175 23176 23177 23178 23179 23180 23181 23182 23183 23184 23185 23186 23187 23188 23189 23190 23191 23192 23193 23194 23195 23196 23197 23198 23199 23200 23201 23202 23203 23204 23205 23206 23207 23208 23209 23210 23211 23212 23213 23214 23215 23216 23217 | rc = fsl_cx_exec(f, "UPDATE event SET" " mtime=(SELECT m1 FROM time_fudge WHERE mid=objid)" " WHERE objid IN (SELECT mid FROM time_fudge)" " AND (mtime=omtime OR omtime IS NULL)" ); } end: if(!rc){ fsl_cx_exec(f, "DROP TABLE time_fudge"); } if(rc) fsl_cx_transaction_end(f, true); else rc = fsl_cx_transaction_end(f, false); return rc; } int fsl__crosslink_begin(fsl_cx * const f){ int rc; assert(f); assert(0==f->cache.isCrosslinking); if(f->cache.isCrosslinking){ return fsl_cx_err_set(f, FSL_RC_MISUSE, "Crosslink is already running."); } rc = fsl_cx_transaction_begin(f); if(rc) return rc; rc = fsl_cx_exec_multi(f, "CREATE TEMP TABLE pending_xlink(id TEXT PRIMARY KEY)WITHOUT ROWID;" "CREATE TEMP TABLE time_fudge(" " mid INTEGER PRIMARY KEY," /* The rid of a manifest */ " m1 REAL," /* The timestamp on mid */ " cid INTEGER," /* A child or mid */ " m2 REAL" /* Timestamp on the child */ ");"); if(0==rc){ f->cache.isCrosslinking = true; }else{ fsl_cx_transaction_end(f, true); } return rc; } #undef MARKER #undef AGE_FUDGE_WINDOW #undef AGE_ADJUST_INCREMENT #undef F_at /* end of file deck.c */ /* start of file delta.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
23358 23359 23360 23361 23362 23363 23364 23365 23366 23367 23368 23369 23370 23371 23372 23373 | unsigned int i, base; unsigned int nHash; /* Number of hash table entries */ unsigned int *landmark; /* Primary hash table */ unsigned int *collide = NULL; /* Collision chain */ int lastRead = -1; /* Last byte of zSrc read by a COPY command */ int rc; /* generic return code checker. */ unsigned int olen = 0; /* current output length. */ fsl_delta_hash h; unsigned char theBuf[IntegerBufSize] = {0,}; unsigned char * intBuf = theBuf; if(!zSrc || !zOut || !out) return FSL_RC_MISUSE; /* Add the target file size to the beginning of the delta */ #ifdef OUT #undef OUT #endif | > | | 23454 23455 23456 23457 23458 23459 23460 23461 23462 23463 23464 23465 23466 23467 23468 23469 23470 23471 23472 23473 23474 23475 23476 23477 23478 | unsigned int i, base; unsigned int nHash; /* Number of hash table entries */ unsigned int *landmark; /* Primary hash table */ unsigned int *collide = NULL; /* Collision chain */ int lastRead = -1; /* Last byte of zSrc read by a COPY command */ int rc; /* generic return code checker. */ unsigned int olen = 0; /* current output length. */ unsigned int total = 0; /* total byte count. */ fsl_delta_hash h; unsigned char theBuf[IntegerBufSize] = {0,}; unsigned char * intBuf = theBuf; if(!zSrc || !zOut || !out) return FSL_RC_MISUSE; /* Add the target file size to the beginning of the delta */ #ifdef OUT #undef OUT #endif #define OUT(BLOB,LEN) rc=out(outState, BLOB, LEN); if(0 != rc) {fsl_free(collide); return rc;} else total += LEN #define OUTCH(CHAR) OUT(CHAR,1) #define PINT(I) intBuf = theBuf; olen=fsl_delta_int_put(I, &intBuf); OUT(theBuf,olen) PINT(lenOut); OUTCH("\n"); /* If the source file is very small, it means that we have no chance of ever doing a copy command. Just output a single |
︙ | ︙ | |||
23753 23754 23755 23756 23757 23758 23759 | ){ return fsl_delta_apply2(zSrc, lenSrc_, zDelta, lenDelta_, zOut, NULL); } #undef NHASH #undef DEBUG1 #undef DEBUG2 | | | | 23850 23851 23852 23853 23854 23855 23856 23857 23858 23859 23860 23861 23862 23863 23864 23865 | ){ return fsl_delta_apply2(zSrc, lenSrc_, zDelta, lenDelta_, zOut, NULL); } #undef NHASH #undef DEBUG1 #undef DEBUG2 /* end of file delta.c */ /* start of file diff.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
23776 23777 23778 23779 23780 23781 23782 23783 23784 23785 23786 23787 23788 23789 23790 23791 23792 23793 23794 23795 23796 | the delta-generation). */ #include <assert.h> #include <memory.h> #include <stdlib.h> #include <string.h> /* for memmove()/strlen() */ /** Length of a dline */ #define LENGTH(X) ((X)->n) /** Minimum of two values */ static int minInt(int a, int b){ return a<b ? a : b; } /** Compute the optimal longest common subsequence (LCS) using an exhaustive search. This version of the LCS is only used for | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 23873 23874 23875 23876 23877 23878 23879 23880 23881 23882 23883 23884 23885 23886 23887 23888 23889 23890 23891 23892 23893 23894 23895 23896 23897 23898 23899 23900 23901 23902 23903 23904 23905 23906 23907 23908 23909 23910 23911 23912 23913 23914 23915 23916 23917 23918 23919 23920 23921 23922 23923 23924 23925 23926 23927 23928 23929 23930 23931 23932 23933 23934 23935 23936 23937 23938 23939 23940 23941 23942 23943 23944 23945 23946 23947 23948 23949 23950 23951 23952 23953 23954 23955 23956 23957 23958 23959 23960 23961 23962 23963 23964 23965 23966 23967 23968 23969 23970 23971 23972 23973 23974 23975 23976 23977 23978 23979 23980 23981 23982 23983 23984 23985 23986 23987 23988 23989 23990 23991 23992 23993 23994 23995 23996 23997 23998 23999 24000 24001 24002 24003 24004 24005 24006 24007 24008 24009 24010 24011 24012 24013 24014 24015 24016 24017 24018 24019 24020 24021 24022 24023 24024 24025 24026 24027 24028 24029 24030 24031 24032 24033 24034 24035 24036 24037 24038 24039 24040 24041 24042 24043 24044 24045 24046 24047 24048 24049 24050 24051 24052 24053 24054 24055 24056 24057 24058 24059 24060 24061 24062 24063 24064 24065 24066 24067 24068 24069 24070 24071 24072 24073 24074 24075 24076 24077 24078 24079 24080 24081 24082 24083 24084 24085 24086 24087 24088 24089 24090 24091 24092 24093 24094 24095 24096 24097 24098 24099 24100 24101 24102 24103 24104 24105 24106 24107 24108 24109 24110 24111 24112 24113 24114 24115 24116 24117 24118 24119 24120 24121 24122 24123 24124 24125 24126 24127 24128 24129 24130 | the delta-generation). */ #include <assert.h> #include <memory.h> #include <stdlib.h> #include <string.h> /* for memmove()/strlen() */ #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) typedef uint64_t u64; typedef void ReCompiled /* porting crutch. i would strongly prefer to replace the regex support with a stateful predicate callback. */; #define DIFF_CONTEXT_MASK ((u64)0x0000ffff) /* Lines of context. Default if 0 */ #define DIFF_WIDTH_MASK ((u64)0x00ff0000) /* side-by-side column width */ #define DIFF_IGNORE_EOLWS ((u64)0x01000000) /* Ignore end-of-line whitespace */ #define DIFF_IGNORE_ALLWS ((u64)0x03000000) /* Ignore all whitespace */ #define DIFF_SIDEBYSIDE ((u64)0x04000000) /* Generate a side-by-side diff */ #define DIFF_VERBOSE ((u64)0x08000000) /* Missing shown as empty files */ #define DIFF_BRIEF ((u64)0x10000000) /* Show filenames only */ #define DIFF_HTML ((u64)0x20000000) /* Render for HTML */ #define DIFF_LINENO ((u64)0x40000000) /* Show line numbers */ #define DIFF_NOOPT (((u64)0x01)<<32) /* Suppress optimizations (debug) */ #define DIFF_INVERT (((u64)0x02)<<32) /* Invert the diff (debug) */ #define DIFF_CONTEXT_EX (((u64)0x04)<<32) /* Use context even if zero */ #define DIFF_NOTTOOBIG (((u64)0x08)<<32) /* Only display if not too big */ #define DIFF_STRIP_EOLCR (((u64)0x10)<<32) /* Strip trailing CR */ /* Annotation flags (any DIFF flag can be used as Annotation flag as well) */ #define ANN_FILE_VERS (((u64)0x20)<<32) /* Show file vers rather than commit vers */ #define ANN_FILE_ANCEST (((u64)0x40)<<32) /* Prefer check-ins in the ANCESTOR table */ /* ANSI escape codes: https://en.wikipedia.org/wiki/ANSI_escape_code */ #define ANSI_COLOR_BLACK(BOLD) ((BOLD) ? "\x1b[30m" : "\x1b[30m") #define ANSI_COLOR_RED(BOLD) ((BOLD) ? "\x1b[31;1m" : "\x1b[31m") #define ANSI_COLOR_GREEN(BOLD) ((BOLD) ? "\x1b[32;1m" : "\x1b[32m") #define ANSI_COLOR_YELLOW(BOLD) ((BOLD) ? "\x1b[33;1m" : "\x1b[33m") #define ANSI_COLOR_BLUE(BOLD) ((BOLD) ? "\x1b[34;1m" : "\x1b[34m") #define ANSI_COLOR_MAGENTA(BOLD) ((BOLD) ? "\x1b[35;1m" : "\x1b[35m") #define ANSI_COLOR_CYAN(BOLD) ((BOLD) ? "\x1b[36;1m" : "\x1b[36m") #define ANSI_COLOR_WHITE(BOLD) ((BOLD) ? "\x1b[37;1m" : "\x1b[37m") #define ANSI_DIFF_ADD(BOLD) ANSI_COLOR_GREEN(BOLD) #define ANSI_DIFF_RM(BOLD) ANSI_COLOR_RED(BOLD) #define ANSI_DIFF_MOD(BOLD) ANSI_COLOR_BLUE(BOLD) #define ANSI_BG_BLACK(BOLD) ((BOLD) ? "\x1b[40;1m" : "\x1b[40m") #define ANSI_BG_RED(BOLD) ((BOLD) ? "\x1b[41;1m" : "\x1b[41m") #define ANSI_BG_GREEN(BOLD) ((BOLD) ? "\x1b[42;1m" : "\x1b[42m") #define ANSI_BG_YELLOW(BOLD) ((BOLD) ? "\x1b[43;1m" : "\x1b[43m") #define ANSI_BG_BLUE(BOLD) ((BOLD) ? "\x1b[44;1m" : "\x1b[44m") #define ANSI_BG_MAGENTA(BOLD) ((BOLD) ? "\x1b[45;1m" : "\x1b[45m") #define ANSI_BG_CYAN(BOLD) ((BOLD) ? "\x1b[46;1m" : "\x1b[46m") #define ANSI_BG_WHITE(BOLD) ((BOLD) ? "\x1b[47;1m" : "\x1b[47m") #define ANSI_RESET_COLOR "\x1b[39;49m" #define ANSI_RESET_ALL "\x1b[0m" #define ANSI_RESET ANSI_RESET_ALL /*#define ANSI_BOLD ";1m"*/ /** Extract the number of lines of context from diffFlags. */ static int diff_context_lines(uint64_t diffFlags){ int n = diffFlags & DIFF_CONTEXT_MASK; if( n==0 && (diffFlags & DIFF_CONTEXT_EX)==0 ) n = 5; return n; } /* Extract the width of columns for side-by-side diff. Supply an appropriate default if no width is given. */ static int diff_width(uint64_t diffFlags){ int w = (diffFlags & DIFF_WIDTH_MASK)/(DIFF_CONTEXT_MASK+1); if( w==0 ) w = 80; return w; } /** Converts mask of public fsl_diff_flag_t (32-bit) values to the Fossil-internal 64-bit bitmask used by the DIFF_xxx macros. Why? (A) fossil(1) uses the macro approach and a low-level encoding of data in the bitmask (e.g. the context lines count). The public API hides the lower-level flags and allows the internal API to take care of the encoding. */ static uint64_t fsl_diff_flags_convert( int mask ){ uint64_t rc = 0U; #define DO(F) if( (mask & F)==F ) rc |= (((u64)F) << 24) DO(FSL_DIFF_IGNORE_EOLWS); DO(FSL_DIFF_IGNORE_ALLWS); DO(FSL_DIFF_SIDEBYSIDE); DO(FSL_DIFF_VERBOSE); DO(FSL_DIFF_BRIEF); DO(FSL_DIFF_HTML); DO(FSL_DIFF_LINENO); DO(FSL_DIFF_NOOPT); DO(FSL_DIFF_INVERT); DO(FSL_DIFF_NOTTOOBIG); DO(FSL_DIFF_STRIP_EOLCR); #undef DO return rc; } /* Length of a dline */ #define LENGTH(X) ((X)->n) /** Holds output state for diff generation. */ struct DiffOutState { /** Output callback. */ fsl_output_f out; /** State for this->out(). */ void * oState; /** For propagating output errors. */ int rc; char ansiColor; }; typedef struct DiffOutState DiffOutState; static const DiffOutState DiffOutState_empty = { NULL/*out*/, NULL/*oState*/, 0/*rc*/, 0/*useAnsiColor*/ }; /** Internal helper. Sends src to o->out(). If n is negative, fsl_strlen() is used to determine the length. */ static int diff_out( DiffOutState * const o, void const * src, fsl_int_t n ){ return o->rc = n ? o->out(o->oState, src, n<0 ? fsl_strlen((char const *)src) : (fsl_size_t)n) : 0; } /** fsl_output_f() impl for use with diff_outf(). state must be a (DiffOutState*). */ static int fsl_output_f_diff_out( void * state, void const * src, fsl_size_t n ){ DiffOutState * const os = (DiffOutState *)state; return os->rc = os->out(os->oState, src, n); } static int diff_outf( DiffOutState * o, char const * fmt, ... ){ va_list va; va_start(va,fmt); fsl_appendfv(fsl_output_f_diff_out, o, fmt, va); va_end(va); return o->rc; } /* Append a single line of context-diff output to pOut. */ static int appendDiffLine( DiffOutState *const pOut, /* Where to write the line of output */ char cPrefix, /* One of " ", "+", or "-" */ fsl_dline *pLine, /* The line to be output */ int html, /* True if generating HTML. False for plain text */ ReCompiled *pRe /* Colorize only if line matches this Regex */ ){ int rc = 0; char const * ansiPrefix = !pOut->ansiColor ? NULL : (('+'==cPrefix) ? ANSI_DIFF_ADD(0) : (('-'==cPrefix) ? ANSI_DIFF_RM(0) : NULL)) ; if(ansiPrefix) rc = diff_out(pOut, ansiPrefix, -1 ); if(!rc) rc = diff_out(pOut, &cPrefix, 1); if(rc) return rc; else if( html ){ #if 0 if( pRe /*MISSING: && re_dline_match(pRe, pLine, 1)==0 */ ){ cPrefix = ' '; }else #endif if( cPrefix=='+' ){ rc = diff_out(pOut, "<span class=\"fsl-diff-add\">", -1); }else if( cPrefix=='-' ){ rc = diff_out(pOut, "<span class=\"fsl-diff-rm\">", -1); } if(!rc){ /* unsigned short n = pLine->n; */ /* while( n>0 && (pLine->z[n-1]=='\n' || pLine->z[n-1]=='\r') ) n--; */ rc = pOut->rc = fsl_htmlize(pOut->out, pOut->oState, pLine->z, pLine->n); if( !rc && cPrefix!=' ' ){ rc = diff_out(pOut, "</span>", -1); } } }else{ rc = diff_out(pOut, pLine->z, pLine->n); } if(!rc){ if(ansiPrefix){ rc = diff_out(pOut, ANSI_RESET, -1 ); } if(!rc) rc = diff_out(pOut, "\n", 1); } return rc; } /* Add two line numbers to the beginning of an output line for a context diff. One or the other of the two numbers might be zero, which means to leave that number field blank. The "html" parameter means to format the output for HTML. */ static int appendDiffLineno(DiffOutState *pOut, int lnA, int lnB, int html){ int rc = 0; if( html ){ rc = diff_out(pOut, "<span class=\"fsl-diff-lineno\">", -1); } if(!rc){ if( lnA>0 ){ rc = diff_outf(pOut, "%6d ", lnA); }else{ rc = diff_out(pOut, " ", 7); } } if(!rc){ if( lnB>0 ){ rc = diff_outf(pOut, "%6d ", lnB); }else{ rc = diff_out(pOut, " ", 8); } if( !rc && html ){ rc = diff_out(pOut, "</span>", -1); } } return rc; } /* Minimum of two values */ static int minInt(int a, int b){ return a<b ? a : b; } /** Compute the optimal longest common subsequence (LCS) using an exhaustive search. This version of the LCS is only used for |
︙ | ︙ | |||
23866 23867 23868 23869 23870 23871 23872 | int dist = 0; /* Distance of match from center */ int mid; /* Center of the chng */ int iSXb, iSYb, iEXb, iEYb; /* Best match so far */ int iSXp, iSYp, iEXp, iEYp; /* Previous match */ sqlite3_int64 bestScore; /* Best score so far */ sqlite3_int64 score; /* Score for current candidate LCS */ int span; /* combined width of the input sequences */ | < < < < | | | | | | | | < | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > > > > > > > | > > > > | 24200 24201 24202 24203 24204 24205 24206 24207 24208 24209 24210 24211 24212 24213 24214 24215 24216 24217 24218 24219 24220 24221 24222 24223 24224 24225 24226 24227 24228 24229 24230 24231 24232 24233 24234 24235 24236 24237 24238 24239 24240 24241 24242 24243 24244 24245 24246 24247 24248 24249 24250 24251 24252 24253 24254 24255 24256 24257 24258 24259 24260 24261 24262 24263 24264 24265 24266 24267 24268 24269 24270 24271 24272 24273 24274 24275 24276 24277 24278 24279 24280 24281 24282 24283 24284 24285 | int dist = 0; /* Distance of match from center */ int mid; /* Center of the chng */ int iSXb, iSYb, iEXb, iEYb; /* Best match so far */ int iSXp, iSYp, iEXp, iEYp; /* Previous match */ sqlite3_int64 bestScore; /* Best score so far */ sqlite3_int64 score; /* Score for current candidate LCS */ int span; /* combined width of the input sequences */ span = (iE1 - iS1) + (iE2 - iS2); bestScore = -10000; score = 0; iSXb = iSXp = iS1; iEXb = iEXp = iS1; iSYb = iSYp = iS2; iEYb = iEYp = iS2; mid = (iE1 + iS1)/2; for(i=iS1; i<iE1; i++){ int limit = 0; j = p->aTo[p->aFrom[i].h % p->nTo].iHash; while( j>0 && (j-1<iS2 || j>=iE2 || p->cmpLine(&p->aFrom[i], &p->aTo[j-1])) ){ if( limit++ > 10 ){ j = 0; break; } j = p->aTo[j-1].iNext; } if( j==0 ) continue; assert( i>=iSXb && i>=iSXp ); if( i<iEXb && j>=iSYb && j<iEYb ) continue; if( i<iEXp && j>=iSYp && j<iEYp ) continue; iSX = i; iSY = j-1; pA = &p->aFrom[iSX-1]; pB = &p->aTo[iSY-1]; n = minInt(iSX-iS1, iSY-iS2); for(k=0; k<n && p->cmpLine(pA,pB)==0; k++, pA--, pB--){} iSX -= k; iSY -= k; iEX = i+1; iEY = j; pA = &p->aFrom[iEX]; pB = &p->aTo[iEY]; n = minInt(iE1-iEX, iE2-iEY); for(k=0; k<n && p->cmpLine(pA,pB)==0; k++, pA++, pB++){} iEX += k; iEY += k; skew = (iSX-iS1) - (iSY-iS2); if( skew<0 ) skew = -skew; dist = (iSX+iEX)/2 - mid; if( dist<0 ) dist = -dist; score = (iEX - iSX)*(sqlite3_int64)span - (skew + dist); if( score>bestScore ){ bestScore = score; iSXb = iSX; iSYb = iSY; iEXb = iEX; iEYb = iEY; }else if( iEX>iEXp ){ iSXp = iSX; iSYp = iSY; iEXp = iEX; iEYp = iEY; } } if( #if 0 1 /* CANNOT EXPLAIN why we get different diff results than fossil unless we use fsl_diff_optimal_lcs() despite using, insofar as i can tell, the same inputs. There is some aspect i'm overlooking. */ #else iSXb==iEXb && (sqlite3_int64)(iE1-iS1)*(iE2-iS2)<400 #endif ){ /* If no common sequence is found using the hashing heuristic and ** the input is not too big, use the expensive exact solution */ fsl__diff_optimal_lcs(p, iS1, iE1, iS2, iE2, piSX, piEX, piSY, piEY); }else{ *piSX = iSXb; *piSY = iSYb; *piEX = iEXb; *piEY = iEYb; } |
︙ | ︙ | |||
24194 24195 24196 24197 24198 24199 24200 | lnFrom += del; lnTo += ins; } //fsl__dump_triples(p, __FILE__, __LINE__); } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 24534 24535 24536 24537 24538 24539 24540 24541 24542 24543 24544 24545 24546 24547 | lnFrom += del; lnTo += ins; } //fsl__dump_triples(p, __FILE__, __LINE__); } /* Given a raw diff p[] in which the p->aEdit[] array has been filled in, compute a context diff into pOut. */ static int contextDiff( fsl__diff_cx *p, /* The difference */ DiffOutState *pOut, /* Output a context diff to here */ |
︙ | ︙ | |||
25329 25330 25331 25332 25333 25334 25335 25336 25337 25338 25339 25340 25341 25342 | int rc = 0; int a = 0; /* Index of next line in A[] */ int b = 0; /* Index of next line in B[] */ int *R; /* Array of COPY/DELETE/INSERT triples */ int r; /* Index into R[] */ int nr; /* Number of COPY/DELETE/INSERT triples to process */ int mxr; /* Maximum value for r */ int i, j; /* Loop counters */ int m, ma, mb;/* Number of lines to output */ int skip; /* Number of lines to skip */ static int nChunk = 0; /* Number of chunks of diff output seen so far */ SbsLine s; /* Output line buffer */ int nContext; /* Lines of context above and below each change */ int showDivider = 0; /* True to show the divider */ | > | 25435 25436 25437 25438 25439 25440 25441 25442 25443 25444 25445 25446 25447 25448 25449 | int rc = 0; int a = 0; /* Index of next line in A[] */ int b = 0; /* Index of next line in B[] */ int *R; /* Array of COPY/DELETE/INSERT triples */ int r; /* Index into R[] */ int nr; /* Number of COPY/DELETE/INSERT triples to process */ int mxr; /* Maximum value for r */ int na, nb; /* Number of lines shown from A and B */ int i, j; /* Loop counters */ int m, ma, mb;/* Number of lines to output */ int skip; /* Number of lines to skip */ static int nChunk = 0; /* Number of chunks of diff output seen so far */ SbsLine s; /* Output line buffer */ int nContext; /* Lines of context above and below each change */ int showDivider = 0; /* True to show the divider */ |
︙ | ︙ | |||
25398 25399 25400 25401 25402 25403 25404 | a = xa; b = xb; continue; } } #endif /* For the current block comprising nr triples, figure out | | > > > > > > > > > > > > > > > > > > | 25505 25506 25507 25508 25509 25510 25511 25512 25513 25514 25515 25516 25517 25518 25519 25520 25521 25522 25523 25524 25525 25526 25527 25528 25529 25530 25531 25532 25533 25534 25535 25536 25537 25538 25539 25540 25541 | a = xa; b = xb; continue; } } #endif /* For the current block comprising nr triples, figure out how many lines of A and B are to be displayed */ if( R[r]>nContext ){ na = nb = nContext; skip = R[r] - nContext; }else{ na = nb = R[r]; skip = 0; } for(i=0; i<nr; i++){ na += R[r+i*3+1]; nb += R[r+i*3+2]; } if( R[r+nr*3]>nContext ){ na += nContext; nb += nContext; }else{ na += R[r+nr*3]; nb += R[r+nr*3]; } for(i=1; i<nr; i++){ na += R[r+i*3]; nb += R[r+i*3]; } /* Draw the separator between blocks */ if( showDivider ){ if( s.escHtml ){ char zLn[10]; fsl_snprintf(zLn, sizeof(zLn), "%d", a+skip+1); |
︙ | ︙ | |||
25716 25717 25718 25719 25720 25721 25722 25723 25724 25725 25726 25727 25728 25729 | fsl_output_f out, void * outState, short contextLines, short sbsWidth, int diffFlags ){ return fsl_diff_text_impl(pA, pB, out, outState, contextLines, sbsWidth, diffFlags, NULL ); } int fsl_diff_text_to_buffer(fsl_buffer const *pA, fsl_buffer const *pB, fsl_buffer * pOut, short contextLines, short sbsWidth, int diffFlags ){ return (pA && pB && pOut) | > > | 25841 25842 25843 25844 25845 25846 25847 25848 25849 25850 25851 25852 25853 25854 25855 25856 | fsl_output_f out, void * outState, short contextLines, short sbsWidth, int diffFlags ){ return fsl_diff_text_impl(pA, pB, out, outState, contextLines, sbsWidth, diffFlags, NULL ); } int fsl_diff_text_to_buffer(fsl_buffer const *pA, fsl_buffer const *pB, fsl_buffer * pOut, short contextLines, short sbsWidth, int diffFlags ){ return (pA && pB && pOut) |
︙ | ︙ | |||
25749 25750 25751 25752 25753 25754 25755 25756 25757 25758 25759 25760 25761 25762 | #undef DIFF_NOTTOOBIG #undef DIFF_STRIP_EOLCR #undef SBS_LNA #undef SBS_TXTA #undef SBS_MKR #undef SBS_LNB #undef SBS_TXTB #undef ANSI_COLOR_BLACK #undef ANSI_COLOR_RED #undef ANSI_COLOR_GREEN #undef ANSI_COLOR_YELLOW #undef ANSI_COLOR_BLUE #undef ANSI_COLOR_MAGENTA | > > | 25876 25877 25878 25879 25880 25881 25882 25883 25884 25885 25886 25887 25888 25889 25890 25891 | #undef DIFF_NOTTOOBIG #undef DIFF_STRIP_EOLCR #undef SBS_LNA #undef SBS_TXTA #undef SBS_MKR #undef SBS_LNB #undef SBS_TXTB #undef ANN_FILE_VERS #undef ANN_FILE_ANCEST #undef ANSI_COLOR_BLACK #undef ANSI_COLOR_RED #undef ANSI_COLOR_GREEN #undef ANSI_COLOR_YELLOW #undef ANSI_COLOR_BLUE #undef ANSI_COLOR_MAGENTA |
︙ | ︙ | |||
25772 25773 25774 25775 25776 25777 25778 | #undef ANSI_BG_WHITE #undef ANSI_RESET_COLOR #undef ANSI_RESET_ALL #undef ANSI_RESET #undef ANSI_DIFF_ADD #undef ANSI_DIFF_MOD #undef ANSI_DIFF_RM | < | | > | | | 25901 25902 25903 25904 25905 25906 25907 25908 25909 25910 25911 25912 25913 25914 25915 25916 25917 25918 25919 25920 25921 25922 25923 25924 25925 25926 25927 25928 25929 25930 25931 25932 25933 25934 25935 25936 25937 25938 25939 25940 25941 25942 25943 25944 25945 25946 25947 25948 | #undef ANSI_BG_WHITE #undef ANSI_RESET_COLOR #undef ANSI_RESET_ALL #undef ANSI_RESET #undef ANSI_DIFF_ADD #undef ANSI_DIFF_MOD #undef ANSI_DIFF_RM /* end of file diff.c */ /* start of file diff2.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /** This file houses the "2nd generation" diff-generation APIs. This code is a straight port of those algorithms from the Fossil SCM project, initially implemented by D. Richard Hipp, ported and the license re-assigned to this project with this consent. */ #include <assert.h> #include <memory.h> #include <stdlib.h> #include <string.h> /* for memmove()/strlen() */ #include <stdio.h> #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) const fsl_diff_opt fsl_diff_opt_empty = fsl_diff_opt_empty_m; const fsl_diff_builder fsl_diff_builder_empty = fsl_diff_builder_empty_m; const fsl_dline fsl_dline_empty = fsl_dline_empty_m; const fsl_dline_change fsl_dline_change_empty = fsl_dline_change_empty_m; const fsl__diff_cx fsl__diff_cx_empty = fsl__diff_cx_empty_m; void fsl__diff_cx_clean(fsl__diff_cx * const cx){ fsl_free(cx->aFrom); fsl_free(cx->aTo); |
︙ | ︙ | |||
26258 26259 26260 26261 26262 26263 26264 | /* ** The threshold at which diffBlockAlignment transitions from the ** O(N*N) Wagner minimum-edit-distance algorithm to a less process ** O(NlogN) divide-and-conquer approach. */ #define DIFF_ALIGN_MX 1225 | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | 26387 26388 26389 26390 26391 26392 26393 26394 26395 26396 26397 26398 26399 26400 26401 26402 26403 26404 26405 26406 26407 26408 26409 26410 26411 26412 26413 26414 26415 | /* ** The threshold at which diffBlockAlignment transitions from the ** O(N*N) Wagner minimum-edit-distance algorithm to a less process ** O(NlogN) divide-and-conquer approach. */ #define DIFF_ALIGN_MX 1225 /* ** R[] is an array of six integer, two COPY/DELETE/INSERT triples for a ** pair of adjacent differences. Return true if the gap between these ** two differences is so small that they should be rendered as a single ** edit. */ static int smallGap2(const int *R, int ma, int mb){ int m = R[3]; ma += R[4] + m; mb += R[5] + m; if( ma*mb>DIFF_ALIGN_MX ) return 0; return m<=2 || m<=(R[1]+R[2]+R[4]+R[5])/8; } static unsigned short diff_opt_context_lines(fsl_diff_opt const * opt){ const unsigned short dflt = 5; unsigned short n = opt ? opt->contextLines : dflt; if( !n && (opt->diffFlags & FSL_DIFF2_CONTEXT_ZERO)==0 ){ n = dflt; } return n; } |
︙ | ︙ | |||
26521 26522 26523 26524 26525 26526 26527 | ** each other. Insertion and deletion costs are 50. Match costs ** are between 0 and 100 where 0 is a perfect match 100 is a complete ** mismatch. */ static int diffBlockAlignment( const fsl_dline *aLeft, int nLeft, /* Text on the left */ const fsl_dline *aRight, int nRight, /* Text on the right */ | | | 26520 26521 26522 26523 26524 26525 26526 26527 26528 26529 26530 26531 26532 26533 26534 | ** each other. Insertion and deletion costs are 50. Match costs ** are between 0 and 100 where 0 is a perfect match 100 is a complete ** mismatch. */ static int diffBlockAlignment( const fsl_dline *aLeft, int nLeft, /* Text on the left */ const fsl_dline *aRight, int nRight, /* Text on the right */ fsl_diff_opt *pOpt, /* Configuration options */ unsigned char **pResult, /* Raw result */ unsigned *pNResult /* OUTPUT: length of result */ ){ int i, j, k; /* Loop counters */ int *a = 0; /* One row of the Wagner matrix */ int *pToFree = 0; /* Space that needs to be freed */ unsigned char *aM = 0; /* Wagner result matrix */ |
︙ | ︙ | |||
26704 26705 26706 26707 26708 26709 26710 | end: fsl_free(pToFree); return rc; } /* | | | | | < < | > | | 26703 26704 26705 26706 26707 26708 26709 26710 26711 26712 26713 26714 26715 26716 26717 26718 26719 26720 26721 26722 26723 26724 26725 26726 26727 26728 26729 26730 26731 26732 26733 26734 26735 26736 26737 26738 26739 26740 26741 26742 26743 26744 26745 26746 26747 26748 26749 26750 26751 26752 26753 26754 26755 26756 26757 26758 26759 26760 26761 26762 26763 26764 26765 | end: fsl_free(pToFree); return rc; } /* ** Format a diff using a fsl_diff_builder object */ static int fdb__format( fsl__diff_cx * const cx, fsl_diff_builder * const pBuilder ){ const fsl_dline *A; /* Left side of the diff */ const fsl_dline *B; /* Right side of the diff */ fsl_diff_opt * const pOpt = pBuilder->opt; const int *R; /* Array of COPY/DELETE/INSERT triples */ unsigned int a; /* Index of next line in A[] */ unsigned int b; /* Index of next line in B[] */ unsigned int r; /* Index into R[] */ unsigned int nr; /* Number of COPY/DELETE/INSERT triples to process */ unsigned int mxr; /* Maximum value for r */ unsigned int na, nb; /* Number of lines shown from A and B */ unsigned int i, j; /* Loop counters */ unsigned int m, ma, mb;/* Number of lines to output */ signed int skip; /* Number of lines to skip */ unsigned int contextLines; /* Lines of context above and below each change */ unsigned short passNumber = 0; int rc = 0; #define RC if(rc) goto end pass_again: contextLines = diff_opt_context_lines(pOpt); skip = 0; a = b = 0; A = cx->aFrom; B = cx->aTo; R = cx->aEdit; mxr = cx->nEdit; //MARKER(("contextLines=%u, nEdit = %d, mxr=%u\n", contextLines, cx->nEdit, mxr)); while( mxr>2 && R[mxr-1]==0 && R[mxr-2]==0 ){ mxr -= 3; } pBuilder->lnLHS = pBuilder->lnRHS = 0; if(pBuilder->start){ pBuilder->passNumber = ++passNumber; rc = pBuilder->start(pBuilder); RC; } for(r=0; r<mxr; r += 3*nr){ /* Figure out how many triples to show in a single block */ for(nr=1; R[r+nr*3]>0 && R[r+nr*3]<(int)contextLines*2; nr++){} #if 0 /* MISSING: this "should" be replaced by a stateful predicate function, probably in the fsl_diff_opt class. */ /* If there is a regex, skip this block (generate no diff output) ** if the regex matches or does not match both insert and delete. ** Only display the block if one side matches but the other side does ** not. */ if( pOpt->pRe ){ int hideBlock = 1; |
︙ | ︙ | |||
26808 26809 26810 26811 26812 26813 26814 | for(i=1; i<nr; i++){ na += R[r+i*3]; nb += R[r+i*3]; } //MARKER(("Chunk header... a=%u, b=%u, na=%u, nb=%u, skip=%d\n", a, b, na, nb, skip)); if(pBuilder->chunkHeader | > | | | < < < < | < < < < < < < < < < < | 26806 26807 26808 26809 26810 26811 26812 26813 26814 26815 26816 26817 26818 26819 26820 26821 26822 26823 26824 | for(i=1; i<nr; i++){ na += R[r+i*3]; nb += R[r+i*3]; } //MARKER(("Chunk header... a=%u, b=%u, na=%u, nb=%u, skip=%d\n", a, b, na, nb, skip)); if(pBuilder->chunkHeader #if 0 /* The following two bits are a kludge to keep from injecting a chunk header between chunks which are directly adjacent */ && pBuilder->lnLHS != (uint32_t)(na ? a+skip+1 : a+skip)-1 && pBuilder->lnRHS != (uint32_t)(nb ? b+skip+1 : b+skip)-1 #endif ){ rc = pBuilder->chunkHeader(pBuilder, (uint32_t)(na ? a+skip+1 : a+skip), (uint32_t)na, (uint32_t)(nb ? b+skip+1 : b+skip), (uint32_t)nb); |
︙ | ︙ | |||
26850 26851 26852 26853 26854 26855 26856 | //MARKER(("Show the initial common... a=%u, b=%u, m=%u, r=%u, skip=%d\n", a, b, m, r, skip)); if( skip>0 ){ if( NULL==pBuilder->chunkHeader && skip<(int)contextLines ){ /* 2021-09-27: BUG: this is incompatible with unified diff format. The generated header lines say we're skipping X lines but we then end up including lines which that header says to skip. As a workaround, we'll only run this when | | | < < | 26834 26835 26836 26837 26838 26839 26840 26841 26842 26843 26844 26845 26846 26847 26848 26849 | //MARKER(("Show the initial common... a=%u, b=%u, m=%u, r=%u, skip=%d\n", a, b, m, r, skip)); if( skip>0 ){ if( NULL==pBuilder->chunkHeader && skip<(int)contextLines ){ /* 2021-09-27: BUG: this is incompatible with unified diff format. The generated header lines say we're skipping X lines but we then end up including lines which that header says to skip. As a workaround, we'll only run this when pBuilder->chunkHeader is NULL, noting that fossil's diff builder interface does not have that method. Without this block, our "utxt" diff builder can mimic fossil's non-diff builder unified diff format, except that we add Index lines (feature or bug?). With this block, the header values output above are wrong. */ /* If the amount to skip is less that the context band, then |
︙ | ︙ | |||
26889 26890 26891 26892 26893 26894 26895 | /* Show the differences */ for(i=0; i<nr; i++){ unsigned int nAlign; unsigned char *alignment = 0; ma = R[r+i*3+1]; /* Lines on left but not on right */ mb = R[r+i*3+2]; /* Lines on right but not on left */ | < | < < < | < < | 26871 26872 26873 26874 26875 26876 26877 26878 26879 26880 26881 26882 26883 26884 26885 26886 26887 26888 26889 26890 26891 26892 26893 26894 26895 26896 26897 26898 26899 26900 26901 26902 26903 26904 26905 26906 26907 26908 26909 26910 26911 26912 26913 26914 26915 26916 26917 26918 26919 26920 26921 26922 26923 26924 26925 26926 26927 26928 26929 26930 26931 26932 26933 26934 26935 | /* Show the differences */ for(i=0; i<nr; i++){ unsigned int nAlign; unsigned char *alignment = 0; ma = R[r+i*3+1]; /* Lines on left but not on right */ mb = R[r+i*3+2]; /* Lines on right but not on left */ /* Try merging the current block with subsequent blocks, if the ** subsequent blocks are nearby and their result isn't too big. */ while( i<nr-1 && smallGap2(&R[r+i*3],ma,mb) ){ i++; m = R[r+i*3]; ma += R[r+i*3+1] + m; mb += R[r+i*3+2] + m; } /* Try to find an alignment for the lines within this one block */ rc = diffBlockAlignment(&A[a], ma, &B[b], mb, pOpt, &alignment, &nAlign); RC; for(j=0; ma+mb>0; j++){ assert( j<nAlign ); switch( alignment[j] ){ case 1: { /* Delete one line from the left */ rc = pBuilder->deletion(pBuilder, &A[a]); if(rc) goto bail; ma--; a++; break; } case 2: { /* Insert one line on the right */ rc = pBuilder->insertion(pBuilder, &B[b]); if(rc) goto bail; assert( mb>0 ); mb--; b++; break; } case 3: { /* The left line is changed into the right line */ if( cx->cmpLine(&A[a], &B[b])==0 ){ rc = pBuilder->common(pBuilder, &A[a]); }else{ rc = pBuilder->edit(pBuilder, &A[a], &B[b]); } if(rc) goto bail; assert( ma>0 && mb>0 ); ma--; mb--; a++; b++; break; } case 4: { /* Delete from left then separately insert on the right */ rc = pBuilder->replacement(pBuilder, &A[a], &B[b]); if(rc) goto bail; ma--; a++; mb--; b++; break; |
︙ | ︙ | |||
26990 26991 26992 26993 26994 26995 26996 | RC; } if( R[r]>(int)contextLines ){ rc = pBuilder->skip(pBuilder, R[r] - contextLines); } end: #undef RC | < | 26966 26967 26968 26969 26970 26971 26972 26973 26974 26975 26976 26977 26978 26979 | RC; } if( R[r]>(int)contextLines ){ rc = pBuilder->skip(pBuilder, R[r] - contextLines); } end: #undef RC if(0==rc){ if(pBuilder->finish) pBuilder->finish(pBuilder); if(pBuilder->twoPass && 1==passNumber){ goto pass_again; } } return rc; |
︙ | ︙ | |||
27019 27020 27021 27022 27023 27024 27025 | it. On error, *outRaw is not modified but pBuilder may have emitted partial output. That is not knowable for the general case. Ownership of pBuilder is not changed. If pBuilder is not NULL then pBuilder->opt must be non-NULL. */ static int fsl_diff2_text_impl(fsl_buffer const *pA, fsl_buffer const *pB, | | | | | 26994 26995 26996 26997 26998 26999 27000 27001 27002 27003 27004 27005 27006 27007 27008 27009 27010 27011 27012 27013 27014 27015 | it. On error, *outRaw is not modified but pBuilder may have emitted partial output. That is not knowable for the general case. Ownership of pBuilder is not changed. If pBuilder is not NULL then pBuilder->opt must be non-NULL. */ static int fsl_diff2_text_impl(fsl_buffer const *pA, fsl_buffer const *pB, fsl_diff_builder * const pBuilder, fsl_diff_opt const * const opt_, int ** outRaw){ int rc = 0; fsl__diff_cx c = fsl__diff_cx_empty; bool ignoreWs = false; int ansiOptCount = 0; fsl_diff_opt opt = *opt_ /*we need a copy for the sake of the FSL_DIFF2_INVERT flag*/; if(!pA || !pB || (pBuilder && outRaw)) return FSL_RC_MISUSE; blob_to_utf8_no_bom(pA, 0); blob_to_utf8_no_bom(pB, 0); if( opt.diffFlags & FSL_DIFF2_INVERT ){ |
︙ | ︙ | |||
27107 27108 27109 27110 27111 27112 27113 | - DIFF_NUMSTAT flag is not implemented. For that matter, flags which result in output going anywhere except for pBuilder->out are not implemented here, e.g. DIFF_RAW. That last point makes this impl tiny compared to the original! */ if(pBuilder){ | | | | | < < > > > > > | | | | | | | < | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | < < < < < < < < < < < | < < < < < | | | < < < < < < < | | | | | < | | < < < < < < | | | < | < < < < < | | | < | < < < < < | | | | | < < < | < < | | < < < < < < | | | | < | | | < < < < < < < < < < < < < < < > > | | | | | | | < | < < < < < < | < | < < < < < < | < | | < < | | < | < | < < | 27082 27083 27084 27085 27086 27087 27088 27089 27090 27091 27092 27093 27094 27095 27096 27097 27098 27099 27100 27101 27102 27103 27104 27105 27106 27107 27108 27109 27110 27111 27112 27113 27114 27115 27116 27117 27118 27119 27120 27121 27122 27123 27124 27125 27126 27127 27128 27129 27130 27131 27132 27133 27134 27135 27136 27137 27138 27139 27140 27141 27142 27143 27144 27145 27146 27147 27148 27149 27150 27151 27152 27153 27154 27155 27156 27157 27158 27159 27160 27161 27162 27163 27164 27165 27166 27167 27168 27169 27170 27171 27172 27173 27174 27175 27176 27177 27178 27179 27180 27181 27182 27183 27184 27185 27186 27187 27188 27189 27190 27191 27192 27193 27194 27195 27196 27197 27198 27199 27200 27201 27202 27203 27204 27205 27206 27207 27208 27209 27210 27211 27212 27213 27214 27215 27216 27217 27218 27219 27220 27221 27222 27223 27224 27225 27226 27227 27228 27229 27230 27231 27232 27233 27234 27235 27236 27237 27238 27239 27240 27241 27242 27243 27244 27245 27246 27247 27248 27249 27250 27251 27252 27253 27254 27255 27256 27257 27258 27259 27260 27261 27262 27263 27264 27265 27266 27267 27268 27269 27270 27271 27272 27273 27274 27275 27276 27277 27278 27279 27280 27281 27282 27283 27284 27285 27286 27287 27288 27289 27290 27291 27292 27293 27294 27295 27296 27297 27298 27299 27300 27301 27302 27303 27304 27305 27306 27307 27308 27309 27310 27311 27312 27313 27314 27315 27316 27317 27318 27319 27320 27321 27322 27323 27324 | - DIFF_NUMSTAT flag is not implemented. For that matter, flags which result in output going anywhere except for pBuilder->out are not implemented here, e.g. DIFF_RAW. That last point makes this impl tiny compared to the original! */ if(pBuilder){ fsl_diff_opt * const oldOpt = pBuilder->opt; pBuilder->opt = &opt; rc = fdb__format(&c, pBuilder); pBuilder->opt = oldOpt; } end: if(0==rc && outRaw){ *outRaw = c.aEdit; c.aEdit = 0; } fsl__diff_cx_clean(&c); return rc; } int fsl_diff_v2(fsl_buffer const * pv1, fsl_buffer const * pv2, fsl_diff_builder * const pBuilder){ return fsl_diff2_text_impl(pv1, pv2, pBuilder, pBuilder->opt, NULL); } int fsl_diff_v2_raw(fsl_buffer const * pv1, fsl_buffer const * pv2, fsl_diff_opt const * const opt, int **outRaw ){ return fsl_diff2_text_impl(pv1, pv2, NULL, opt, outRaw); } /** Allocator for fsl_diff_builder instances. If extra is >0 then that much extra space is allocated as part of the same block and the pimpl member of the returned object is pointed to that space. */ static fsl_diff_builder * fsl__diff_builder_alloc(fsl_size_t extra){ fsl_diff_builder * rc = (fsl_diff_builder*)fsl_malloc(sizeof(fsl_diff_builder) + extra); if(rc){ *rc = fsl_diff_builder_empty; if(extra){ rc->pimpl = ((unsigned char *)rc)+sizeof(fsl_diff_builder); } } return rc; } static int fdb__out(fsl_diff_builder *const b, char const *z, fsl_size_t n){ return b->opt->out(b->opt->outState, z, n); } static int fdb__outf(fsl_diff_builder * const b, char const *fmt, ...){ int rc = 0; va_list va; assert(b->opt->out); va_start(va,fmt); rc = fsl_appendfv(b->opt->out, b->opt->outState, fmt, va); va_end(va); return rc; } static int fdb__debug_start(fsl_diff_builder * const b){ int rc = fdb__outf(b, "DEBUG builder starting up.\n"); if(0==rc && b->opt->nameLHS){ rc = fdb__outf(b,"LHS: %s\n", b->opt->nameLHS); } if(0==rc && b->opt->nameRHS){ rc = fdb__outf(b,"RHS: %s\n", b->opt->nameRHS); } if(0==rc && b->opt->hashLHS){ rc = fdb__outf(b,"LHS hash: %s\n", b->opt->hashLHS); } if(0==rc && b->opt->hashRHS){ rc = fdb__outf(b,"RHS hash: %s\n", b->opt->hashRHS); } return rc; } static int fdb__debug_chunkHeader(fsl_diff_builder* const b, uint32_t lnnoLHS, uint32_t linesLHS, uint32_t lnnoRHS, uint32_t linesRHS ){ #if 1 return fdb__outf(b, "@@ -%" PRIu32 ",%" PRIu32 " +%" PRIu32 ",%" PRIu32 " @@\n", lnnoLHS, linesLHS, lnnoRHS, linesRHS); #else return 0; #endif } static int fdb__debug_skip(fsl_diff_builder * const p, uint32_t n){ const int rc = fdb__outf(p, "SKIP %u (%u..%u left and %u..%u right)\n", n, p->lnLHS+1, p->lnLHS+n, p->lnRHS+1, p->lnRHS+n); p->lnLHS += n; p->lnRHS += n; return rc; } static int fdb__debug_common(fsl_diff_builder * const p, fsl_dline const * pLine){ ++p->lnLHS; ++p->lnRHS; return fdb__outf(p, "COMMON %8u %8u %.*s\n", p->lnLHS, p->lnRHS, (int)pLine->n, pLine->z); } static int fdb__debug_insertion(fsl_diff_builder * const p, fsl_dline const * pLine){ p->lnRHS++; return fdb__outf(p, "INSERT %8u %.*s\n", p->lnRHS, (int)pLine->n, pLine->z); } static int fdb__debug_deletion(fsl_diff_builder * const p, fsl_dline const * pLine){ p->lnLHS++; return fdb__outf(p, "DELETE %8u %.*s\n", p->lnLHS, (int)pLine->n, pLine->z); } static int fdb__debug_replacement(fsl_diff_builder * const p, fsl_dline const * lineLhs, fsl_dline const * lineRhs) { int rc; p->lnLHS++; p->lnRHS++; rc = fdb__outf(p, "REPLACE %8u %.*s\n", p->lnLHS, (int)lineLhs->n, lineLhs->z); if(!rc){ rc = fdb__outf(p, " %8u %.*s\n", p->lnRHS, (int)lineRhs->n, lineRhs->z); } return rc; } static int fdb__debug_edit(fsl_diff_builder * const b, fsl_dline const * pX, fsl_dline const * pY){ int rc = 0; int i, j; int x; fsl_dline_change chng = fsl_dline_change_empty; #define RC if(rc) goto end b->lnLHS++; b->lnRHS++; rc = fdb__outf(b, "EDIT %8u %.*s\n", b->lnLHS, (int)pX->n, pX->z); RC; fsl_dline_change_spans(pX, pY, &chng); for(i=x=0; i<chng.n; i++){ int ofst = chng.a[i].iStart1; int len = chng.a[i].iLen1; if( len ){ char c = '0' + i; if( x==0 ){ rc = fdb__outf(b, "%*s", 26, ""); RC; } while( ofst > x ){ if( (pX->z[x]&0xc0)!=0x80 ){ rc = fdb__out(b, " ", 1); RC; } x++; } for(j=0; j<len; j++, x++){ if( (pX->z[x]&0xc0)!=0x80 ){ rc = fdb__out(b, &c, 1); RC; } } } } if( x ){ rc = fdb__out(b, "\n", 1); RC; } rc = fdb__outf(b, " %8u %.*s\n", b->lnRHS, (int)pY->n, pY->z); RC; for(i=x=0; i<chng.n; i++){ int ofst = chng.a[i].iStart2; int len = chng.a[i].iLen2; if( len ){ char c = '0' + i; if( x==0 ){ rc = fdb__outf(b, "%*s", 26, ""); RC; } while( ofst > x ){ if( (pY->z[x]&0xc0)!=0x80 ){ rc = fdb__out(b, " ", 1); RC; } x++; } for(j=0; j<len; j++, x++){ if( (pY->z[x]&0xc0)!=0x80 ){ rc = fdb__out(b, &c, 1); RC; } } } } if( x ){ rc = fdb__out(b, "\n", 1); } end: #undef RC return rc; } static int fdb__debug_finish(fsl_diff_builder * const b){ return fdb__outf(b, "END with %u lines left and %u lines right\n", b->lnLHS, b->lnRHS); } static void fdb__generic_finalize(fsl_diff_builder * const b){ fsl_free(b); } static fsl_diff_builder * fsl__diff_builder_debug(void){ fsl_diff_builder * rc = fsl__diff_builder_alloc(0); if(rc){ rc->chunkHeader = fdb__debug_chunkHeader; rc->start = fdb__debug_start; rc->skip = fdb__debug_skip; rc->common = fdb__debug_common; rc->insertion = fdb__debug_insertion; rc->deletion = fdb__debug_deletion; rc->replacement = fdb__debug_replacement; rc->edit = fdb__debug_edit; rc->finish = fdb__debug_finish; rc->finalize = fdb__generic_finalize; assert(!rc->pimpl); assert(0==rc->implFlags); assert(0==rc->lnLHS); assert(0==rc->lnRHS); assert(NULL==rc->opt); } return rc; } |
︙ | ︙ | |||
27530 27531 27532 27533 27534 27535 27536 | ** ** The SUBARRAY is an array of 3*N+1 strings with N>=0. The triples ** represent common-text, left-text, and right-text. The last string ** in SUBARRAY is the common-suffix. Any string can be empty if it does ** not apply. */ | | | | | | | | | | | | < < < | | | | | | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < | | | | < < | < | < | < < < < < | < | | | | | < < < | < < | < < < | | | | < | | | < | < < | | | < < | < | < < < < < < < < | | | | | < < < | < < < < | | < | | < < < < < < < | < < | < < < | < < < | < | | | | < < | < < < < > | | | | | | | | | | | | | | | | < | < < < < < < < < < < < | | | | | < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | | | | | | | | | | | | | > > > > > > > > > > > > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < | < | | | 27342 27343 27344 27345 27346 27347 27348 27349 27350 27351 27352 27353 27354 27355 27356 27357 27358 27359 27360 27361 27362 27363 27364 27365 27366 27367 27368 27369 27370 27371 27372 27373 27374 27375 27376 27377 27378 27379 27380 27381 27382 27383 27384 27385 27386 27387 27388 27389 27390 27391 27392 27393 27394 27395 27396 27397 27398 27399 27400 27401 27402 27403 27404 27405 27406 27407 27408 27409 27410 27411 27412 27413 27414 27415 27416 27417 27418 27419 27420 27421 27422 27423 27424 27425 27426 27427 27428 27429 27430 27431 27432 27433 27434 27435 27436 27437 27438 27439 27440 27441 27442 27443 27444 27445 27446 27447 27448 27449 27450 27451 27452 27453 27454 27455 27456 27457 27458 27459 27460 27461 27462 27463 27464 27465 27466 27467 27468 27469 27470 27471 27472 27473 27474 27475 27476 27477 27478 27479 27480 27481 27482 27483 27484 27485 27486 27487 27488 27489 27490 27491 27492 27493 27494 27495 27496 27497 27498 27499 27500 27501 27502 27503 27504 27505 27506 27507 27508 27509 27510 27511 27512 27513 27514 27515 27516 27517 27518 27519 27520 27521 27522 27523 27524 27525 27526 27527 27528 27529 27530 27531 27532 27533 27534 27535 27536 27537 27538 27539 27540 27541 27542 27543 27544 27545 27546 27547 27548 27549 27550 27551 27552 27553 27554 27555 27556 27557 27558 27559 27560 27561 27562 27563 27564 27565 27566 27567 27568 27569 27570 27571 27572 27573 27574 27575 27576 27577 27578 27579 27580 27581 27582 27583 27584 27585 27586 27587 27588 27589 27590 27591 27592 27593 27594 27595 27596 27597 27598 27599 27600 27601 27602 27603 27604 27605 27606 27607 27608 27609 27610 27611 27612 27613 27614 27615 27616 27617 27618 27619 27620 27621 27622 27623 27624 27625 27626 27627 27628 27629 27630 27631 27632 27633 27634 27635 27636 27637 27638 27639 27640 27641 27642 27643 27644 27645 27646 27647 27648 27649 27650 27651 27652 27653 27654 27655 27656 27657 27658 27659 27660 27661 27662 27663 27664 27665 27666 27667 27668 27669 27670 27671 27672 27673 27674 27675 27676 27677 27678 27679 27680 27681 27682 27683 27684 27685 27686 27687 27688 27689 27690 27691 27692 27693 27694 27695 27696 27697 27698 27699 27700 27701 27702 27703 27704 27705 27706 27707 27708 27709 27710 27711 27712 27713 27714 27715 27716 27717 27718 27719 27720 27721 27722 27723 27724 27725 27726 27727 27728 27729 27730 27731 27732 27733 27734 27735 27736 27737 27738 27739 27740 27741 27742 27743 27744 27745 27746 27747 27748 27749 27750 27751 27752 27753 27754 27755 27756 27757 27758 27759 27760 27761 27762 27763 27764 27765 27766 27767 27768 27769 27770 27771 27772 27773 27774 27775 27776 27777 27778 27779 27780 27781 27782 27783 27784 27785 27786 27787 27788 27789 27790 27791 27792 27793 27794 27795 27796 27797 27798 27799 27800 27801 27802 27803 27804 27805 27806 27807 27808 27809 27810 27811 27812 27813 27814 27815 27816 27817 27818 27819 27820 27821 27822 27823 27824 27825 27826 27827 27828 27829 27830 27831 27832 27833 27834 27835 27836 27837 27838 27839 27840 27841 27842 27843 27844 27845 27846 27847 27848 27849 27850 27851 27852 27853 27854 27855 27856 27857 27858 27859 27860 27861 27862 27863 27864 27865 27866 27867 27868 27869 27870 27871 27872 27873 27874 27875 27876 27877 27878 27879 27880 27881 27882 27883 27884 27885 27886 27887 27888 27889 27890 27891 27892 27893 27894 27895 27896 27897 27898 27899 27900 27901 27902 27903 27904 27905 27906 27907 27908 27909 27910 27911 27912 27913 27914 27915 27916 27917 27918 27919 27920 27921 27922 27923 27924 27925 27926 27927 27928 27929 27930 27931 27932 27933 27934 27935 27936 27937 27938 27939 27940 27941 27942 27943 27944 27945 27946 27947 27948 27949 27950 27951 27952 27953 27954 27955 27956 27957 27958 27959 27960 27961 27962 27963 27964 27965 27966 27967 27968 27969 27970 27971 27972 27973 27974 27975 27976 27977 27978 27979 27980 27981 27982 27983 27984 27985 27986 27987 27988 27989 27990 27991 27992 27993 27994 27995 27996 27997 27998 27999 28000 28001 28002 28003 28004 28005 28006 28007 28008 28009 28010 28011 28012 28013 28014 28015 28016 28017 28018 28019 28020 28021 28022 28023 28024 28025 28026 28027 28028 28029 28030 28031 28032 28033 28034 28035 28036 28037 28038 28039 28040 28041 28042 28043 28044 28045 28046 28047 28048 28049 28050 28051 28052 28053 28054 28055 28056 28057 28058 28059 28060 28061 28062 28063 28064 28065 28066 28067 28068 28069 28070 28071 28072 28073 28074 28075 28076 28077 28078 28079 28080 28081 28082 | ** ** The SUBARRAY is an array of 3*N+1 strings with N>=0. The triples ** represent common-text, left-text, and right-text. The last string ** in SUBARRAY is the common-suffix. Any string can be empty if it does ** not apply. */ static int fdb__outj(fsl_diff_builder * const b, char const *zJson, int n){ return n<0 ? fdb__outf(b, "%!j", zJson) : fdb__outf(b, "%!.*j", n, zJson); } static int fdb__json1_start(fsl_diff_builder * const b){ int rc = fdb__outf(b, "{\"hashLHS\": %!j, \"hashRHS\": %!j, ", b->opt->hashLHS, b->opt->hashRHS); if(0==rc && b->opt->nameLHS){ rc = fdb__outf(b, "\"nameLHS\": %!j, ", b->opt->nameLHS); } if(0==rc && b->opt->nameRHS){ rc = fdb__outf(b, "\"nameRHS\": %!j, ", b->opt->nameRHS); } if(0==rc){ rc = fdb__out(b, "\"diff\":[", 8); } return rc; } static int fdb__json1_skip(fsl_diff_builder * const b, uint32_t n){ return fdb__outf(b, "1,%" PRIu32 ",\n", n); } static int fdb__json1_common(fsl_diff_builder * const b, fsl_dline const * pLine){ int rc = fdb__out(b, "2,",2); if(!rc) { rc = fdb__outj(b, pLine->z, (int)pLine->n); if(!rc) rc = fdb__out(b, ",\n",2); } return rc; } static int fdb__json1_insertion(fsl_diff_builder * const b, fsl_dline const * pLine){ int rc = fdb__out(b, "3,",2); if(!rc){ rc = fdb__outj(b, pLine->z, (int)pLine->n); if(!rc) rc = fdb__out(b, ",\n",2); } return rc; } static int fdb__json1_deletion(fsl_diff_builder * const b, fsl_dline const * pLine){ int rc = fdb__out(b, "4,",2); if(!rc){ rc = fdb__outj(b, pLine->z, (int)pLine->n); if(!rc) rc = fdb__out(b, ",\n",2); } return rc; } static int fdb__json1_replacement(fsl_diff_builder * const b, fsl_dline const * lineLhs, fsl_dline const * lineRhs) { int rc = fdb__out(b, "5,[\"\",",6); if(!rc) rc = fdb__outf(b,"%!.*j", (int)lineLhs->n, lineLhs->z); if(!rc) rc = fdb__out(b, ",", 1); if(!rc) rc = fdb__outf(b,"%!.*j", (int)lineRhs->n, lineRhs->z); if(!rc) rc = fdb__out(b, ",\"\"],\n",6); return rc; } static int fdb__json1_edit(fsl_diff_builder * const b, fsl_dline const * pX, fsl_dline const * pY){ int rc = 0; int i,x; fsl_dline_change chng = fsl_dline_change_empty; #define RC if(rc) goto end rc = fdb__out(b, "5,[", 3); RC; fsl_dline_change_spans(pX, pY, &chng); for(i=x=0; i<(int)chng.n; i++){ rc = fdb__outj(b, pX->z + x, (int)chng.a[i].iStart1 - x); RC; x = chng.a[i].iStart1; rc = fdb__out(b, ",", 1); RC; rc = fdb__outj(b, pX->z + x, (int)chng.a[i].iLen1); RC; x += chng.a[i].iLen1; rc = fdb__out(b, ",", 1); RC; rc = fdb__outj(b, pY->z + chng.a[i].iStart2, (int)chng.a[i].iLen2); RC; } rc = fdb__out(b, ",", 1); RC; rc = fdb__outj(b, pX->z + x, (int)(pX->n - x)); RC; rc = fdb__out(b, "],\n",3); RC; end: return rc; #undef RC } static int fdb__json1_finish(fsl_diff_builder * const b){ return fdb__out(b, "0]}", 3); } static fsl_diff_builder * fsl__diff_builder_json1(void){ fsl_diff_builder * rc = fsl__diff_builder_alloc(0); if(rc){ rc->chunkHeader = NULL; rc->start = fdb__json1_start; rc->skip = fdb__json1_skip; rc->common = fdb__json1_common; rc->insertion = fdb__json1_insertion; rc->deletion = fdb__json1_deletion; rc->replacement = fdb__json1_replacement; rc->edit = fdb__json1_edit; rc->finish = fdb__json1_finish; rc->finalize = fdb__generic_finalize; assert(!rc->pimpl); assert(0==rc->implFlags); assert(0==rc->lnLHS); assert(0==rc->lnRHS); assert(NULL==rc->opt); } return rc; } static int fdb__utxt_start(fsl_diff_builder * const b){ int rc = 0; if(0==(FSL_DIFF2_NOINDEX & b->opt->diffFlags)){ rc = fdb__outf(b,"Index: %s\n%.66c\n", b->opt->nameLHS/*RHS?*/, '='); } if(0==rc){ rc = fdb__outf(b, "--- %s\n+++ %s\n", b->opt->nameLHS, b->opt->nameRHS); } return rc; } static int fdb__utxt_chunkHeader(fsl_diff_builder* const b, uint32_t lnnoLHS, uint32_t linesLHS, uint32_t lnnoRHS, uint32_t linesRHS ){ if(FSL_DIFF2_LINE_NUMBERS & b->opt->diffFlags){ return fdb__outf(b, "%.40c\n", '~'); }else{ return fdb__outf(b, "@@ -%" PRIu32 ",%" PRIu32 " +%" PRIu32 ",%" PRIu32 " @@\n", lnnoLHS, linesLHS, lnnoRHS, linesRHS); } } static int fdb__utxt_skip(fsl_diff_builder * const b, uint32_t n){ //MARKER(("SKIP\n")); b->lnLHS += n; b->lnRHS += n; return 0; } /** Outputs line numbers to b->opt->out. */ static int fdb__utxt_lineno(fsl_diff_builder * const b, uint32_t lnL, uint32_t lnR){ int rc = 0; if(FSL_DIFF2_LINE_NUMBERS & b->opt->diffFlags){ rc = lnL ? fdb__outf(b, "%s%6" PRIu32 "%s ", (lnR ? "" : b->opt->ansiColor.deletion), lnL, (lnR ? "" : b->opt->ansiColor.reset)) : fdb__out(b, " ", 7); if(0==rc){ rc = lnR ? fdb__outf(b, "%s%6" PRIu32 "%s ", (lnL ? "" : b->opt->ansiColor.insertion), lnR, (lnL ? "" : b->opt->ansiColor.reset)) : fdb__out(b, " ", 7); } } return rc; } static int fdb__utxt_common(fsl_diff_builder * const b, fsl_dline const * pLine){ //MARKER(("COMMON\n")); ++b->lnLHS; ++b->lnRHS; const int rc = fdb__utxt_lineno(b, b->lnLHS, b->lnRHS); return rc ? rc : fdb__outf(b, " %.*s\n", (int)pLine->n, pLine->z); } static int fdb__utxt_insertion(fsl_diff_builder * const b, fsl_dline const * pLine){ //MARKER(("INSERT\n")); ++b->lnRHS; const int rc = fdb__utxt_lineno(b, 0, b->lnRHS); return rc ? rc : fdb__outf(b, "%s+%.*s%s\n", b->opt->ansiColor.insertion, (int)pLine->n, pLine->z, b->opt->ansiColor.reset); } static int fdb__utxt_deletion(fsl_diff_builder * const b, fsl_dline const * pLine){ //MARKER(("DELETE\n")); ++b->lnLHS; const int rc = fdb__utxt_lineno(b, b->lnLHS, 0); return rc ? rc : fdb__outf(b, "%s-%.*s%s\n", b->opt->ansiColor.deletion, (int)pLine->n, pLine->z, b->opt->ansiColor.reset); } static int fdb__utxt_replacement(fsl_diff_builder * const b, fsl_dline const * lineLhs, fsl_dline const * lineRhs) { //MARKER(("REPLACE\n")); int rc = b->deletion(b, lineLhs); if(0==rc) rc = b->insertion(b, lineRhs); return rc; } static int fdb__utxt_edit(fsl_diff_builder * const b, fsl_dline const * lineLhs, fsl_dline const * lineRhs){ //MARKER(("EDIT\n")); int rc = b->deletion(b, lineLhs); if(0==rc) rc = b->insertion(b, lineRhs); return rc; } static void fdb__utxt_finalize(fsl_diff_builder * const b){ fsl_free(b); } static fsl_diff_builder * fsl__diff_builder_utxt(void){ fsl_diff_builder * rc = fsl__diff_builder_alloc(0); if(!rc) return NULL; rc->chunkHeader = fdb__utxt_chunkHeader; rc->start = fdb__utxt_start; rc->skip = fdb__utxt_skip; rc->common = fdb__utxt_common; rc->insertion = fdb__utxt_insertion; rc->deletion = fdb__utxt_deletion; rc->replacement = fdb__utxt_replacement; rc->edit = fdb__utxt_edit; rc->finish = NULL; rc->finalize = fdb__utxt_finalize; return rc; } struct DiBuTcl { /** Buffer for TCL-format string conversion */ fsl_buffer str; }; typedef struct DiBuTcl DiBuTcl; static const DiBuTcl DiBuTcl_empty = {fsl_buffer_empty_m}; #define BR_OPEN if(FSL_DIFF2_TCL_BRACES & b->opt->diffFlags) \ rc = fdb__out(b, "{", 1) #define BR_CLOSE if(FSL_DIFF2_TCL_BRACES & b->opt->diffFlags) \ rc = fdb__out(b, "}", 1) #define DTCL_BUFFER(B) &((DiBuTcl*)(B)->pimpl)->str static int fdb__outtcl(fsl_diff_builder * const b, char const *z, unsigned int n, char chAppend ){ int rc; fsl_buffer * const o = DTCL_BUFFER(b); fsl_buffer_reuse(o); rc = fsl_buffer_append_tcl_literal(o, z, n); if(0==rc) rc = fdb__out(b, (char const *)o->mem, o->used); if(chAppend && 0==rc) rc = fdb__out(b, &chAppend, 1); return rc; } static int fdb__tcl_start(fsl_diff_builder * const b){ int rc = 0; fsl_buffer_reuse(DTCL_BUFFER(b)); BR_OPEN; if(0==rc) rc = fdb__out(b, "\n", 1); if(0==rc && b->opt->nameLHS){ char const * zRHS = b->opt->nameRHS ? b->opt->nameRHS : b->opt->nameLHS; BR_OPEN; if(0==rc) rc = fdb__out(b, "FILE ", 5); if(0==rc) rc = fdb__outtcl(b, b->opt->nameLHS, (unsigned)fsl_strlen(b->opt->nameLHS), ' '); if(0==rc) rc = fdb__outtcl(b, zRHS, (unsigned)fsl_strlen(zRHS), 0); if(0==rc) {BR_CLOSE;} if(0==rc) rc = fdb__out(b, "\n", 1); } return rc; } static int fdb__tcl_skip(fsl_diff_builder * const b, uint32_t n){ int rc = 0; BR_OPEN; if(0==rc) rc = fdb__outf(b, "SKIP %" PRIu32, n); if(0==rc) {BR_CLOSE;} if(0==rc) rc = fdb__outf(b, "\n", 1); return rc; } static int fdb__tcl_common(fsl_diff_builder * const b, fsl_dline const * pLine){ int rc = 0; BR_OPEN; if(0==rc) rc = fdb__out(b, "COM ", 5); if(0==rc) rc= fdb__outtcl(b, pLine->z, pLine->n, 0); if(0==rc) {BR_CLOSE;} if(0==rc) rc = fdb__outf(b, "\n", 1); return rc; } static int fdb__tcl_insertion(fsl_diff_builder * const b, fsl_dline const * pLine){ int rc = 0; BR_OPEN; if(0==rc) rc = fdb__out(b, "INS ", 5); if(0==rc) rc = fdb__outtcl(b, pLine->z, pLine->n, 0); if(0==rc) {BR_CLOSE;} if(0==rc) rc = fdb__outf(b, "\n", 1); return rc; } static int fdb__tcl_deletion(fsl_diff_builder * const b, fsl_dline const * pLine){ int rc = 0; BR_OPEN; if(0==rc) rc = fdb__out(b, "DEL ", 5); if(0==rc) rc = fdb__outtcl(b, pLine->z, pLine->n, 0); if(0==rc) {BR_CLOSE;} if(0==rc) rc = fdb__outf(b, "\n", 1); return rc; } static int fdb__tcl_replacement(fsl_diff_builder * const b, fsl_dline const * lineLhs, fsl_dline const * lineRhs) { int rc = 0; BR_OPEN; if(0==rc) rc = fdb__out(b, "EDIT \"\" ", 8); if(0==rc) rc = fdb__outtcl(b, lineLhs->z, lineLhs->n, ' '); if(0==rc) rc = fdb__outtcl(b, lineRhs->z, lineRhs->n, 0); if(0==rc) {BR_CLOSE;} if(0==rc) rc = fdb__outf(b, "\n", 1); return rc; } static int fdb__tcl_edit(fsl_diff_builder * const b, fsl_dline const * pX, fsl_dline const * pY){ int rc = 0; int i, x; fsl_dline_change chng = fsl_dline_change_empty; #define RC if(rc) goto end BR_OPEN; rc = fdb__out(b, "EDIT", 4); RC; fsl_dline_change_spans(pX, pY, &chng); for(i=x=0; i<chng.n; i++){ rc = fdb__out(b, " ", 1); RC; rc = fdb__outtcl(b, pX->z + x, chng.a[i].iStart1 - x, ' '); RC; x = chng.a[i].iStart1; rc = fdb__outtcl(b, pX->z + x, chng.a[i].iLen1, ' '); RC; x += chng.a[i].iLen1; rc = fdb__outtcl(b, pY->z + chng.a[i].iStart2, chng.a[i].iLen2, 0); RC; } assert(0==rc); if( x < pX->n ){ rc = fdb__out(b, " ", 1); RC; rc = fdb__outtcl(b, pX->z + x, pX->n - x, 0); RC; } BR_CLOSE; RC; rc = fdb__out(b, "\n", 1); end: #undef RC return rc; } static int fdb__tcl_finish(fsl_diff_builder * const b){ int rc = 0; BR_CLOSE; if(0==rc && FSL_DIFF2_TCL_BRACES & b->opt->diffFlags){ rc = fdb__out(b, "\n", 1); } return rc; } #undef BR_OPEN #undef BR_CLOSE static void fdb__tcl_finalize(fsl_diff_builder * const b){ fsl_buffer_clear( &((DiBuTcl*)b->pimpl)->str ); *b = fsl_diff_builder_empty; fsl_free(b); } static fsl_diff_builder * fsl__diff_builder_tcl(void){ fsl_diff_builder * rc = fsl__diff_builder_alloc((fsl_size_t)sizeof(DiBuTcl)); if(rc){ rc->chunkHeader = NULL; rc->start = fdb__tcl_start; rc->skip = fdb__tcl_skip; rc->common = fdb__tcl_common; rc->insertion = fdb__tcl_insertion; rc->deletion = fdb__tcl_deletion; rc->replacement = fdb__tcl_replacement; rc->edit = fdb__tcl_edit; rc->finish = fdb__tcl_finish; rc->finalize = fdb__tcl_finalize; assert(0!=rc->pimpl); DiBuTcl * const dbt = (DiBuTcl*)rc->pimpl; *dbt = DiBuTcl_empty; if(fsl_buffer_reserve(&dbt->str, 120)){ rc->finalize(rc); rc = 0; } } return rc; } /** Column indexes for SplitText::cols. */ enum SplitTextCols { STC_NUM1 = 0, STC_TEXT1, STC_MOD, STC_NUM2, STC_TEXT2, STC_count }; /** Internal state for the text-mode split diff builder. This builder buffers its contents in 5 buffers: 2 each for the LHS/RHS line numbers and content and one for the "change marker" (a center column). Each of the STC_NUM1, STC_NUM2, STC_TEXT1, and STC_TEXT2 columns is stored as one NUL-delimited string in each of the corresponding column buffers. STC_MOD is a simple byte array, with each byte corresponding two one line of the diff and marking what type of linle it is (common, insertion, deletion, or edit/replacement). The STC_SKIP column is managed differently. It is zero-filled, with a non-0 value at each line of the diff which represents a skipped gap. Potential TODO: combine this and STC_MOD. */ struct SplitTxt { /** Largest column width we've yet seen. These are only updated for STC_TEXT1 and STC_TEXT2. The others currently have fixed widths. FIXME: these are in bytes, not text columns. The current code may truncate multibyte characters. */ uint32_t maxWidths[STC_count]; }; typedef struct SplitTxt SplitTxt; static const SplitTxt SplitTxt_empty = {{1,10,3,1,10}}; #define SPLITSTATE(VNAME) SplitTxt * const VNAME = (SplitTxt *)b->pimpl static int maxColWidth(fsl_diff_builder const * const b, SplitTxt const * const sst, int mwIndex){ static const short minColWidth = 10/*b->opt.columnWidth values smaller than this are treated as this value*/; switch(mwIndex){ case STC_NUM1: case STC_NUM2: case STC_MOD: return sst->maxWidths[mwIndex]; case STC_TEXT1: case STC_TEXT2: break; default: assert(!"internal API misuse: invalid column index."); break; } int const y = (b->opt->columnWidth>0 && b->opt->columnWidth<=sst->maxWidths[mwIndex]) ? (int)b->opt->columnWidth : (int)sst->maxWidths[mwIndex]; return minColWidth > y ? minColWidth : y; } static int fdb__splittxt_mod(fsl_diff_builder * const b, char ch){ assert(2==b->passNumber); return fdb__outf(b, " %c ", ch); } static int fdb__splittxt_lineno(fsl_diff_builder * const b, SplitTxt const * const sst, bool isLeft, uint32_t n){ assert(2==b->passNumber); int const col = isLeft ? STC_NUM1 : STC_NUM2; return n ? fdb__outf(b, "%*" PRIu32 " ", sst->maxWidths[col], n) : fdb__outf(b, "%.*c ", sst->maxWidths[col], ' '); } static int fdb__splittxt_start(fsl_diff_builder * const b){ int rc = 0; if(1==b->passNumber){ SPLITSTATE(sst); *sst = SplitTxt_empty; ++b->fileCount; return rc; } if(b->fileCount>1){ rc = fdb__out(b, "\n", 1); } if(0==rc){ fsl_diff_opt const * const o = b->opt; if(o->nameLHS || o->nameRHS || o->hashLHS || o->hashRHS){ rc = fdb__outf(b, "--- %s%s%s\n+++ %s%s%s\n", o->nameLHS ? o->nameLHS : "", (o->nameLHS && o->hashLHS) ? " " : "", o->hashLHS ? o->hashLHS : "", o->nameRHS ? o->nameRHS : "", (o->nameRHS && o->hashRHS) ? " " : "", o->hashRHS ? o->hashRHS : ""); } } return rc; } static int fdb__splittxt_skip(fsl_diff_builder * const b, uint32_t n){ b->lnLHS += n; b->lnRHS += n; if(1==b->passNumber) return 0; SPLITSTATE(sst); int const maxWidth1 = maxColWidth(b, sst, STC_TEXT1); int const maxWidth2 = maxColWidth(b, sst, STC_TEXT2); return fdb__outf(b, "%.*c %.*c %.*c %.*c\n", sst->maxWidths[STC_NUM1], '~', maxWidth1, '~', sst->maxWidths[STC_NUM2], '~', maxWidth2, '~'); } static int fdb__splittxt_color(fsl_diff_builder * const b, int modType){ char const *z = 0; switch(modType){ case (int)'i': z = b->opt->ansiColor.insertion; break; case (int)'d': z = b->opt->ansiColor.deletion; break; case (int)'r'/*replacement*/: case (int)'e': z = b->opt->ansiColor.edit; break; case 0: z = b->opt->ansiColor.reset; break; default: assert(!"invalid color op!"); } return z&&*z ? fdb__outf(b, "%s", z) : 0; } static int fdb__splittxt_side(fsl_diff_builder * const b, SplitTxt * const sst, bool isLeft, fsl_dline const * const pLine){ int rc = fdb__splittxt_lineno(b, sst, isLeft, pLine ? (isLeft ? b->lnLHS : b->lnRHS) : 0U); if(0==rc){ uint32_t const w = maxColWidth(b, sst, isLeft ? STC_TEXT1 : STC_TEXT2); if(pLine){ fsl_size_t const nU = /* Measure column width in UTF8 characters, not bytes! */ fsl_strlen_utf8(pLine->z, (fsl_int_t)pLine->n); rc = fdb__outf(b, "%#.*s", (int)(w < nU ? w : nU), pLine->z); if(0==rc && w>nU){ rc = fdb__outf(b, "%.*c", (int)(w - nU), ' '); } }else{ rc = fdb__outf(b, "%.*c", (int)w, ' '); } if(0==rc && !isLeft) rc = fdb__out(b, "\n", 1); } return rc; } static void fdb__splittext_update_maxlen(SplitTxt * const sst, int col, char const * const z, uint32_t n){ if(sst->maxWidths[col]<n){ #if 0 sst->maxWidths[col] = n; #else n = (uint32_t)fsl_strlen_utf8(z, (fsl_int_t)n); if(sst->maxWidths[col]<n) sst->maxWidths[col] = n; #endif } } static int fdb__splittxt_common(fsl_diff_builder * const b, fsl_dline const * const pLine){ int rc = 0; SPLITSTATE(sst); ++b->lnLHS; ++b->lnRHS; if(1==b->passNumber){ fdb__splittext_update_maxlen(sst, STC_TEXT1, pLine->z, pLine->n); fdb__splittext_update_maxlen(sst, STC_TEXT2, pLine->z, pLine->n); return 0; } rc = fdb__splittxt_side(b, sst, true, pLine); if(0==rc) rc = fdb__splittxt_mod(b, ' '); if(0==rc) rc = fdb__splittxt_side(b, sst, false, pLine); return rc; } static int fdb__splittxt_insertion(fsl_diff_builder * const b, fsl_dline const * const pLine){ int rc = 0; SPLITSTATE(sst); ++b->lnRHS; if(1==b->passNumber){ fdb__splittext_update_maxlen(sst, STC_TEXT1, pLine->z, pLine->n); return rc; } rc = fdb__splittxt_color(b, 'i'); if(0==rc) rc = fdb__splittxt_side(b, sst, true, NULL); if(0==rc) rc = fdb__splittxt_mod(b, '>'); if(0==rc) rc = fdb__splittxt_side(b, sst, false, pLine); if(0==rc) rc = fdb__splittxt_color(b, 0); return rc; } static int fdb__splittxt_deletion(fsl_diff_builder * const b, fsl_dline const * const pLine){ int rc = 0; SPLITSTATE(sst); ++b->lnLHS; if(1==b->passNumber){ fdb__splittext_update_maxlen(sst, STC_TEXT2, pLine->z, pLine->n); return rc; } rc = fdb__splittxt_color(b, 'd'); if(0==rc) rc = fdb__splittxt_side(b, sst, true, pLine); if(0==rc) rc = fdb__splittxt_mod(b, '<'); if(0==rc) rc = fdb__splittxt_side(b, sst, false, NULL); if(0==rc) rc = fdb__splittxt_color(b, 0); return rc; } static int fdb__splittxt_replacement(fsl_diff_builder * const b, fsl_dline const * const lineLhs, fsl_dline const * const lineRhs) { #if 0 int rc = b->deletion(b, lineLhs); if(0==rc) rc = b->insertion(b, lineRhs); return rc; #else int rc = 0; SPLITSTATE(sst); ++b->lnLHS; ++b->lnRHS; if(1==b->passNumber){ fdb__splittext_update_maxlen(sst, STC_TEXT1, lineLhs->z, lineLhs->n); fdb__splittext_update_maxlen(sst, STC_TEXT2, lineRhs->z, lineRhs->n); return 0; } rc = fdb__splittxt_color(b, 'e'); if(0==rc) rc = fdb__splittxt_side(b, sst, true, lineLhs); if(0==rc) rc = fdb__splittxt_mod(b, '|'); if(0==rc) rc = fdb__splittxt_side(b, sst, false, lineRhs); if(0==rc) rc = fdb__splittxt_color(b, 0); return rc; #endif } static int fdb__splittxt_finish(fsl_diff_builder * const b){ int rc = 0; if(1==b->passNumber){ SPLITSTATE(sst); uint32_t ln = b->lnLHS; /* Calculate width of line number columns. */ sst->maxWidths[STC_NUM1] = sst->maxWidths[STC_NUM2] = 1; for(; ln>=10; ln/=10) ++sst->maxWidths[STC_NUM1]; ln = b->lnRHS; for(; ln>=10; ln/=10) ++sst->maxWidths[STC_NUM2]; } return rc; } static void fdb__splittxt_finalize(fsl_diff_builder * const b){ *b = fsl_diff_builder_empty; fsl_free(b); } static fsl_diff_builder * fsl__diff_builder_splittxt(void){ fsl_diff_builder * rc = fsl__diff_builder_alloc((fsl_size_t)sizeof(SplitTxt)); if(rc){ rc->twoPass = true; rc->chunkHeader = NULL; rc->start = fdb__splittxt_start; rc->skip = fdb__splittxt_skip; rc->common = fdb__splittxt_common; rc->insertion = fdb__splittxt_insertion; rc->deletion = fdb__splittxt_deletion; rc->replacement = fdb__splittxt_replacement; rc->edit = fdb__splittxt_replacement; rc->finish = fdb__splittxt_finish; rc->finalize = fdb__splittxt_finalize; assert(0!=rc->pimpl); SplitTxt * const sst = (SplitTxt*)rc->pimpl; *sst = SplitTxt_empty; } return rc; } int fsl_diff_builder_factory( fsl_diff_builder_e type, fsl_diff_builder **pOut ){ int rc = FSL_RC_TYPE; fsl_diff_builder * (*factory)(void) = NULL; switch(type){ case FSL_DIFF_BUILDER_DEBUG: factory = fsl__diff_builder_debug; break; case FSL_DIFF_BUILDER_JSON1: factory = fsl__diff_builder_json1; break; case FSL_DIFF_BUILDER_UNIFIED_TEXT: factory = fsl__diff_builder_utxt; break; case FSL_DIFF_BUILDER_TCL: factory = fsl__diff_builder_tcl; break; case FSL_DIFF_BUILDER_SPLIT_TEXT: factory = fsl__diff_builder_splittxt; break; } if(NULL!=factory){ *pOut = factory(); rc = *pOut ? 0 : FSL_RC_OOM; } return rc; } #undef DIFF_ALIGN_MX #undef DIFF_CANNOT_COMPUTE_BINARY #undef DIFF_CANNOT_COMPUTE_SYMLINK #undef DIFF_TOO_MANY_CHANGES #undef DIFF_WHITESPACE_ONLY #undef fsl_dline_empty_m #undef MARKER #undef DTCL_BUFFER #undef blob_to_utf8_no_bom #undef SPLITSTATE /* end of file diff2.c */ /* start of file encode.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
28621 28622 28623 28624 28625 28626 28627 | return (char *)b.mem /* transfer ownership */; }else{ fsl_buffer_clear(&b); return NULL; } } | | | | 28347 28348 28349 28350 28351 28352 28353 28354 28355 28356 28357 28358 28359 28360 28361 28362 | return (char *)b.mem /* transfer ownership */; }else{ fsl_buffer_clear(&b); return NULL; } } /* end of file encode.c */ /* start of file event.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
28668 28669 28670 28671 28672 28673 28674 | } return rc; } } #undef MARKER | | | | 28394 28395 28396 28397 28398 28399 28400 28401 28402 28403 28404 28405 28406 28407 28408 28409 | } return rc; } } #undef MARKER /* end of file event.c */ /* start of file fs.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
28692 28693 28694 28695 28696 28697 28698 | #include <assert.h> #include <string.h> /* strlen() */ #include <stddef.h> /* NULL on linux */ #include <ctype.h> #include <errno.h> #include <dirent.h> | | | | 28418 28419 28420 28421 28422 28423 28424 28425 28426 28427 28428 28429 28430 28431 28432 28433 28434 28435 28436 28437 28438 28439 28440 28441 28442 28443 28444 28445 | #include <assert.h> #include <string.h> /* strlen() */ #include <stddef.h> /* NULL on linux */ #include <ctype.h> #include <errno.h> #include <dirent.h> #ifdef _WIN32 # define DIR _WDIR # define dirent _wdirent # define opendir _wopendir # define readdir _wreaddir # define closedir _wclosedir # include <direct.h> # include <windows.h> # include <sys/utime.h> # if !defined(ELOOP) # define ELOOP 114 /* Missing in MinGW */ # endif #else # include <unistd.h> /* access(2) */ # include <sys/types.h> # include <sys/time.h> #endif #include <sys/stat.h> /* Only for debugging */ #include <stdio.h> |
︙ | ︙ | |||
28808 28809 28810 28811 28812 28813 28814 | memcpy(zBuf, zPwdUtf8, nPwd+1); fsl_filename_free(zPwdUtf8); if(outLen) *outLen = nPwd; return 0; #else if(!zBuf) return FSL_RC_MISUSE; else if(!nBuf) return FSL_RC_RANGE; | | > | 28534 28535 28536 28537 28538 28539 28540 28541 28542 28543 28544 28545 28546 28547 28548 28549 | memcpy(zBuf, zPwdUtf8, nPwd+1); fsl_filename_free(zPwdUtf8); if(outLen) *outLen = nPwd; return 0; #else if(!zBuf) return FSL_RC_MISUSE; else if(!nBuf) return FSL_RC_RANGE; else if( getcwd(zBuf, nBuf /*-1 not necessary: getcwd() NUL-terminates*/)==0 ){ return fsl_errno_to_rc(errno, FSL_RC_IO); }else{ if(outLen) *outLen = fsl_strlen(zBuf); return 0; } #endif } |
︙ | ︙ | |||
28837 28838 28839 28840 28841 28842 28843 | #if !defined(S_ISLNK) # define S_ISLNK(x) (0) #endif /* Reminder: the semantics of the 3rd parameter are reversed from v1's fossil_stat(). */ | | | 28564 28565 28566 28567 28568 28569 28570 28571 28572 28573 28574 28575 28576 28577 28578 | #if !defined(S_ISLNK) # define S_ISLNK(x) (0) #endif /* Reminder: the semantics of the 3rd parameter are reversed from v1's fossil_stat(). */ int fsl_stat(const char *zFilename, fsl_fstat * fst, bool derefSymlinks){ /* FIXME: port in fossil(1) win32_stat() */ if(!zFilename) return FSL_RC_MISUSE; else if(!*zFilename) return FSL_RC_RANGE; else{ int rc; struct stat buf; |
︙ | ︙ | |||
28936 28937 28938 28939 28940 28941 28942 | fsl_fstat fst; return ( 0 != fsl_stat(zFilename, &fst, 1) ) ? false : (FSL_FSTAT_TYPE_FILE == fst.type); } bool fsl_is_symlink(const char *zFilename){ | < < < < | > | < < | 28663 28664 28665 28666 28667 28668 28669 28670 28671 28672 28673 28674 28675 28676 28677 28678 28679 28680 | fsl_fstat fst; return ( 0 != fsl_stat(zFilename, &fst, 1) ) ? false : (FSL_FSTAT_TYPE_FILE == fst.type); } bool fsl_is_symlink(const char *zFilename){ fsl_fstat fst; return ( 0 != fsl_stat(zFilename, &fst, 0) ) ? false : (FSL_FSTAT_TYPE_LINK == fst.type); } /* Return true if zPath is an absolute pathname. Return false if it is relative. */ bool fsl_is_absolute_path(const char *zPath){ |
︙ | ︙ | |||
29055 29056 29057 29058 29059 29060 29061 | fsl_size_t fsl_file_simplify_name(char *z, fsl_int_t n_, bool slash){ fsl_size_t i; fsl_size_t n = (n_<0) ? fsl_strlen(z) : (fsl_size_t)n_; fsl_int_t j; | < > | > | 28777 28778 28779 28780 28781 28782 28783 28784 28785 28786 28787 28788 28789 28790 28791 28792 28793 28794 28795 28796 28797 28798 28799 28800 | fsl_size_t fsl_file_simplify_name(char *z, fsl_int_t n_, bool slash){ fsl_size_t i; fsl_size_t n = (n_<0) ? fsl_strlen(z) : (fsl_size_t)n_; fsl_int_t j; /* On windows and cygwin convert all \ characters to / */ #if defined(_WIN32) || defined(__CYGWIN__) for(i=0; i<n; i++){ if( z[i]=='\\' ) z[i] = '/'; } #endif /* Removing trailing "/" characters */ if( !slash ){ while( n>1 && z[n-1]=='/' ){ n--; } } /* Remove duplicate '/' characters. Except, two // at the beginning of a pathname is allowed since this is important on windows. */ for(i=j=1; i<n; i++){ z[j++] = z[i]; while( z[i]=='/' && i<n-1 && z[i+1]=='/' ) i++; } |
︙ | ︙ | |||
29099 29100 29101 29102 29103 29104 29105 | continue; } } if( j>=0 ) z[j] = z[i]; j++; } if( j==0 ) z[j++] = '.'; | < | | 28822 28823 28824 28825 28826 28827 28828 28829 28830 28831 28832 28833 28834 28835 28836 28837 28838 28839 28840 28841 28842 | continue; } } if( j>=0 ) z[j] = z[i]; j++; } if( j==0 ) z[j++] = '.'; z[j] = 0; return (fsl_size_t)j; } int fsl_file_canonical_name2(const char *zRoot, const char *zOrigName, fsl_buffer *pOut, bool slash){ int rc; if(!zOrigName || !pOut) return FSL_RC_MISUSE; else if( fsl_is_absolute_path(zOrigName) || (zRoot && !*zRoot)){ rc = fsl_buffer_append( pOut, zOrigName, -1 ); #if defined(_WIN32) || defined(__CYGWIN__) if(!rc){ char *zOut; |
︙ | ︙ | |||
29158 29159 29160 29161 29162 29163 29164 | pOut->used = newLen; } return rc; } int fsl_file_canonical_name(const char *zOrigName, | < | | | 28880 28881 28882 28883 28884 28885 28886 28887 28888 28889 28890 28891 28892 28893 28894 28895 28896 28897 28898 28899 28900 | pOut->used = newLen; } return rc; } int fsl_file_canonical_name(const char *zOrigName, fsl_buffer *pOut, bool slash){ return fsl_file_canonical_name2(NULL, zOrigName, pOut, slash); } int fsl_file_dirpart(char const * zFilename, fsl_int_t nLen, fsl_buffer * pOut, bool leaveSlash){ if(!zFilename || !*zFilename || !pOut) return FSL_RC_MISUSE; else if(!nLen) return FSL_RC_RANGE; else{ fsl_size_t n = (nLen>0) ? (fsl_size_t)nLen : fsl_strlen(zFilename); char const * z = zFilename + n; char doBreak = 0; |
︙ | ︙ | |||
29445 29446 29447 29448 29449 29450 29451 | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED ); return dwAttributes==FILE_ATTRIBUTE_DIRECTORY; } #endif | < < < < < < | 29166 29167 29168 29169 29170 29171 29172 29173 29174 29175 29176 29177 29178 29179 | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED ); return dwAttributes==FILE_ATTRIBUTE_DIRECTORY; } #endif int fsl_rmdir(const char *zFilename){ int rc = fsl_dir_check(zFilename); if(rc<1) return rc ? FSL_RC_TYPE : FSL_RC_NOT_FOUND; #ifdef _WIN32 wchar_t *z = (wchar_t*)fsl_utf8_to_filename(zFilename); if(w32_file_is_normal_dir(z)){ rc = _wunlink(z) ? errno : 0; |
︙ | ︙ | |||
29802 29803 29804 29805 29806 29807 29808 | } } if(err) rc = fsl_errno_to_rc(errno, FSL_RC_IO); return rc; #endif } | < < < < | | | | 29517 29518 29519 29520 29521 29522 29523 29524 29525 29526 29527 29528 29529 29530 29531 29532 29533 | } } if(err) rc = fsl_errno_to_rc(errno, FSL_RC_IO); return rc; #endif } static int fsl_dircrawl_impl(fsl_buffer * dbuf, fsl_fstat * fst, fsl_dircrawl_f cb, void * cbState, fsl_dircrawl_state * dst, unsigned int depth){ int rc = 0; DIR *dir = opendir(fsl_buffer_cstr(dbuf)); struct dirent * dent = 0; fsl_size_t const dPos = dbuf->used; if(!dir){ return fsl_errno_to_rc(errno, FSL_RC_IO); |
︙ | ︙ | |||
29856 29857 29858 29859 29860 29861 29862 | rc = cb( dst ); if(!rc){ dbuf->mem[dbuf->used] = '/'; dbuf->used = newLen; if(FSL_FSTAT_TYPE_DIR==fst->type){ rc = fsl_dircrawl_impl( dbuf, fst, cb, cbState, dst, depth+1 ); } | < < | 29567 29568 29569 29570 29571 29572 29573 29574 29575 29576 29577 29578 29579 29580 | rc = cb( dst ); if(!rc){ dbuf->mem[dbuf->used] = '/'; dbuf->used = newLen; if(FSL_FSTAT_TYPE_DIR==fst->type){ rc = fsl_dircrawl_impl( dbuf, fst, cb, cbState, dst, depth+1 ); } } } closedir(dir); return rc; } int fsl_dircrawl(char const * dirName, fsl_dircrawl_f callback, |
︙ | ︙ | |||
29892 29893 29894 29895 29896 29897 29898 | } fsl_buffer_clear(&dbuf); return rc; } bool fsl_is_file_or_link(const char *zFilename){ fsl_fstat fst = fsl_fstat_empty; | | < | | | 29601 29602 29603 29604 29605 29606 29607 29608 29609 29610 29611 29612 29613 29614 29615 29616 29617 | } fsl_buffer_clear(&dbuf); return rc; } bool fsl_is_file_or_link(const char *zFilename){ fsl_fstat fst = fsl_fstat_empty; if(fsl_stat(zFilename, &fst, false)) return false; return fst.type==FSL_FSTAT_TYPE_FILE || fst.type==FSL_FSTAT_TYPE_LINK; } fsl_size_t fsl_strip_trailing_slashes(char * name, fsl_int_t nameLen){ fsl_size_t rc = 0; if(nameLen < 0) nameLen = (fsl_int_t)fsl_strlen(name); if(nameLen){ char * z = name + nameLen - 1; |
︙ | ︙ | |||
29920 29921 29922 29923 29924 29925 29926 | (fsl_int_t)b->used); } int fsl_file_rename(const char *zFrom, const char *zTo){ int rc; #if defined(_WIN32) /** 2021-03-24: fossil's impl of this routine has 2 additional | | < | | > | > > | > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < | < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 29628 29629 29630 29631 29632 29633 29634 29635 29636 29637 29638 29639 29640 29641 29642 29643 29644 29645 29646 29647 29648 29649 29650 29651 29652 29653 29654 29655 29656 29657 29658 29659 29660 29661 | (fsl_int_t)b->used); } int fsl_file_rename(const char *zFrom, const char *zTo){ int rc; #if defined(_WIN32) /** 2021-03-24: fossil's impl of this routine has 2 additional params (bool isFromDir, bool isToDir), which are only used on Windows platforms and are only to allow for 12 bytes of edge case in MAX_PATH handling. We don't need them. */ wchar_t *zMbcsFrom = fsl_utf8_to_filename(zFrom); wchar_t *zMbcsTo = zMbcsFrom ? fsl_utf8_to_filename(zTo) : 0; rc = zMbcsTo ? _wrename(zMbcsFrom, zMbcsTo) : FSL_RC_OOM; #else char *zMbcsFrom = fsl_utf8_to_filename(zFrom); char *zMbcsTo = zMbcsFrom ? fsl_utf8_to_filename(zTo) : 0; rc = zMbcsTo ? rename(zMbcsFrom, zMbcsTo) : FSL_RC_OOM; #endif fsl_filename_free(zMbcsTo); fsl_filename_free(zMbcsFrom); return rc ? (FSL_RC_OOM==rc ? rc : fsl_errno_to_rc(errno, FSL_RC_IO)) : 0; } #if 0 int fsl_file_relative_name( char const * zRoot, char const * zPath, fsl_buffer * pOut, char retainSlash ){ int rc = FSL_RC_NYI; char * zPath; |
︙ | ︙ | |||
30169 30170 30171 30172 30173 30174 30175 | #ifdef _WIN32 # undef DIR # undef dirent # undef opendir # undef readdir # undef closedir #endif | | | | 29672 29673 29674 29675 29676 29677 29678 29679 29680 29681 29682 29683 29684 29685 29686 29687 | #ifdef _WIN32 # undef DIR # undef dirent # undef opendir # undef readdir # undef closedir #endif /* end of file fs.c */ /* start of file forum.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
30215 30216 30217 30218 30219 30220 30221 | } return rc; } #undef MARKER | | | | 29718 29719 29720 29721 29722 29723 29724 29725 29726 29727 29728 29729 29730 29731 29732 29733 | } return rc; } #undef MARKER /* end of file forum.c */ /* start of file glob.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
30304 30305 30306 30307 30308 30309 30310 | } } return *z==0; #endif } | | | | 29807 29808 29809 29810 29811 29812 29813 29814 29815 29816 29817 29818 29819 29820 29821 29822 | } } return *z==0; #endif } int fsl_glob_list_parse( fsl_list * tgt, char const * zPatternList ){ fsl_size_t i; /* Loop counters */ char const *z = zPatternList; char * cp; char delimiter; /* '\'' or '\"' or 0 */ int rc = 0; char const * end; if( !tgt || !zPatternList ) return FSL_RC_MISUSE; else if(!*zPatternList) return 0; |
︙ | ︙ | |||
30361 30362 30363 30364 30365 30366 30367 | glob = (char const *)globList->list[i]; if( fsl_str_glob( glob, zNeedle ) ) return glob; } return NULL; } } | | | | | 29864 29865 29866 29867 29868 29869 29870 29871 29872 29873 29874 29875 29876 29877 29878 29879 29880 29881 29882 29883 29884 29885 29886 29887 29888 29889 29890 29891 29892 29893 29894 29895 29896 29897 | glob = (char const *)globList->list[i]; if( fsl_str_glob( glob, zNeedle ) ) return glob; } return NULL; } } int fsl_glob_list_append( fsl_list * tgt, char const * zGlob ){ if(!tgt || !zGlob || !*zGlob) return FSL_RC_MISUSE; else{ char * cp = fsl_strdup(zGlob); int rc = cp ? 0 : FSL_RC_OOM; if(!rc){ rc = fsl_list_append(tgt, cp); if(rc) fsl_free(cp); } return rc; } } void fsl_glob_list_clear( fsl_list * const globList ){ if(globList) fsl_list_visit_free(globList, 1); } /* end of file glob.c */ /* start of file io.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
30520 30521 30522 30523 30524 30525 30526 | if(rc) break; rn1 = rn2 = BufSize; } return rc; } #undef MARKER | | | | 30023 30024 30025 30026 30027 30028 30029 30030 30031 30032 30033 30034 30035 30036 30037 30038 | if(rc) break; rn1 = rn2 = BufSize; } return rc; } #undef MARKER /* end of file io.c */ /* start of file leaf.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
30547 30548 30549 30550 30551 30552 30553 | /* Only for debugging */ #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) | | | | < | 30050 30051 30052 30053 30054 30055 30056 30057 30058 30059 30060 30061 30062 30063 30064 30065 30066 30067 30068 30069 30070 30071 30072 30073 30074 30075 30076 30077 | /* Only for debugging */ #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) int fsl_repo_leaves_rebuild(fsl_cx * f){ fsl_db * db = f ? fsl_cx_db_repo(f) : NULL; return !db ? FSL_RC_MISUSE : fsl_db_exec_multi(db, "DELETE FROM leaf;" "INSERT OR IGNORE INTO leaf" " SELECT cid FROM plink" " EXCEPT" " SELECT pid FROM plink" " WHERE coalesce((SELECT value FROM tagxref" " WHERE tagid=%d AND rid=plink.pid),'trunk')" " == coalesce((SELECT value FROM tagxref" " WHERE tagid=%d AND rid=plink.cid),'trunk')", FSL_TAGID_BRANCH, FSL_TAGID_BRANCH ); } fsl_int_t fsl_count_nonbranch_children(fsl_cx * const f, fsl_id_t rid){ int32_t rv = 0; int rc; fsl_db * const db = fsl_cx_db_repo(f); if(!db || !db->dbh || (rid<=0)) return -1; |
︙ | ︙ | |||
30699 30700 30701 30702 30703 30704 30705 | !rc && rid; rid=fsl_id_bag_next(&f->cache.leafCheck,rid)){ rc = fsl__repo_leafcheck(f, rid); } fsl_id_bag_reset(&f->cache.leafCheck); return rc; } | | | 30201 30202 30203 30204 30205 30206 30207 30208 30209 30210 30211 30212 30213 30214 30215 | !rc && rid; rid=fsl_id_bag_next(&f->cache.leafCheck,rid)){ rc = fsl__repo_leafcheck(f, rid); } fsl_id_bag_reset(&f->cache.leafCheck); return rc; } int fsl_leaves_compute(fsl_cx * f, fsl_id_t vid, fsl_leaves_compute_e closeMode){ fsl_db * const db = fsl_needs_repo(f); if(!db) return FSL_RC_NOT_A_REPO; int rc = 0; /* Create the LEAVES table if it does not already exist. Make sure ** it is empty. |
︙ | ︙ | |||
30841 30842 30843 30844 30845 30846 30847 | return rc; dberr: assert(rc); rc = fsl_cx_uplift_db_error2(f, db, rc); goto end; } | | | | | | | | | < < < < < | | | | 30343 30344 30345 30346 30347 30348 30349 30350 30351 30352 30353 30354 30355 30356 30357 30358 30359 30360 30361 30362 30363 30364 30365 30366 30367 30368 30369 30370 30371 30372 30373 30374 30375 30376 30377 30378 30379 30380 30381 30382 30383 30384 30385 30386 30387 30388 30389 30390 30391 30392 30393 30394 30395 30396 30397 30398 30399 30400 30401 30402 30403 30404 30405 30406 30407 30408 30409 30410 30411 30412 30413 30414 30415 30416 30417 30418 30419 | return rc; dberr: assert(rc); rc = fsl_cx_uplift_db_error2(f, db, rc); goto end; } bool fsl_leaves_computed_has(fsl_cx * f){ return fsl_db_exists(fsl_cx_db_repo(f), "SELECT 1 FROM leaves"); } fsl_int_t fsl_leaves_computed_count(fsl_cx * f){ int32_t rv = -1; fsl_db * const db = fsl_cx_db_repo(f); int const rc = fsl_db_get_int32(db, &rv, "SELECT COUNT(*) FROM leaves"); if(rc){ fsl_cx_uplift_db_error2(f, db, rc); assert(-1==rv); }else{ assert(rv>=0); } return rv; } fsl_id_t fsl_leaves_computed_latest(fsl_cx * f){ fsl_id_t rv = 0; fsl_db * const db = fsl_cx_db_repo(f); int const rc = fsl_db_get_id(db, &rv, "SELECT rid FROM leaves, event" " WHERE event.objid=leaves.rid" " ORDER BY event.mtime DESC"); if(rc){ fsl_cx_uplift_db_error2(f, db, rc); assert(!rv); }else{ assert(rv>=0); } return rv; } void fsl_leaves_computed_cleanup(fsl_cx * f){ fsl_db_exec(fsl_cx_db_repo(f), "DROP TABLE IF EXISTS leaves"); } #undef MARKER /* end of file leaf.c */ /* start of file list.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /************************************************************************ This file houses the implementations for the fsl_list routines. */ #include <assert.h> #include <stdlib.h> /* malloc() and friends, qsort() */ #include <memory.h> /* memset() */ int fsl_list_reserve( fsl_list * self, fsl_size_t n ) { if( !self ) return FSL_RC_MISUSE; else if(0 == n){ if(0 == self->capacity) return 0; fsl_free(self->list); *self = fsl_list_empty; return 0; |
︙ | ︙ | |||
30931 30932 30933 30934 30935 30936 30937 | memset( m + self->capacity, 0, (sizeof(void*)*(n-self->capacity))); self->capacity = n; self->list = m; return 0; } } | | | | | | 30428 30429 30430 30431 30432 30433 30434 30435 30436 30437 30438 30439 30440 30441 30442 30443 30444 30445 30446 30447 30448 30449 30450 30451 30452 30453 30454 30455 30456 30457 30458 30459 30460 30461 30462 30463 30464 30465 30466 30467 30468 30469 30470 30471 30472 30473 30474 30475 30476 30477 30478 30479 30480 30481 30482 | memset( m + self->capacity, 0, (sizeof(void*)*(n-self->capacity))); self->capacity = n; self->list = m; return 0; } } void fsl_list_swap( fsl_list * lhs, fsl_list * rhs ){ fsl_list tmp = *lhs; *rhs = *lhs; *lhs = tmp; } int fsl_list_append( fsl_list * self, void* cp ){ if( !self ) return FSL_RC_MISUSE; assert(self->used <= self->capacity); if(self->used == self->capacity){ int rc; fsl_size_t const cap = self->capacity ? (self->capacity * 2) : 10; rc = fsl_list_reserve(self, cap); if(rc) return rc; } self->list[self->used++] = cp; if(self->used<self->capacity) self->list[self->used]=NULL; return 0; } int fsl_list_v_fsl_free(void * obj, void * visitorState ){ if(obj) fsl_free( obj ); return 0; } int fsl_list_clear( fsl_list * self, fsl_list_visitor_f childFinalizer, void * finalizerState ){ /* TODO: manually traverse the list and set each list entry for which the finalizer succeeds to NULL, so that we can provide well-defined behaviour if childFinalizer() fails and we abort the loop. */ int rc = fsl_list_visit(self, 0, childFinalizer, finalizerState ); if(!rc) fsl_list_reserve(self, 0); return rc; } void fsl_list_visit_free( fsl_list * self, bool freeListMem ){ fsl_list_visit(self, 0, fsl_list_v_fsl_free, NULL ); if(freeListMem) fsl_list_reserve(self, 0); else self->used = 0; } int fsl_list_visit( fsl_list const * self, int order, |
︙ | ︙ | |||
31000 31001 31002 31003 31004 31005 31006 | } } } return rc; } | | | 30497 30498 30499 30500 30501 30502 30503 30504 30505 30506 30507 30508 30509 30510 30511 | } } } return rc; } int fsl_list_visit_p( fsl_list * self, int order, bool shiftIfNulled, fsl_list_visitor_f visitor, void * visitorState ) { int rc = FSL_RC_OK; if( self && self->used && visitor ){ fsl_int_t i = 0; fsl_int_t pos = (order<0) ? self->used-1 : 0; |
︙ | ︙ | |||
31032 31033 31034 31035 31036 31037 31038 | } } } } return rc; } | | | 30529 30530 30531 30532 30533 30534 30535 30536 30537 30538 30539 30540 30541 30542 30543 | } } } } return rc; } void fsl_list_sort( fsl_list * li, fsl_generic_cmp_f cmp){ if(li && li->used>1){ qsort( li->list, li->used, sizeof(void*), cmp ); } } |
︙ | ︙ | |||
31064 31065 31066 31067 31068 31069 31070 | } fsl_int_t fsl_list_index_of_cstr( fsl_list const * li, char const * key ){ return fsl_list_index_of(li, key, fsl_strcmp_cmp); } | | | | 30561 30562 30563 30564 30565 30566 30567 30568 30569 30570 30571 30572 30573 30574 30575 30576 | } fsl_int_t fsl_list_index_of_cstr( fsl_list const * li, char const * key ){ return fsl_list_index_of(li, key, fsl_strcmp_cmp); } /* end of file list.c */ /* start of file lookslike.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
31123 31124 31125 31126 31127 31128 31129 | #undef US3A #undef US3B #undef US4A #undef US4B #undef US4C #undef US0A | < < < < < | 30620 30621 30622 30623 30624 30625 30626 30627 30628 30629 30630 30631 30632 30633 | #undef US3A #undef US3B #undef US4A #undef US4B #undef US4C #undef US0A int fsl_looks_like_utf8(fsl_buffer const * const b, int stopFlags){ fsl_size_t n = 0; const char *z = fsl_buffer_cstr2(b, &n); int j, c, flags = FSL_LOOKSLIKE_NONE; /* Assume UTF-8 text, prove otherwise */ if( n==0 ) return flags; /* Empty file -> text */ c = *z; |
︙ | ︙ | |||
31217 31218 31219 31220 31221 31222 31223 | c = (c>=0xC0) ? (c|3) : ' '; /* determine next lead byte */ } else { c = *++z; } } return c<0x80 /* Final lead byte must be ASCII. */; } | | | | 30709 30710 30711 30712 30713 30714 30715 30716 30717 30718 30719 30720 30721 30722 30723 30724 | c = (c>=0xC0) ? (c|3) : ' '; /* determine next lead byte */ } else { c = *++z; } } return c<0x80 /* Final lead byte must be ASCII. */; } /* end of file lookslike.c */ /* start of file md5.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* The code is modified for use in fossil (then libfossil). The original header comment follows: */ /* * This code implements the MD5 message-digest algorithm. |
︙ | ︙ | |||
31660 31661 31662 31663 31664 31665 31666 | #undef F1 #undef F2 #undef F3 #undef F4 #undef MD5STEP #undef byteReverse | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | 31152 31153 31154 31155 31156 31157 31158 31159 31160 31161 31162 31163 31164 31165 31166 31167 | #undef F1 #undef F2 #undef F3 #undef F4 #undef MD5STEP #undef byteReverse /* end of file md5.c */ /* start of file merge3.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
33050 33051 33052 33053 33054 33055 33056 | sz -= aC[1]; aC += 3; } return true; } /** | | | | | | < | < < < < | < < | 31269 31270 31271 31272 31273 31274 31275 31276 31277 31278 31279 31280 31281 31282 31283 31284 31285 31286 31287 31288 31289 31290 31291 31292 31293 31294 31295 31296 31297 31298 31299 31300 31301 31302 31303 31304 31305 31306 31307 31308 31309 31310 31311 31312 31313 31314 31315 31316 | sz -= aC[1]; aC += 3; } return true; } /** pSrc contains an edited file where aC[] describes the edit. Part of pSrc has already been output. This routine outputs additional lines of pSrc - lines that correspond to the next sz lines of the original unedited file. Note that sz counts the number of lines of text in the original file, but text is output from the edited file, so the number of lines transfer to pOut might be different from sz. Fewer lines appear in pOut if there are deletes. More lines appear if there are inserts. The aC[] array is updated and the new index into aC[] is returned via the final argument. Returns 0 on success, FSL_RC_OOM on allocation error. */ static int output_one_side(fsl_buffer *pOut, fsl_buffer *pSrc, int *aC, int i, int sz, int *newIndex){ int rc = 0; while( sz>0 ){ if( aC[i]==0 && aC[i+1]==0 && aC[i+2]==0 ) break; if( aC[i]>=sz ){ rc = fsl_buffer_copy_lines(pOut, pSrc, sz); if(rc) break; aC[i] -= sz; break; } rc = fsl_buffer_copy_lines(pOut, pSrc, aC[i]); if(!rc) rc = fsl_buffer_copy_lines(pOut, pSrc, aC[i+2]); if(rc) break; sz -= aC[i] + aC[i+1]; i += 3; } if(!rc) *newIndex = i; return rc; } |
︙ | ︙ | |||
33126 33127 33128 33129 33130 33131 33132 | } /** Ensure that the text in p, if not empty, ends with a new line. If useCrLf is true adds "\r\n" otherwise "\n". Returns 0 on success or p is empty, and FSL_RC_OOM on OOM. */ | > | | 31338 31339 31340 31341 31342 31343 31344 31345 31346 31347 31348 31349 31350 31351 31352 31353 | } /** Ensure that the text in p, if not empty, ends with a new line. If useCrLf is true adds "\r\n" otherwise "\n". Returns 0 on success or p is empty, and FSL_RC_OOM on OOM. */ static int ensure_line_end(fsl_buffer *p, bool useCrLf){ int rc = 0; if( !p->used ) return 0; if( p->mem[p->used-1]!='\n' ){ rc = fsl_buffer_append(p, useCrLf ? "\r\n" : "\n", useCrLf ? 2 : 1); } return rc; } |
︙ | ︙ | |||
33173 33174 33175 33176 33177 33178 33179 | NEVER, EVER change these. They MUST match the ones used by fossil. */ static const char *const mergeMarker[] = { /*123456789 123456789 123456789 123456789 123456789 123456789 123456789*/ | | | | | | < < < < < < < | > | | | | < < < < < < < < < < < < < < < < | < | | 31386 31387 31388 31389 31390 31391 31392 31393 31394 31395 31396 31397 31398 31399 31400 31401 31402 31403 31404 31405 31406 31407 31408 31409 31410 31411 31412 31413 31414 31415 31416 31417 31418 31419 31420 31421 31422 31423 31424 31425 31426 31427 31428 31429 31430 31431 31432 31433 | NEVER, EVER change these. They MUST match the ones used by fossil. */ static const char *const mergeMarker[] = { /*123456789 123456789 123456789 123456789 123456789 123456789 123456789*/ "<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<", "||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||||||", "======= MERGED IN content follows ==================================", ">>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" }; static fsl_int_t assert_mema_lengths(){ static const fsl_int_t mmLen = 68; static bool once = true; if(once){ once = false; assert(sizeof(mergeMarker)/sizeof(mergeMarker[0]) == 4); assert((fsl_int_t)fsl_strlen(mergeMarker[0])==mmLen); assert((fsl_int_t)fsl_strlen(mergeMarker[1])==mmLen); assert((fsl_int_t)fsl_strlen(mergeMarker[2])==mmLen); assert((fsl_int_t)fsl_strlen(mergeMarker[3])==mmLen); } return mmLen; } int fsl_buffer_merge3(fsl_buffer * const pPivot, fsl_buffer * const pV1, fsl_buffer * const pV2, fsl_buffer * const pOut, unsigned int * const conflictCount){ int *aC1 = 0; /* Changes from pPivot to pV1 */ int *aC2 = 0; /* Changes from pPivot to pV2 */ int i1, i2; /* Index into aC1[] and aC2[] */ int nCpy, nDel, nIns; /* Number of lines to copy, delete, or insert */ int limit1, limit2; /* Sizes of aC1[] and aC2[] */ int rc = 0; unsigned int nConflict = 0; /* Number of merge conflicts seen so far */ bool useCrLf = false; const fsl_int_t mmLen = assert_mema_lengths(); #define RC if(rc) { \ MARKER(("rc=%s\n", fsl_rc_cstr(rc))); goto end; } (void)0 fsl_buffer_reuse(pOut); /* Merge results stored in pOut */ /* If both pV1 and pV2 start with a UTF-8 byte-order-mark (BOM), ** keep it in the output. This should be secure enough not to cause |
︙ | ︙ | |||
33261 33262 33263 33264 33265 33266 33267 | ** and pPivot => pV2 (into aC2). Each of the aC1 and aC2 arrays is ** an array of integer triples. Within each triple, the first integer ** is the number of lines of text to copy directly from the pivot, ** the second integer is the number of lines of text to omit from the ** pivot, and the third integer is the number of lines of text that are ** inserted. The edit array ends with a triple of 0,0,0. */ | | | | 31451 31452 31453 31454 31455 31456 31457 31458 31459 31460 31461 31462 31463 31464 31465 31466 | ** and pPivot => pV2 (into aC2). Each of the aC1 and aC2 arrays is ** an array of integer triples. Within each triple, the first integer ** is the number of lines of text to copy directly from the pivot, ** the second integer is the number of lines of text to omit from the ** pivot, and the third integer is the number of lines of text that are ** inserted. The edit array ends with a triple of 0,0,0. */ rc = fsl__diff_text_raw(pPivot, pV1, 0, &aC1); if(!rc) rc = fsl__diff_text_raw(pPivot, pV2, 0, &aC2); RC; assert(aC1 && aC2); /* Rewind inputs: Needed to reconstruct output */ fsl_buffer_rewind(pV1); fsl_buffer_rewind(pV2); fsl_buffer_rewind(pPivot); |
︙ | ︙ | |||
33292 33293 33294 33295 33296 33297 33298 | /* Loop over the two edit vectors and use them to compute merged text ** which is written into pOut. i1 and i2 are multiples of 3 which are ** indices into aC1[] and aC2[] to the edit triple currently being ** processed */ i1 = i2 = 0; | < < < < < < < < < < < < < | > | > > > | > | | < > | | | | > > > | | 31482 31483 31484 31485 31486 31487 31488 31489 31490 31491 31492 31493 31494 31495 31496 31497 31498 31499 31500 31501 31502 31503 31504 31505 31506 31507 31508 31509 31510 31511 31512 31513 31514 31515 31516 31517 31518 31519 31520 31521 31522 31523 31524 31525 31526 31527 31528 31529 31530 31531 31532 31533 31534 31535 31536 31537 31538 31539 31540 31541 31542 31543 31544 31545 31546 31547 31548 31549 31550 31551 31552 31553 31554 31555 31556 31557 31558 31559 31560 31561 31562 31563 31564 31565 31566 31567 31568 31569 31570 31571 31572 31573 31574 31575 31576 31577 31578 | /* Loop over the two edit vectors and use them to compute merged text ** which is written into pOut. i1 and i2 are multiples of 3 which are ** indices into aC1[] and aC2[] to the edit triple currently being ** processed */ i1 = i2 = 0; while( i1<limit1 && i2<limit2 ){ FDEBUG( printf("%d: %2d %2d %2d %d: %2d %2d %2d\n", i1/3, aC1[i1], aC1[i1+1], aC1[i1+2], i2/3, aC2[i2], aC2[i2+1], aC2[i2+2]); ) if( aC1[i1]>0 && aC2[i2]>0 ){ /* Output text that is unchanged in both V1 and V2 */ nCpy = mymin(aC1[i1], aC2[i2]); FDEBUG( printf("COPY %d\n", nCpy); ) rc = fsl_buffer_copy_lines(pOut, pPivot, (fsl_size_t)nCpy); if(!rc) rc = fsl_buffer_copy_lines(0, pV1, (fsl_size_t)nCpy); if(!rc) rc = fsl_buffer_copy_lines(0, pV2, (fsl_size_t)nCpy); RC; aC1[i1] -= nCpy; aC2[i2] -= nCpy; }else if( aC1[i1] >= aC2[i2+1] && aC1[i1]>0 && aC2[i2+1]+aC2[i2+2]>0 ){ /* Output edits to V2 that occurs within unchanged regions of V1 */ nDel = aC2[i2+1]; nIns = aC2[i2+2]; FDEBUG( printf("EDIT -%d+%d left\n", nDel, nIns); ) rc = fsl_buffer_copy_lines(0, pPivot, (fsl_size_t)nDel); if(!rc) rc = fsl_buffer_copy_lines(0, pV1, (fsl_size_t)nDel); if(!rc) rc = fsl_buffer_copy_lines(pOut, pV2, (fsl_size_t)nIns); RC; aC1[i1] -= nDel; i2 += 3; }else if( aC2[i2] >= aC1[i1+1] && aC2[i2]>0 && aC1[i1+1]+aC1[i1+2]>0 ){ /* Output edits to V1 that occur within unchanged regions of V2 */ nDel = aC1[i1+1]; nIns = aC1[i1+2]; FDEBUG( printf("EDIT -%d+%d right\n", nDel, nIns); ) rc = fsl_buffer_copy_lines(0, pPivot, (fsl_size_t)nDel); if(!rc) fsl_buffer_copy_lines(0, pV2, (fsl_size_t)nDel); if(!rc) fsl_buffer_copy_lines(pOut, pV1, (fsl_size_t)nIns); aC2[i2] -= nDel; i1 += 3; }else if( sameEdit(&aC1[i1], &aC2[i2], pV1, pV2) ){ /* Output edits that are identical in both V1 and V2. */ assert( aC1[i1]==0 ); nDel = aC1[i1+1]; nIns = aC1[i1+2]; FDEBUG( printf("EDIT -%d+%d both\n", nDel, nIns); ) rc = fsl_buffer_copy_lines(0, pPivot, (fsl_size_t)nDel); if(!rc) fsl_buffer_copy_lines(pOut, pV1, (fsl_size_t)nIns); if(!rc) fsl_buffer_copy_lines(0, pV2, (fsl_size_t)nIns); i1 += 3; i2 += 3; }else { /* We have found a region where different edits to V1 and V2 overlap. ** This is a merge conflict. Find the size of the conflict, then ** output both possible edits separated by distinctive marks. */ int sz = 1; /* Size of the conflict in lines */ ++nConflict; while( !ends_at_CPY(&aC1[i1], sz) || !ends_at_CPY(&aC2[i2], sz) ){ ++sz; } FDEBUG( printf("CONFLICT %d\n", sz); ) rc = ensure_line_end(pOut, useCrLf); if(!rc) rc = fsl_buffer_append(pOut, mergeMarker[0], mmLen); if(!rc) rc = ensure_line_end(pOut, useCrLf); RC; rc = output_one_side(pOut, pV1, aC1, i1, sz, &i1); if(!rc) rc = ensure_line_end(pOut, useCrLf); RC; rc = fsl_buffer_append(pOut, mergeMarker[1], mmLen); if(!rc) rc = ensure_line_end(pOut, useCrLf); if(!rc) rc = fsl_buffer_copy_lines(pOut, pPivot, sz); if(!rc) rc = ensure_line_end(pOut, useCrLf); RC; rc = fsl_buffer_append(pOut, mergeMarker[2], mmLen); if(!rc) rc = ensure_line_end(pOut, useCrLf); if(!rc) rc = output_one_side(pOut, pV2, aC2, i2, sz, &i2); if(!rc) rc = ensure_line_end(pOut, useCrLf); RC; rc = fsl_buffer_append(pOut, mergeMarker[3], mmLen); if(!rc) rc = ensure_line_end(pOut, useCrLf); RC; } /* If we are finished with an edit triple, advance to the next ** triple. */ if( i1<limit1 && aC1[i1]==0 && aC1[i1+1]==0 && aC1[i1+2]==0 ) i1+=3; if( i2<limit2 && aC2[i2]==0 && aC2[i2+1]==0 && aC2[i2+2]==0 ) i2+=3; } |
︙ | ︙ | |||
33424 33425 33426 33427 33428 33429 33430 | fsl_size_t const len = (fsl_size_t)assert_mema_lengths(); if(p->used <= len) return false; fsl_size_t j; const char * const z = (const char *)p->mem; fsl_size_t const n = p->used - len + 1; for(i=0; i<n; ){ for(j=0; j<4; ++j){ | | | < | | | 31609 31610 31611 31612 31613 31614 31615 31616 31617 31618 31619 31620 31621 31622 31623 31624 31625 31626 31627 31628 31629 31630 31631 31632 31633 31634 31635 31636 31637 | fsl_size_t const len = (fsl_size_t)assert_mema_lengths(); if(p->used <= len) return false; fsl_size_t j; const char * const z = (const char *)p->mem; fsl_size_t const n = p->used - len + 1; for(i=0; i<n; ){ for(j=0; j<4; ++j){ if( (memcmp(&z[i], mergeMarker[j], len)==0) && (i+1==n || z[i+len]=='\n' || z[i+len]=='\r') ) return true; } while( i<n && z[i]!='\n' ){ ++i; } while( i<n && (z[i]=='\n' || z[i]=='\r') ){ ++i; } } return false; } #undef mymin #undef FDEBUG #undef ISFDEBUG #undef MARKER /* end of file merge3.c */ /* start of file popen.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* ** Copyright (c) 2010 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the Simplified BSD License (also |
︙ | ︙ | |||
33467 33468 33469 33470 33471 33472 33473 | */ /************************************************************************* This copy has been modified slightly for use in the libfossil project. */ #undef __STRICT_ANSI__ #include <errno.h> | | > > > > > > | 31651 31652 31653 31654 31655 31656 31657 31658 31659 31660 31661 31662 31663 31664 31665 31666 31667 31668 31669 31670 31671 31672 31673 | */ /************************************************************************* This copy has been modified slightly for use in the libfossil project. */ #undef __STRICT_ANSI__ #include <errno.h> #ifdef _WIN32 #include <windows.h> #include <fcntl.h> /* Print a fatal error and quit. */ static void win32_fatal_error(const char *zMsg){ /*fossil_fatal("%s", zMsg); TODO: what to do here? */ } #else #include <unistd.h> #include <signal.h> #include <sys/wait.h> #endif /* |
︙ | ︙ | |||
33504 33505 33506 33507 33508 33509 33510 | # define PTR_TO_INT(X) ((int)(intptr_t)(X)) #else /* Generates a warning - but it always works */ # define INT_TO_PTR(X) ((void*)(X)) # define PTR_TO_INT(X) ((int)(X)) #endif | | | 31694 31695 31696 31697 31698 31699 31700 31701 31702 31703 31704 31705 31706 31707 31708 | # define PTR_TO_INT(X) ((int)(intptr_t)(X)) #else /* Generates a warning - but it always works */ # define INT_TO_PTR(X) ((void*)(X)) # define PTR_TO_INT(X) ((int)(X)) #endif #ifdef _WIN32 /* On windows, create a child process and specify the stdin, stdout, and stderr channels for that process to use. Return the number of errors. */ static int win32_create_child_process( |
︙ | ︙ | |||
33548 33549 33550 33551 33552 33553 33554 | &pi /* Process Info */ ); if( rc ){ CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); *pChildPid = pi.dwProcessId; }else{ | | < | | < | < | 31738 31739 31740 31741 31742 31743 31744 31745 31746 31747 31748 31749 31750 31751 31752 31753 31754 31755 31756 31757 31758 31759 31760 31761 31762 31763 31764 31765 31766 31767 31768 31769 31770 31771 31772 31773 31774 31775 31776 31777 31778 31779 31780 31781 31782 31783 31784 31785 31786 31787 31788 31789 31790 | &pi /* Process Info */ ); if( rc ){ CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); *pChildPid = pi.dwProcessId; }else{ win32_fatal_error("cannot create child process"); } return rc!=0; } #endif /** Create a child process running shell command "zCmd". *ppOut gets assigned to a FILE that becomes the standard input of the child process. (The caller writes to *ppOut in order to send text to the child.) *pfdIn gets assigned to the stdout from the child process. (The caller reads from *pfdIn in order to receive input from the child.) Note that *pfdIn is an unbuffered file descriptor, not a FILE. The process ID of the child is written into *pChildPid. On success the values returned via *pfdIn, *ppOut, and *pChildPid must be passed to fsl_pclose2() to properly clean up. Return 0 on success, non-0 on error. */ int fsl_popen2(const char *zCmd, int *pfdIn, FILE **ppOut, int *pChildPid){ #ifdef _WIN32 /* FIXME: port these win32_fatal_error() bits to error codes. */ HANDLE hStdinRd, hStdinWr, hStdoutRd, hStdoutWr, hStderr; SECURITY_ATTRIBUTES saAttr; DWORD childPid = 0; int fd; saAttr.nLength = sizeof(saAttr); saAttr.bInheritHandle = TRUE; saAttr.lpSecurityDescriptor = NULL; hStderr = GetStdHandle(STD_ERROR_HANDLE); if( !CreatePipe(&hStdoutRd, &hStdoutWr, &saAttr, 4096) ){ win32_fatal_error("cannot create pipe for stdout"); } SetHandleInformation( hStdoutRd, HANDLE_FLAG_INHERIT, FALSE); if( !CreatePipe(&hStdinRd, &hStdinWr, &saAttr, 4096) ){ win32_fatal_error("cannot create pipe for stdin"); } SetHandleInformation( hStdinWr, HANDLE_FLAG_INHERIT, FALSE); win32_create_child_process(fsl_utf8_to_unicode(zCmd), hStdinRd, hStdoutWr, hStderr,&childPid); *pChildPid = childPid; *pfdIn = _open_osfhandle(PTR_TO_INT(hStdoutRd), 0); |
︙ | ︙ | |||
33643 33644 33645 33646 33647 33648 33649 | close(pout[0]); close(pout[1]); close(1); fd = dup(pin[1]); if( fd!=1 ) nErr++; close(pin[0]); close(pin[1]); | | < < < < | < < < < < | < | | | | | 31830 31831 31832 31833 31834 31835 31836 31837 31838 31839 31840 31841 31842 31843 31844 31845 31846 31847 31848 31849 31850 31851 31852 31853 31854 31855 31856 31857 31858 31859 31860 31861 31862 31863 31864 31865 31866 31867 31868 31869 31870 31871 31872 31873 31874 31875 31876 31877 | close(pout[0]); close(pout[1]); close(1); fd = dup(pin[1]); if( fd!=1 ) nErr++; close(pin[0]); close(pin[1]); execl("/bin/sh", "/bin/sh", "-c", zCmd, (char*)0); return fsl_errno_to_rc(errno, FSL_RC_ERROR); }else{ /* This is the parent process */ close(pin[1]); *pfdIn = pin[0]; close(pout[0]); *ppOut = fdopen(pout[1], "w"); return 0; } #endif } /** Close the connection to a child process previously created using fsl_popen2(). Kill off the child process, then close the pipes. */ void fsl_pclose2(int fdIn, FILE *pOut, int childPid){ #ifdef _WIN32 /* Not implemented, yet */ close(fdIn); fclose(pOut); #else close(fdIn); fclose(pOut); kill(childPid, SIGINT); while( waitpid(0, 0, WNOHANG)>0 ) {} #endif } #undef PTR_TO_INT #undef INT_TO_PTR /* end of file popen.c */ /* start of file pq.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
33762 33763 33764 33765 33766 33767 33768 | if( pp ) *pp = p->list[0].data; for(i=0; i<((fsl_id_t)p->used-1); ++i){ p->list[i] = p->list[i+1]; } --p->used; return e; } | | | | 31939 31940 31941 31942 31943 31944 31945 31946 31947 31948 31949 31950 31951 31952 31953 31954 | if( pp ) *pp = p->list[0].data; for(i=0; i<((fsl_id_t)p->used-1); ++i){ p->list[i] = p->list[i+1]; } --p->used; return e; } /* end of file pq.c */ /* start of file repo.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
33825 33826 33827 33828 33829 33830 33831 | " WHERE tagid=%d AND tagxref.rid=ancestor.rid" " AND value=%Q AND tagtype>0)" " LIMIT 1", rid, rid, FSL_TAGID_BRANCH, zBranch ); } | > > > > | | > > > | < | | | | > > | | > | | < | < | < | < < < | | 32002 32003 32004 32005 32006 32007 32008 32009 32010 32011 32012 32013 32014 32015 32016 32017 32018 32019 32020 32021 32022 32023 32024 32025 32026 32027 32028 32029 32030 32031 32032 32033 32034 32035 32036 32037 32038 32039 32040 32041 32042 32043 32044 32045 32046 32047 32048 | " WHERE tagid=%d AND tagxref.rid=ancestor.rid" " AND value=%Q AND tagtype>0)" " LIMIT 1", rid, rid, FSL_TAGID_BRANCH, zBranch ); } /** TODO: figure out if this needs to be in the public API and, if it does, change its signature to: int fsl_branch_of_rid(fsl_cx *f, fsl_int_t rid, char **zOut ) So that we can distinguish "not found" from OOM errors. */ static char * fsl_branch_of_rid(fsl_cx * const f, fsl_int_t rid){ char *zBr = 0; fsl_db * const db = fsl_cx_db_repo(f); fsl_stmt * st = 0; int rc; assert(db); rc = fsl_db_prepare_cached(db, &st, "SELECT value FROM tagxref " "WHERE rid=? AND tagid=%d " "AND tagtype>0 " "/*%s()*/", FSL_TAGID_BRANCH,__func__); if(rc) return 0; rc = fsl_stmt_bind_id(st, 1, rid); if(rc) goto end; if( fsl_stmt_step(st)==FSL_RC_STEP_ROW ){ zBr = fsl_strdup(fsl_stmt_g_text(st,0,0)); if(!zBr) rc = FSL_RC_OOM; } end: fsl_stmt_cached_yield(st); if( !rc && zBr==0 ){ zBr = fsl_config_get_text(f, FSL_CONFDB_REPO, "main-branch", 0); if(!zBr) zBr = fsl_strdup("trunk"); } return zBr; } /** morewt ==> most recent event with tag Comments from original fossil implementation: |
︙ | ︙ | |||
33935 33936 33937 33938 33939 33940 33941 | */ static fsl_id_t fsl_start_of_branch(fsl_cx * f, fsl_id_t rid, enum fsl_stobr_type eType){ fsl_db * db; fsl_stmt q = fsl_stmt_empty; int rc; fsl_id_t ans = rid; | < | | > > | 32115 32116 32117 32118 32119 32120 32121 32122 32123 32124 32125 32126 32127 32128 32129 32130 32131 32132 | */ static fsl_id_t fsl_start_of_branch(fsl_cx * f, fsl_id_t rid, enum fsl_stobr_type eType){ fsl_db * db; fsl_stmt q = fsl_stmt_empty; int rc; fsl_id_t ans = rid; char *zBr = fsl_branch_of_rid(f, rid); if(!zBr){ goto oom; } db = fsl_cx_db_repo(f); assert(db); rc = fsl_db_prepare(db, &q, "SELECT pid, EXISTS(SELECT 1 FROM tagxref" " WHERE tagid=%d AND tagtype>0" " AND value=%Q AND rid=plink.pid)" " FROM plink" |
︙ | ︙ | |||
33969 33970 33971 33972 33973 33974 33975 | break; } ans = fsl_stmt_g_id(&q, 0); }while( fsl_stmt_g_int32(&q, 1)==1 && ans>0 ); fsl_stmt_finalize(&q); end: if( ans>0 && eType==FSL_STOBR_YOAN ){ | | | < > > | 32150 32151 32152 32153 32154 32155 32156 32157 32158 32159 32160 32161 32162 32163 32164 32165 32166 32167 32168 32169 | break; } ans = fsl_stmt_g_id(&q, 0); }while( fsl_stmt_g_int32(&q, 1)==1 && ans>0 ); fsl_stmt_finalize(&q); end: if( ans>0 && eType==FSL_STOBR_YOAN ){ zBr = fsl_branch_of_rid(f, ans); if(zBr){ ans = fsl_youngest_ancestor_in_branch(f, rid, zBr); fsl_free(zBr); }else{ goto oom; } } return ans; oom: if(!f->error.code){ fsl_cx_err_set(f, FSL_RC_OOM, NULL); }/* Else assume the OOM is really a misleading |
︙ | ︙ | |||
34275 34276 34277 34278 34279 34280 34281 | } else if(uuidLen>FSL_STRLEN_K256){ fsl_cx_err_set(f, FSL_RC_RANGE, "UUID is too long: %s", uuid); return -4; } else { fsl_id_t rid = -5; | > | | | > | > > | < > > | | | < < < < < | | > | > > > > < | | | | | | | > | | | > | | | | | | | | | | | | | | | < | | | | > | | | | | | | | | > | | | > | > | 32457 32458 32459 32460 32461 32462 32463 32464 32465 32466 32467 32468 32469 32470 32471 32472 32473 32474 32475 32476 32477 32478 32479 32480 32481 32482 32483 32484 32485 32486 32487 32488 32489 32490 32491 32492 32493 32494 32495 32496 32497 32498 32499 32500 32501 32502 32503 32504 32505 32506 32507 32508 32509 32510 32511 32512 32513 32514 32515 32516 32517 32518 32519 32520 32521 32522 32523 32524 32525 32526 32527 32528 32529 32530 32531 32532 32533 32534 32535 32536 32537 32538 32539 32540 32541 | } else if(uuidLen>FSL_STRLEN_K256){ fsl_cx_err_set(f, FSL_RC_RANGE, "UUID is too long: %s", uuid); return -4; } else { fsl_id_t rid = -5; fsl_stmt q = fsl_stmt_empty; fsl_stmt * qS = NULL; int rc; rc = fsl_is_uuid_len((int)uuidLen) /* Optimization for the common internally-used case. FIXME: there is an *astronomically small* chance of a prefix collision on a v1-length uuidLen against a v2-length blob.uuid value, leading to no match found for an existing v2 uuid here. Like... a *REALLY* small chance. */ ? fsl_db_prepare_cached(db, &qS, "SELECT rid FROM blob WHERE " "uuid=? /*%s()*/",__func__) : fsl_db_prepare(db, &q, "SELECT rid FROM blob WHERE " "uuid GLOB '%s*'", uuid); if(!rc){ fsl_stmt * st = qS ? qS : &q; if(qS){ rc = fsl_stmt_bind_text(qS, 1, uuid, (fsl_int_t)uuidLen, 0); } if(!rc){ rc = fsl_stmt_step(st); switch(rc){ case FSL_RC_STEP_ROW: rc = 0; rid = fsl_stmt_g_id(st, 0); if(!qS){ /* Check for an ambiguous result. We don't need this for the (qS==st) case because that one does an exact match on a unique key. */ rc = fsl_stmt_step(st); switch(rc){ case FSL_RC_STEP_ROW: rc = 0; fsl_cx_err_set(f, FSL_RC_AMBIGUOUS, "UUID prefix is ambiguous: %s", uuid); rid = -6; break; case FSL_RC_STEP_DONE: /* Unambiguous UUID */ rc = 0; break; default: assert(st->db->error.code); /* fall through and uplift the db error below... */ } } break; case FSL_RC_STEP_DONE: /* No entry found */ rid = 0; rc = 0; break; default: assert(st->db->error.code); rid = -7; break; } } if(rc && db->error.code && !f->error.code){ fsl_cx_uplift_db_error(f, db); } if(qS) fsl_stmt_cached_yield(qS); else fsl_stmt_finalize(&q); } return rid; } } fsl_id_t fsl_repo_filename_fnid( fsl_cx * f, char const * fn ){ fsl_id_t rv = 0; int const rc = fsl__repo_filename_fnid2(f, fn, &rv, false); |
︙ | ︙ | |||
34410 34411 34412 34413 34414 34415 34416 | }else if(db->error.code){ fsl_cx_uplift_db_error(f, db); } return rc; } int fsl_delta_src_id( fsl_cx * const f, fsl_id_t deltaRid, | | > > | | > | | < | | | | < | | | | | < | | | < < < | > | > | > | 32601 32602 32603 32604 32605 32606 32607 32608 32609 32610 32611 32612 32613 32614 32615 32616 32617 32618 32619 32620 32621 32622 32623 32624 32625 32626 32627 32628 32629 32630 32631 32632 32633 32634 32635 32636 32637 32638 32639 32640 | }else if(db->error.code){ fsl_cx_uplift_db_error(f, db); } return rc; } int fsl_delta_src_id( fsl_cx * const f, fsl_id_t deltaRid, fsl_id_t * rv ){ fsl_db * const dbR = fsl_cx_db_repo(f); if(!rv) return FSL_RC_MISUSE; else if(deltaRid<=0) return FSL_RC_RANGE; else if(!dbR) return FSL_RC_NOT_A_REPO; else { int rc; fsl_stmt * q = NULL; rc = fsl_db_prepare_cached(dbR, &q, "SELECT srcid FROM delta " "WHERE rid=? /*%s()*/",__func__); if(!rc){ rc = fsl_stmt_bind_id(q, 1, deltaRid); if(!rc){ if(FSL_RC_STEP_ROW==(rc=fsl_stmt_step(q))){ rc = 0; *rv = fsl_stmt_g_id(q, 0); }else if(FSL_RC_STEP_DONE==rc){ rc = 0; *rv = 0; } } fsl_stmt_cached_yield(q); } return rc; } } int fsl__repo_verify_before_commit( fsl_cx * const f, fsl_id_t rid ){ if(0){ /* |
︙ | ︙ | |||
34677 34678 34679 34680 34681 34682 34683 | int fsl_repo_create(fsl_cx * f, fsl_repo_create_opt const * opt ){ fsl_db * db = 0; fsl_cx F = fsl_cx_empty /* used if !f */; int rc = 0; char const * userName = 0; fsl_time_t const unixNow = (fsl_time_t)time(0); | | | > > > > > > > > > > > > > > > > | < | 32868 32869 32870 32871 32872 32873 32874 32875 32876 32877 32878 32879 32880 32881 32882 32883 32884 32885 32886 32887 32888 32889 32890 32891 32892 32893 32894 32895 32896 32897 32898 32899 32900 32901 32902 32903 32904 32905 32906 32907 32908 32909 32910 32911 32912 32913 32914 32915 32916 32917 32918 32919 32920 32921 32922 32923 32924 32925 32926 32927 32928 32929 32930 32931 32932 32933 32934 32935 32936 32937 32938 | int fsl_repo_create(fsl_cx * f, fsl_repo_create_opt const * opt ){ fsl_db * db = 0; fsl_cx F = fsl_cx_empty /* used if !f */; int rc = 0; char const * userName = 0; fsl_time_t const unixNow = (fsl_time_t)time(0); char fileExists; char inTrans = 0; extern int fsl_cx_attach_role(fsl_cx * f, const char *zDbName, fsl_dbrole_e r) /* Internal routine from fsl_cx.c */; if(!opt || !opt->filename) return FSL_RC_MISUSE; fileExists = 0 == fsl_file_access(opt->filename,0); if(fileExists && !opt->allowOverwrite){ return f ? fsl_cx_err_set(f, FSL_RC_ALREADY_EXISTS, "File already exists and " "allowOverwrite is false: %s", opt->filename) : FSL_RC_ALREADY_EXISTS; } if(f){ rc = fsl_ckout_close(f) /* Will fail if a transaction is active! */; switch(rc){ case 0: case FSL_RC_NOT_FOUND: rc = 0; break; default: return rc; } }else{ f = &F; rc = fsl_cx_init( &f, NULL ); if(rc){ fsl_cx_finalize(f); return rc; } } /* We probably should truncate/unlink the file here before continuing, to ensure a clean slate. */ if(fileExists){ #if 0 FILE * file = fsl_fopen(opt->filename, "w"/*truncates it*/); if(!file){ rc = fsl_cx_err_set(f, fsl_errno_to_rc(errno, FSL_RC_IO), "Cannot open '%s' for writing.", opt->filename); goto end2; }else{ fsl_fclose(file); } #else rc = fsl_file_unlink(opt->filename); if(rc){ rc = fsl_cx_err_set(f, rc, "Cannot unlink existing repo file: %s", opt->filename); goto end2; } #endif } rc = fsl_cx_attach_role(f, opt->filename, FSL_DBROLE_REPO); if(rc){ goto end2; } db = fsl_cx_db(f); if(!f->repo.user){ f->repo.user = fsl_user_name_guess() /* Ignore OOM error here - we'll use 'root' |
︙ | ︙ | |||
34753 34754 34755 34756 34757 34758 34759 | in fossil this is optional, so we will presumably eventually have to make it so here as well. Not yet sure where this routine is used in fossil (i.e. whether the option is actually exercised). */ rc = fsl_db_exec_multi(db, | | | | | > > | | | 32959 32960 32961 32962 32963 32964 32965 32966 32967 32968 32969 32970 32971 32972 32973 32974 32975 32976 32977 32978 32979 32980 32981 32982 32983 32984 32985 32986 32987 32988 32989 32990 32991 32992 32993 32994 | in fossil this is optional, so we will presumably eventually have to make it so here as well. Not yet sure where this routine is used in fossil (i.e. whether the option is actually exercised). */ rc = fsl_db_exec_multi(db, "INSERT INTO repo.config (name,value,mtime) " "VALUES ('server-code'," "lower(hex(randomblob(20)))," "%"PRIi64");" "INSERT INTO repo.config (name,value,mtime) " "VALUES ('project-code'," "lower(hex(randomblob(20)))," "%"PRIi64");", (int64_t)unixNow, (int64_t)unixNow ); if(rc) goto end1; } /* Set some config vars ... */ { fsl_stmt st = fsl_stmt_empty; rc = fsl_db_prepare(db, &st, "INSERT INTO repo.config (name,value,mtime) " "VALUES (?,?,%"PRIi64")", (int64_t)unixNow); if(!rc){ fsl_stmt_bind_int64(&st, 3, unixNow); #define DBSET_STR(KEY,VAL) \ fsl_stmt_bind_text(&st, 1, KEY, -1, 0); \ fsl_stmt_bind_text(&st, 2, VAL, -1, 0); \ fsl_stmt_step(&st); \ fsl_stmt_reset(&st) |
︙ | ︙ | |||
34811 34812 34813 34814 34815 34816 34817 | rc = fsl_cx_uplift_db_error(f, db); } if(inTrans){ if(!rc) rc = fsl_db_transaction_end(db, 0); else fsl_db_transaction_end(db, 1); inTrans = 0; } | | | 33019 33020 33021 33022 33023 33024 33025 33026 33027 33028 33029 33030 33031 33032 33033 | rc = fsl_cx_uplift_db_error(f, db); } if(inTrans){ if(!rc) rc = fsl_db_transaction_end(db, 0); else fsl_db_transaction_end(db, 1); inTrans = 0; } fsl_cx_close_dbs(f); db = 0; if(rc) goto end2; /** In order for injection of the first commit to go through cleanly (==without any ugly kludging of f->dbMain), we need to now open the new db so that it gets connected |
︙ | ︙ | |||
34868 34869 34870 34871 34872 34873 34874 | goto detach; } inTrans2 = 1; /* Copy all settings from the supplied template repository. */ rc = fsl_db_exec(db, | | | | | < | | | > | > > > > > > > > > | 33076 33077 33078 33079 33080 33081 33082 33083 33084 33085 33086 33087 33088 33089 33090 33091 33092 33093 33094 33095 33096 33097 33098 33099 33100 33101 33102 33103 33104 33105 33106 33107 33108 33109 33110 33111 33112 33113 33114 33115 33116 33117 33118 33119 33120 33121 33122 33123 33124 33125 33126 33127 33128 33129 33130 33131 33132 33133 33134 33135 33136 33137 33138 33139 33140 33141 33142 33143 33144 | goto detach; } inTrans2 = 1; /* Copy all settings from the supplied template repository. */ rc = fsl_db_exec(db, "INSERT OR REPLACE INTO repo.config" " SELECT name,value,mtime FROM settingSrc.config" " WHERE (name IN %s OR name IN %s)" " AND name NOT GLOB 'project-*';", inopConfig, inopDb); if(rc) goto detach; rc = fsl_db_exec(db, "REPLACE INTO repo.reportfmt " "SELECT * FROM settingSrc.reportfmt;"); if(rc) goto detach; /* Copy the user permissions, contact information, last modified time, and photo for all the "system" users from the supplied template repository into the one being setup. The other columns are not copied because they contain security information or other data specific to the other repository. The list of columns copied by this SQL statement may need to be revised in the future. */ rc = fsl_db_exec(db, "UPDATE repo.user SET" " cap = (SELECT u2.cap FROM settingSrc.user u2" " WHERE u2.login = user.login)," " info = (SELECT u2.info FROM settingSrc.user u2" " WHERE u2.login = user.login)," " mtime = (SELECT u2.mtime FROM settingSrc.user u2" " WHERE u2.login = user.login)," " photo = (SELECT u2.photo FROM settingSrc.user u2" " WHERE u2.login = user.login)" " WHERE user.login IN ('anonymous','nobody','developer','reader');" ); detach: fsl_free(inopConfig); fsl_free(inopDb); if(inTrans2){ if(!rc) rc = fsl_db_transaction_end(db,0); else fsl_db_transaction_end(db,1); } fsl_db_detach(db, "settingSrc"); if(rc) goto end2; } if(opt->commitMessage && *opt->commitMessage){ /* Set up initial commit. Because of the historically empty P-card on the first commit, we can't create that one using the fsl_deck API unless we elide the P-card (not as fossil does) and insert an empty R-card (as fossil does). We need one of P- or R-card to unambiguously distinguish this MANIFEST from a CONTROL artifact. Reminder to self: fsl_deck has been adjusted to deal with the initial-checkin(-like) case in the mean time. But this code works, so no need to go changing it... */ fsl_deck d = fsl_deck_empty; fsl_cx_err_reset(f); fsl_deck_init(f, &d, FSL_SATYPE_CHECKIN); rc = fsl_deck_C_set(&d, opt->commitMessage, -1); if(!rc) rc = fsl_deck_D_set(&d, fsl_db_julian_now(db)); if(!rc) rc = fsl_deck_R_set(&d, FSL_MD5_INITIAL_HASH); if(!rc && opt->commitMessageMimetype && *opt->commitMessageMimetype){ |
︙ | ︙ | |||
34944 34945 34946 34947 34948 34949 34950 | if(f == &F){ fsl_cx_finalize(f); if(rc) fsl_file_unlink(opt->filename); } return rc; } | | < | 33161 33162 33163 33164 33165 33166 33167 33168 33169 33170 33171 33172 33173 33174 33175 | if(f == &F){ fsl_cx_finalize(f); if(rc) fsl_file_unlink(opt->filename); } return rc; } static int fsl_repo_dir_names_rid( fsl_cx * f, fsl_id_t rid, fsl_list * tgt, bool addSlash){ fsl_db * dbR = fsl_needs_repo(f); fsl_deck D = fsl_deck_empty; fsl_deck * d = &D; int rc = 0; fsl_stmt st = fsl_stmt_empty; fsl_buffer tname = fsl_buffer_empty; |
︙ | ︙ | |||
34972 34973 34974 34975 34976 34977 34978 34979 34980 34981 | } rc = fsl_buffer_appendf(&tname, "tmp_filelist_for_rid_%d", (int)rid); if(rc) goto end; rc = fsl_deck_F_rewind(d); while( !rc && !(rc=fsl_deck_F_next(d, &fc)) && fc ){ assert(fc->name && *fc->name); if(!st.stmt){ rc = fsl_db_exec(dbR, "CREATE TEMP TABLE IF NOT EXISTS " | > | | | 33188 33189 33190 33191 33192 33193 33194 33195 33196 33197 33198 33199 33200 33201 33202 33203 33204 33205 33206 33207 33208 33209 33210 | } rc = fsl_buffer_appendf(&tname, "tmp_filelist_for_rid_%d", (int)rid); if(rc) goto end; rc = fsl_deck_F_rewind(d); while( !rc && !(rc=fsl_deck_F_next(d, &fc)) && fc ){ //if(!fc->name) continue; assert(fc->name && *fc->name); if(!st.stmt){ rc = fsl_db_exec(dbR, "CREATE TEMP TABLE IF NOT EXISTS " "%b(n TEXT UNIQUE ON CONFLICT IGNORE)", &tname); if(!rc){ rc = fsl_db_prepare(dbR, &st, "INSERT INTO %b(n) " "VALUES(fsl_dirpart(?,%d))", &tname, addSlash ? 1 : 0); } if(rc) goto end; assert(st.stmt); } rc = fsl_stmt_bind_text(&st, 1, fc->name, -1, 0); |
︙ | ︙ | |||
35001 35002 35003 35004 35005 35006 35007 | fsl_stmt_reset(&st); fc = 0; } if(!rc && (count>0)){ fsl_stmt_finalize(&st); rc = fsl_db_prepare(dbR, &st, | | | 33218 33219 33220 33221 33222 33223 33224 33225 33226 33227 33228 33229 33230 33231 33232 | fsl_stmt_reset(&st); fc = 0; } if(!rc && (count>0)){ fsl_stmt_finalize(&st); rc = fsl_db_prepare(dbR, &st, "SELECT n FROM %b WHERE n " "IS NOT NULL ORDER BY n %s", &tname, fsl_cx_filename_collation(f)); while( !rc && (FSL_RC_STEP_ROW==(rc=fsl_stmt_step(&st))) ){ fsl_size_t nLen = 0; char const * name = fsl_stmt_g_text(&st, 0, &nLen); rc = 0; |
︙ | ︙ | |||
35034 35035 35036 35037 35038 35039 35040 | end: if(rc && !f->error.code && dbR->error.code){ fsl_cx_uplift_db_error(f, dbR); } fsl_stmt_finalize(&st); fsl_deck_clean(d); if(tname.used){ | | | | > | < | 33251 33252 33253 33254 33255 33256 33257 33258 33259 33260 33261 33262 33263 33264 33265 33266 33267 33268 33269 33270 33271 33272 33273 33274 33275 | end: if(rc && !f->error.code && dbR->error.code){ fsl_cx_uplift_db_error(f, dbR); } fsl_stmt_finalize(&st); fsl_deck_clean(d); if(tname.used){ fsl_db_exec(dbR, "DROP TABLE IF EXISTS %b", &tname); } fsl_buffer_clear(&tname); return rc; } int fsl_repo_dir_names( fsl_cx * f, fsl_id_t rid, fsl_list * tgt, bool addSlash ){ fsl_db * db = (f && tgt) ? fsl_needs_repo(f) : NULL; if(!f || !tgt) return FSL_RC_MISUSE; else if(!db) return FSL_RC_NOT_A_REPO; else { int rc; if(rid>=0){ if(!rid){ /* Dir list for current checkout version */ if(f->ckout.rid>0){ rid = f->ckout.rid; |
︙ | ︙ | |||
35098 35099 35100 35101 35102 35103 35104 | /* UNTESTED */ char fsl_repo_is_readonly(fsl_cx const * f){ if(!f || !f->dbMain) return 0; else{ int const roleId = f->ckout.db.dbh ? FSL_DBROLE_MAIN : FSL_DBROLE_REPO /* If CKOUT is attached, it is the main DB and REPO is ATTACHed. */ ; | | | 33315 33316 33317 33318 33319 33320 33321 33322 33323 33324 33325 33326 33327 33328 33329 | /* UNTESTED */ char fsl_repo_is_readonly(fsl_cx const * f){ if(!f || !f->dbMain) return 0; else{ int const roleId = f->ckout.db.dbh ? FSL_DBROLE_MAIN : FSL_DBROLE_REPO /* If CKOUT is attached, it is the main DB and REPO is ATTACHed. */ ; char const * zRole = fsl_db_role_label(roleId); assert(f->dbMain); return sqlite3_db_readonly(f->dbMain->dbh, zRole) ? 1 : 0; } } int fsl__repo_record_filename(fsl_cx * const f){ fsl_db * dbR = fsl_needs_repo(f); |
︙ | ︙ | |||
35131 35132 35133 35134 35135 35136 35137 | dbConf = fsl_cx_db_config(f); if(dbConf){ int const dbRole = (f->dbMain==&f->config.db) ? FSL_DBROLE_MAIN : FSL_DBROLE_CONFIG; rc = fsl_db_exec(dbConf, "INSERT OR IGNORE INTO %s.global_config(name,value) " "VALUES('repo:%q',1)", | | | < < < | | | | 33348 33349 33350 33351 33352 33353 33354 33355 33356 33357 33358 33359 33360 33361 33362 33363 33364 33365 33366 33367 33368 33369 33370 33371 33372 33373 33374 33375 33376 33377 33378 33379 33380 33381 33382 33383 33384 33385 33386 33387 33388 33389 33390 33391 33392 33393 33394 33395 33396 33397 33398 33399 | dbConf = fsl_cx_db_config(f); if(dbConf){ int const dbRole = (f->dbMain==&f->config.db) ? FSL_DBROLE_MAIN : FSL_DBROLE_CONFIG; rc = fsl_db_exec(dbConf, "INSERT OR IGNORE INTO %s.global_config(name,value) " "VALUES('repo:%q',1)", fsl_db_role_label(dbRole), fsl_buffer_cstr(full)); if(rc) goto end; } dbC = fsl_cx_db_ckout(f); if(dbC && (zCDir=f->ckout.dir)){ /* If we have a checkout, update its repo's list of checkouts... */ /* Assumption: if we have an opened checkout, dbR is ATTACHed with the role REPO. */ int ro; assert(dbR); ro = sqlite3_db_readonly(dbR->dbh, fsl_db_role_label(FSL_DBROLE_REPO)); assert(ro>=0); if(!ro){ fsl_buffer localRoot = fsl_buffer_empty; rc = fsl_file_canonical_name(zCDir, &localRoot, 1); if(0==rc){ if(dbConf){ /* If global config is open, write the checkout db's name to it. */ int const dbRole = (f->dbMain==&f->config.db) ? FSL_DBROLE_MAIN : FSL_DBROLE_CONFIG; rc = fsl_db_exec(dbConf, "REPLACE INTO INTO %s.global_config(name,value) " "VALUES('ckout:%q',1)", fsl_db_role_label(dbRole), fsl_buffer_cstr(&localRoot)); } if(0==rc){ /* We know that repo is ATTACHed to ckout here. */ assert(dbR == dbC); rc = fsl_db_exec(dbR, "REPLACE INTO %s.config(name, value, mtime) " "VALUES('ckout:%q', 1, now())", fsl_db_role_label(FSL_DBROLE_REPO), fsl_buffer_cstr(&localRoot)); } } fsl_buffer_clear(&localRoot); } } |
︙ | ︙ | |||
35219 35220 35221 35222 35223 35224 35225 | if(db->error.code){ fsl_cx_uplift_db_error(f, db); } return rv; } } | | | | | 33433 33434 33435 33436 33437 33438 33439 33440 33441 33442 33443 33444 33445 33446 33447 33448 33449 33450 33451 33452 33453 33454 33455 33456 | if(db->error.code){ fsl_cx_uplift_db_error(f, db); } return rv; } } int fsl_repo_extract( fsl_cx * f, fsl_repo_extract_opt const * opt_ ){ if(!f || !opt_->callback) return FSL_RC_MISUSE; else if(!fsl_needs_repo(f)) return FSL_RC_NOT_A_REPO; else if(opt_->checkinRid<=0){ return fsl_cx_err_set(f, FSL_RC_RANGE, "RID must be positive."); }else{ int rc; fsl_deck mf = fsl_deck_empty; fsl_buffer * content = opt_->extractContent ? &f->fileContent : NULL; fsl_id_t fid; fsl_repo_extract_state xst = fsl_repo_extract_state_empty; fsl_card_F const * fc = NULL; fsl_repo_extract_opt const opt = *opt_ /* Copy in case the caller modifies it via their callback. If we find an interesting use for such modification then we can |
︙ | ︙ | |||
35275 35276 35277 35278 35279 35280 35281 | }else if(!fid){ rc = fsl_cx_err_set(f, FSL_RC_NOT_FOUND, "Could not resolve RID for UUID: %s", fc->uuid); }else if(opt.extractContent){ fsl_buffer_reuse(content); rc = fsl_content_get(f, fid, content); | < | 33489 33490 33491 33492 33493 33494 33495 33496 33497 33498 33499 33500 33501 33502 | }else if(!fid){ rc = fsl_cx_err_set(f, FSL_RC_NOT_FOUND, "Could not resolve RID for UUID: %s", fc->uuid); }else if(opt.extractContent){ fsl_buffer_reuse(content); rc = fsl_content_get(f, fid, content); } if(!rc){ /** Call the callback. */ xst.fCard = fc; assert(fid>0); xst.content = content; xst.fileRid = fid; |
︙ | ︙ | |||
35343 35344 35345 35346 35347 35348 35349 | rid, uuid ); assert(cursorKludge.mem == in->mem); return rc; } } | | | | 33556 33557 33558 33559 33560 33561 33562 33563 33564 33565 33566 33567 33568 33569 33570 33571 | rid, uuid ); assert(cursorKludge.mem == in->mem); return rc; } } int fsl_repo_blob_lookup( fsl_cx * f, fsl_buffer const * src, fsl_id_t * ridOut, fsl_uuid_str * hashOut ){ int rc; fsl_buffer hash_ = fsl_buffer_empty; fsl_buffer * hash; fsl_id_t rid = 0; if(!fsl_cx_db_repo(f)) return FSL_RC_NOT_A_REPO; hash = hashOut ? &hash_ : fsl__cx_scratchpad(f); /* First check the auxiliary hash to see if there is already an artifact |
︙ | ︙ | |||
35467 35468 35469 35470 35471 35472 35473 | } end: fsl__cx_scratchpad_yield(f, sql); fsl_stmt_finalize(&q); return rc; } | | | 33680 33681 33682 33683 33684 33685 33686 33687 33688 33689 33690 33691 33692 33693 33694 | } end: fsl__cx_scratchpad_yield(f, sql); fsl_stmt_finalize(&q); return rc; } int fsl_repo_manifest_write(fsl_cx *f, fsl_id_t manifestRid, fsl_buffer * const pManifest, fsl_buffer * const pHash, fsl_buffer * const pTags) { fsl_db * const db = fsl_needs_repo(f); if(!db) return FSL_RC_NOT_A_REPO; if(manifestRid<=0){ |
︙ | ︙ | |||
35607 35608 35609 35610 35611 35612 35613 | /** Update the repository schema for Fossil version 2.0. (2017-02-28) (1) Change the CHECK constraint on BLOB.UUID so that the length is greater than or equal to 40, not exactly equal to 40. */ zBlobSchema = fsl_db_g_text(frs->db, NULL, "SELECT sql FROM %!Q.sqlite_schema" | | | 33820 33821 33822 33823 33824 33825 33826 33827 33828 33829 33830 33831 33832 33833 33834 | /** Update the repository schema for Fossil version 2.0. (2017-02-28) (1) Change the CHECK constraint on BLOB.UUID so that the length is greater than or equal to 40, not exactly equal to 40. */ zBlobSchema = fsl_db_g_text(frs->db, NULL, "SELECT sql FROM %!Q.sqlite_schema" " WHERE name='blob'", fsl_db_role_label(FSL_DBROLE_REPO)); if(!zBlobSchema){ /* ^^^^ reminder: fossil(1) simply ignores this case, silently doing nothing instead. */ rc = fsl_cx_uplift_db_error(frs->f, frs->db); if(!rc){ rc = fsl_cx_err_set(frs->f, FSL_RC_DB, "Unknown error fetching blob table schema."); |
︙ | ︙ | |||
35630 35631 35632 35633 35634 35635 35636 | int rc2 = 0; zBlobSchema[i] = '>'; sqlite3_db_config(frs->db->dbh, SQLITE_DBCONFIG_DEFENSIVE, 0, &rc2); rc = fsl_cx_exec_multi(frs->f, "PRAGMA writable_schema=ON;" "UPDATE %!Q.sqlite_schema SET sql=%Q WHERE name LIKE 'blob';" "PRAGMA writable_schema=OFF;", | | | | 33843 33844 33845 33846 33847 33848 33849 33850 33851 33852 33853 33854 33855 33856 33857 33858 33859 33860 33861 33862 33863 33864 33865 33866 33867 33868 33869 | int rc2 = 0; zBlobSchema[i] = '>'; sqlite3_db_config(frs->db->dbh, SQLITE_DBCONFIG_DEFENSIVE, 0, &rc2); rc = fsl_cx_exec_multi(frs->f, "PRAGMA writable_schema=ON;" "UPDATE %!Q.sqlite_schema SET sql=%Q WHERE name LIKE 'blob';" "PRAGMA writable_schema=OFF;", fsl_db_role_label(FSL_DBROLE_REPO), zBlobSchema ); sqlite3_db_config(frs->db->dbh, SQLITE_DBCONFIG_DEFENSIVE, 1, &rc2); break; } } if(rc) goto end; rc = fsl_cx_exec(frs->f, "CREATE VIEW IF NOT EXISTS " " %!Q.artifact(rid,rcvid,size,atype,srcid,hash,content) AS " " SELECT blob.rid,rcvid,size,1,srcid,uuid,content" " FROM blob LEFT JOIN delta ON (blob.rid=delta.rid);", fsl_db_role_label(FSL_DBROLE_REPO) ); end: fsl_free(zBlobSchema); return rc; } |
︙ | ︙ | |||
35811 35812 35813 35814 35815 35816 35817 | fsl_stmt_bind_id(&frs->qChild, 1, cid); if( FSL_RC_STEP_ROW==fsl_stmt_step(&frs->qChild) && (sz = fsl_stmt_g_int64(&frs->qChild, 1))>=0 ){ fsl_buffer next = fsl_buffer_empty; fsl_buffer delta = fsl_buffer_empty; void const * blob = 0; fsl_size_t deltaBlobSize = 0; | | > > > > > > > | > < | 34024 34025 34026 34027 34028 34029 34030 34031 34032 34033 34034 34035 34036 34037 34038 34039 34040 34041 34042 34043 34044 34045 34046 34047 34048 34049 34050 34051 | fsl_stmt_bind_id(&frs->qChild, 1, cid); if( FSL_RC_STEP_ROW==fsl_stmt_step(&frs->qChild) && (sz = fsl_stmt_g_int64(&frs->qChild, 1))>=0 ){ fsl_buffer next = fsl_buffer_empty; fsl_buffer delta = fsl_buffer_empty; void const * blob = 0; fsl_size_t deltaBlobSize = 0; rc = INTCHECK fsl_stmt_get_blob(&frs->qChild, 0, &blob, &deltaBlobSize) /* Library-level TODO: a heuristic/convention in fsl_buffer APIs which says that if buf.mem is not NULL and buf.capacity is 0 then the memory is owned elsewhere and must be copied if/when it would be modified by the buffer API. That would allow us to emulate some of the buffer-copy optimization which fossil does, e.g. in this very spot. */; if(rc) goto outro; rc = fsl_buffer_append(&delta, blob, (fsl_int_t)deltaBlobSize); fsl_stmt_reset(&frs->qChild); rc = INTCHECK fsl_buffer_uncompress(&delta, &delta); if(rc) goto outro; rc = INTCHECK fsl_buffer_delta_apply(content, &delta, &next); fsl_buffer_clear(&delta); if(rc){ if(FSL_RC_OOM!=rc){ rc = fsl_cx_err_set(frs->f, rc, "Error applying delta #%" FSL_ID_T_PFMT " to parent #%" FSL_ID_T_PFMT, cid, rid); } |
︙ | ︙ | |||
35912 35913 35914 35915 35916 35917 35918 35919 35920 35921 35922 35923 35924 35925 | default: break; } fsl__cx_scratchpad_yield(frs->f, b); return rc; } static int fsl__rebuild(fsl_cx * const f, fsl_rebuild_opt const * const opt){ fsl_stmt s = fsl_stmt_empty; fsl_stmt q = fsl_stmt_empty; fsl_db * const db = fsl_cx_db_repo(f); int rc; FslRebuildState frs = FslRebuildState_empty; | > > > | | < < > > | | | | > > | 34132 34133 34134 34135 34136 34137 34138 34139 34140 34141 34142 34143 34144 34145 34146 34147 34148 34149 34150 34151 34152 34153 34154 34155 34156 34157 34158 34159 34160 34161 34162 34163 34164 34165 34166 34167 34168 34169 34170 34171 34172 34173 34174 34175 34176 34177 34178 34179 34180 34181 34182 34183 34184 34185 34186 34187 34188 34189 34190 34191 34192 34193 34194 34195 | default: break; } fsl__cx_scratchpad_yield(frs->f, b); return rc; } #define FSL__REBUILD_SKIP_TICKETS 1 /* remove this once crosslinking does something useful with tickets. */ static int fsl__rebuild(fsl_cx * const f, fsl_rebuild_opt const * const opt){ fsl_stmt s = fsl_stmt_empty; fsl_stmt q = fsl_stmt_empty; fsl_db * const db = fsl_cx_db_repo(f); int rc; FslRebuildState frs = FslRebuildState_empty; fsl_buffer sql = fsl_buffer_empty; assert(db); frs.f = frs.step.f = f; frs.db = db; frs.opt = frs.step.opt = opt; rc = fsl__rebuild_update_schema(&frs); if(!rc) rc = fsl_buffer_reserve(&sql, 1024 * 4); if(rc) goto end; fsl__cx_clear_mf_seen(f, false); rc = fsl_cx_prepare(f, &q, "SELECT name FROM %!Q.sqlite_schema /*scan*/" " WHERE type='table'" " AND name NOT IN ('admin_log', 'blob','delta','rcvfrom','user','alias'," "'config','shun','private','reportfmt'," "'concealed','accesslog','modreq'," "'purgeevent','purgeitem','unversioned'," #if FSL__REBUILD_SKIP_TICKETS "'ticket','ticketchng'," #endif "'subscriber','pending_alert','chat'" ")" " AND name NOT GLOB 'sqlite_*'" " AND name NOT GLOB 'fx_*'", fsl_db_role_label(FSL_DBROLE_REPO) ); while( 0==rc && FSL_RC_STEP_ROW==fsl_stmt_step(&q) ){ rc = fsl_buffer_appendf(&sql, "DROP TABLE IF EXISTS %!Q;\n", fsl_stmt_g_text(&q, 0, NULL)); } fsl_stmt_finalize(&q); if(0==rc && fsl_buffer_size(&sql)){ rc = fsl_cx_exec_multi(f, "%b", &sql); } if(rc) goto end; rc = fsl_cx_exec_multi(f, "%s", fsl_schema_repo2()); #if !FSL__REBUILD_SKIP_TICKETS if(0==rc) rc = fsl__cx_ticket_create_table(f); #endif if(0==rc) rc = fsl__shunned_remove(f); if(0==rc){ rc = fsl_cx_exec_multi(f, "INSERT INTO unclustered" " SELECT rid FROM blob EXCEPT SELECT rid FROM private;" "DELETE FROM unclustered" " WHERE rid IN (SELECT rid FROM shun JOIN blob USING(uuid));" |
︙ | ︙ | |||
35986 35987 35988 35989 35990 35991 35992 | } //totalSize += incrSize*2; rc = fsl_cx_prepare(f, &s, "SELECT rid, size FROM blob /*scan*/" " WHERE NOT EXISTS(SELECT 1 FROM shun WHERE uuid=blob.uuid)" " AND NOT EXISTS(SELECT 1 FROM delta WHERE rid=blob.rid)" | < | 34211 34212 34213 34214 34215 34216 34217 34218 34219 34220 34221 34222 34223 34224 | } //totalSize += incrSize*2; rc = fsl_cx_prepare(f, &s, "SELECT rid, size FROM blob /*scan*/" " WHERE NOT EXISTS(SELECT 1 FROM shun WHERE uuid=blob.uuid)" " AND NOT EXISTS(SELECT 1 FROM delta WHERE rid=blob.rid)" ); if(rc) goto end; rc = fsl__crosslink_begin(f) /* Maintenace reminder: if this call succeeds, BE SURE that we do not skip past the fsl__crosslink_end() call via (goto end). Doing so would get the transaction stack out of sync. */; |
︙ | ︙ | |||
36013 36014 36015 36016 36017 36018 36019 | } } fsl_stmt_finalize(&s); if(rc) goto crosslink_end; rc = fsl_cx_prepare(f, &s, "SELECT rid, size FROM blob" " WHERE NOT EXISTS(SELECT 1 FROM shun WHERE uuid=blob.uuid)" | < < < < < < < < < < < < < < < < < < < < < < < < | < > | 34237 34238 34239 34240 34241 34242 34243 34244 34245 34246 34247 34248 34249 34250 34251 34252 34253 34254 34255 34256 34257 34258 34259 34260 34261 34262 34263 34264 34265 34266 34267 34268 34269 34270 34271 34272 34273 34274 34275 34276 34277 34278 34279 34280 34281 34282 34283 34284 34285 34286 34287 34288 34289 34290 34291 34292 34293 34294 34295 34296 | } } fsl_stmt_finalize(&s); if(rc) goto crosslink_end; rc = fsl_cx_prepare(f, &s, "SELECT rid, size FROM blob" " WHERE NOT EXISTS(SELECT 1 FROM shun WHERE uuid=blob.uuid)" ); while( 0==rc && FSL_RC_STEP_ROW==fsl_stmt_step(&s) ){ fsl_id_t const rid = fsl_stmt_g_id(&s, 0); int64_t const size = fsl_stmt_g_int64(&s, 1); if( size>=0 ){ if( !fsl_id_bag_contains(&frs.idsDone, rid) ){ fsl_buffer content = fsl_buffer_empty; rc = fsl_content_get(f, rid, &content); if(0==rc){ rc = fsl__rebuild_step(&frs, rid, size, &content); assert(!content.mem); } fsl_buffer_clear(&content); } }else{ rc = fsl_cx_exec_multi(f, "INSERT OR IGNORE INTO phantom " "VALUES(%" FSL_ID_T_PFMT ")", rid); if(0==rc){ frs.step.blobSize = -1; frs.step.artifactType = FSL_SATYPE_INVALID; rc = fsl__rebuild_step_done(&frs, rid); } } } fsl_stmt_finalize(&s); crosslink_end: rc = fsl__crosslink_end(f, rc); if(rc) goto end; rc = fsl__rebuild_tag_trunk(&frs); if(rc) goto end; //if( opt->clustering ) rc = fsl__create_cluster(f); rc = fsl_cx_exec_multi(f, "REPLACE INTO config(name,value,mtime) VALUES('content-schema',%Q,now());" "REPLACE INTO config(name,value,mtime) VALUES('aux-schema',%Q,now());" "REPLACE INTO config(name,value,mtime) VALUES('rebuilt',%Q,now());", FSL_CONTENT_SCHEMA, FSL_AUX_SCHEMA, "libfossil " FSL_LIB_VERSION_HASH " " FSL_LIB_VERSION_TIMESTAMP ); end: if(0==rc && frs.opt->callback){ frs.step.stepNumber = 0; frs.step.rid = 0; frs.step.blobSize = 0; rc = frs.opt->callback(&frs.step); } fsl_buffer_clear(&sql); fsl_stmt_finalize(&s); fsl_stmt_finalize(&frs.qDeltas); fsl_stmt_finalize(&frs.qSize); fsl_stmt_finalize(&frs.qChild); fsl_id_bag_clear(&frs.idsDone); return rc; } |
︙ | ︙ | |||
36105 36106 36107 36108 36109 36110 36111 | int const rc2 = fsl_cx_transaction_end(f, opt->dryRun || rc!=0); if(0==rc && 0!=rc2) rc = rc2; } fsl_cx_interrupt(f, 0, NULL); return rc; } | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | 34305 34306 34307 34308 34309 34310 34311 34312 34313 34314 34315 34316 34317 34318 34319 34320 34321 34322 | int const rc2 = fsl_cx_transaction_end(f, opt->dryRun || rc!=0); if(0==rc && 0!=rc2) rc = rc2; } fsl_cx_interrupt(f, 0, NULL); return rc; } #undef FSL__REBUILD_SKIP_TICKETS #undef MARKER /* end of file repo.c */ /* start of file schema.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 Stephan Beal (https://wanderinghorse.net). |
︙ | ︙ | |||
36264 36265 36266 36267 36268 36269 36270 | return fsl_schema_ticket_cstr; } char const * fsl_schema_forum(){ extern char const * fsl_schema_forum_cstr; return fsl_schema_forum_cstr; } | | | | 34364 34365 34366 34367 34368 34369 34370 34371 34372 34373 34374 34375 34376 34377 34378 34379 | return fsl_schema_ticket_cstr; } char const * fsl_schema_forum(){ extern char const * fsl_schema_forum_cstr; return fsl_schema_forum_cstr; } /* end of file schema.c */ /* start of file search.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
36365 36366 36367 36368 36369 36370 36371 | /* All forum posts are always indexed */ end: return rc; #endif } #undef MARKER | | | | 34465 34466 34467 34468 34469 34470 34471 34472 34473 34474 34475 34476 34477 34478 34479 34480 | /* All forum posts are always indexed */ end: return rc; #endif } #undef MARKER /* end of file search.c */ /* start of file sha1.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #include <assert.h> #include <string.h> /* strlen() */ #include <stddef.h> /* NULL on linux */ #include <sys/types.h> |
︙ | ︙ | |||
38269 38270 38271 38272 38273 38274 38275 | fsl_sha1_init(&ctx); fsl_sha1_update(&ctx, zIn, (len<0) ? fsl_strlen(zIn) : (fsl_size_t)len); fsl_sha1_final_hex(&ctx, zHex); return zHex; } } | | | | 36369 36370 36371 36372 36373 36374 36375 36376 36377 36378 36379 36380 36381 36382 36383 36384 | fsl_sha1_init(&ctx); fsl_sha1_update(&ctx, zIn, (len<0) ? fsl_strlen(zIn) : (fsl_size_t)len); fsl_sha1_final_hex(&ctx, zHex); return zHex; } } /* end of file sha1.c */ /* start of file sha3.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* ** Copyright (c) 2017 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the Simplified BSD License (also |
︙ | ︙ | |||
38904 38905 38906 38907 38908 38909 38910 | fsl_sha3_end(&ctx); rc = fsl_buffer_append(pCksum, ctx.hex, fsl_strlen(ctx.hex)); return rc; #endif } } | < < < < < < < < < < < < < < < < < < < < < < < < < < | | | 37004 37005 37006 37007 37008 37009 37010 37011 37012 37013 37014 37015 37016 37017 37018 37019 37020 37021 37022 | fsl_sha3_end(&ctx); rc = fsl_buffer_append(pCksum, ctx.hex, fsl_strlen(ctx.hex)); return rc; #endif } } #undef SHA3_BYTEORDER #undef MARKER /* end of file sha3.c */ /* start of file strftime.c */ /******************************************************************************* * The Elm Mail System - $Revision: 1.3 $ $State: Exp $ * * Public-domain relatively quick-and-dirty implemenation of * ANSI library routine for System V Unix systems. * * Arnold Robbins |
︙ | ︙ | |||
39545 39546 39547 39548 39549 39550 39551 | */ fsl_size_t fsl_strftime_unix(char * dest, fsl_size_t destLen, char const * format, fsl_time_t epochTime, bool convertToLocal){ time_t orig = (time_t)epochTime; struct tm * tim = convertToLocal ? localtime(&orig) : gmtime(&orig); return fsl_strftime( dest, destLen, format, tim ); } | | | | 37619 37620 37621 37622 37623 37624 37625 37626 37627 37628 37629 37630 37631 37632 37633 37634 | */ fsl_size_t fsl_strftime_unix(char * dest, fsl_size_t destLen, char const * format, fsl_time_t epochTime, bool convertToLocal){ time_t orig = (time_t)epochTime; struct tm * tim = convertToLocal ? localtime(&orig) : gmtime(&orig); return fsl_strftime( dest, destLen, format, tim ); } /* end of file strftime.c */ /* start of file tag.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
40184 40185 40186 40187 40188 40189 40190 | fsl_deck_finalize(&parent); fsl_deck_finalize(&deck); return rc; } #undef MARKER | | | | 38258 38259 38260 38261 38262 38263 38264 38265 38266 38267 38268 38269 38270 38271 38272 38273 | fsl_deck_finalize(&parent); fsl_deck_finalize(&deck); return rc; } #undef MARKER /* end of file tag.c */ /* start of file ticket.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
40213 40214 40215 40216 40217 40218 40219 | int rc; if(!db) return FSL_RC_NOT_A_REPO; rc = fsl_cx_exec_multi(f, "DROP TABLE IF EXISTS ticket;" "DROP TABLE IF EXISTS ticketchng;" ); if(!rc){ | | | > > | > > | > | < < < | < < < < < < | < < < < < < | | 38287 38288 38289 38290 38291 38292 38293 38294 38295 38296 38297 38298 38299 38300 38301 38302 38303 38304 38305 38306 38307 38308 38309 38310 38311 38312 38313 38314 38315 38316 38317 38318 38319 38320 38321 38322 38323 38324 38325 38326 38327 38328 38329 38330 38331 38332 38333 38334 38335 38336 38337 38338 38339 38340 38341 38342 38343 38344 38345 38346 38347 38348 38349 38350 38351 38352 38353 38354 38355 38356 38357 38358 38359 38360 38361 38362 38363 38364 | int rc; if(!db) return FSL_RC_NOT_A_REPO; rc = fsl_cx_exec_multi(f, "DROP TABLE IF EXISTS ticket;" "DROP TABLE IF EXISTS ticketchng;" ); if(!rc){ fsl_buffer * const buf = &f->fileContent; fsl_buffer_reuse(buf); rc = fsl_cx_schema_ticket(f, buf); if(!rc) rc = fsl_cx_exec_multi(f, "%b", buf); } return rc; } static int fsl_tkt_field_id(fsl_list const * jli, const char *zFieldName){ int i; fsl_card_J const * jc; for(i=0; i<(int)jli->used; ++i){ jc = (fsl_card_J const *)jli->list[i]; if( !fsl_strcmp(zFieldName, jc->field) ) return i; } return -1; } int fsl__cx_ticket_load_fields(fsl_cx * const f, bool forceReload){ fsl_stmt q = fsl_stmt_empty; int i, rc = 0; fsl_list * li = &f->ticket.customFields; fsl_card_J * jc; fsl_db * db; if(li->used){ if(!forceReload) return 0; fsl__card_J_list_free(li, 0); /* Fall through and reload ... */ } if( !(db = fsl_needs_repo(f)) ){ return FSL_RC_NOT_A_REPO; } rc = fsl_db_prepare(db, &q, "PRAGMA table_info(ticket)"); if(!rc) while( FSL_RC_STEP_ROW==fsl_stmt_step(&q) ){ char const * zFieldName = fsl_stmt_g_text(&q, 1, NULL); f->ticket.hasTicket = 1; if( 0==memcmp(zFieldName,"tkt_", 4)){ if( 0==fsl_strcmp(zFieldName,"tkt_ctime")) f->ticket.hasCTime = 1; continue; } jc = fsl_card_J_malloc(0, zFieldName, NULL); if(!jc){ rc = FSL_RC_OOM; break; } jc->flags = FSL_CARD_J_TICKET; rc = fsl_list_append(li, jc); if(rc){ fsl_card_J_free(jc); break; } } fsl_stmt_finalize(&q); if(rc) goto end; rc = fsl_db_prepare(db, &q, "PRAGMA table_info(ticketchng)"); if(!rc) while( FSL_RC_STEP_ROW==fsl_stmt_step(&q) ){ char const * zFieldName = fsl_stmt_g_text(&q, 1, NULL); f->ticket.hasChng = 1; if( 0==memcmp(zFieldName,"tkt_", 4)){ if( 0==fsl_strcmp(zFieldName,"tkt_rid")) f->ticket.hasChngRid = 1; continue; } if( (i=fsl_tkt_field_id(li, zFieldName)) >= 0){ jc = (fsl_card_J*)li->list[i]; jc->flags |= FSL_CARD_J_CHNG; continue; } jc = fsl_card_J_malloc(0, zFieldName, NULL); if(!jc){ rc = FSL_RC_OOM; |
︙ | ︙ | |||
40310 40311 40312 40313 40314 40315 40316 | fsl_stmt_finalize(&q); end: if(!rc){ fsl_list_sort(li, fsl__qsort_cmp_J_cards); } return rc; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | 38374 38375 38376 38377 38378 38379 38380 38381 38382 38383 38384 38385 38386 38387 38388 38389 | fsl_stmt_finalize(&q); end: if(!rc){ fsl_list_sort(li, fsl__qsort_cmp_J_cards); } return rc; } /* end of file ticket.c */ /* start of file utf8.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* ** Copyright (c) 2017 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the Simplified BSD License (also |
︙ | ︙ | |||
41396 41397 41398 41399 41400 41401 41402 | p[-1] = '/'; } } } return zPath; #elif defined(__APPLE__) && !defined(WITHOUT_ICONV) return fsl_strdup(zUtf8) | | < > | 38642 38643 38644 38645 38646 38647 38648 38649 38650 38651 38652 38653 38654 38655 38656 38657 | p[-1] = '/'; } } } return zPath; #elif defined(__APPLE__) && !defined(WITHOUT_ICONV) return fsl_strdup(zUtf8) /* Why? Why not just act like Unix? */ ; #else return (void *)zUtf8; /* No-op on unix */ #endif } char *fsl_getenv(const char *zName){ |
︙ | ︙ | |||
41446 41447 41448 41449 41450 41451 41452 | default: break; } } return rc; } } | | | | 38692 38693 38694 38695 38696 38697 38698 38699 38700 38701 38702 38703 38704 38705 38706 38707 | default: break; } } return rc; } } /* end of file utf8.c */ /* start of file vfile.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
41644 41645 41646 41647 41648 41649 41650 41651 41652 41653 41654 41655 | } int fsl_vfile_changes_scan(fsl_cx * const f, fsl_id_t vid, unsigned cksigFlags){ fsl_stmt * stUpdate = NULL; fsl_stmt q = fsl_stmt_empty; int rc = 0; fsl_fstat fst = fsl_fstat_empty; fsl_size_t rootLen; fsl_buffer * fileCksum = fsl__cx_scratchpad(f); bool const useMtime = (cksigFlags & FSL_VFILE_CKSIG_HASH)==0 && fsl_config_get_bool(f, FSL_CONFDB_REPO, true, "mtime-changes"); | > | | | | 38890 38891 38892 38893 38894 38895 38896 38897 38898 38899 38900 38901 38902 38903 38904 38905 38906 38907 38908 38909 38910 38911 38912 38913 38914 38915 38916 38917 38918 38919 38920 38921 38922 38923 38924 38925 38926 38927 38928 38929 38930 38931 38932 38933 38934 38935 38936 38937 38938 | } int fsl_vfile_changes_scan(fsl_cx * const f, fsl_id_t vid, unsigned cksigFlags){ fsl_stmt * stUpdate = NULL; fsl_stmt q = fsl_stmt_empty; int rc = 0; fsl_db * const db = fsl_needs_ckout(f); fsl_fstat fst = fsl_fstat_empty; fsl_size_t rootLen; fsl_buffer * fileCksum = fsl__cx_scratchpad(f); bool const useMtime = (cksigFlags & FSL_VFILE_CKSIG_HASH)==0 && fsl_config_get_bool(f, FSL_CONFDB_REPO, true, "mtime-changes"); if(!db) return FSL_RC_NOT_A_CKOUT; assert(f->ckout.dir); if(vid<=0) vid = f->ckout.rid; assert(vid>=0); rootLen = fsl_strlen(f->ckout.dir); assert(rootLen); rc = fsl_db_transaction_begin(db); if(rc) return rc; if(f->ckout.rid != vid){ rc = fsl_vfile_load(f, vid, (FSL_VFILE_CKSIG_KEEP_OTHERS & cksigFlags) ? false : true, NULL); } if(rc) goto end; #if 0 MARKER(("changed/deleted vfile contents post load-from-rid:\n")); fsl_db_each( fsl_cx_db_ckout(f), fsl_stmt_each_f_dump, NULL, "SELECT vf.id, substr(b.uuid,0,8) hash, chnged, " "deleted, vf.pathname " "FROM vfile vf LEFT JOIN blob b " "ON b.rid=vf.rid " "WHERE vf.vid=%"FSL_ID_T_PFMT" " "AND (chnged<>0 OR pathname<>origname OR deleted<>0)" "ORDER BY vf.id", vid); #endif rc = fsl_db_prepare(db, &q, "SELECT " /*0*/"id," /*1*/"%Q || pathname," /*2*/"vfile.mrid," /*3*/"deleted," /*4*/"chnged," /*5*/"uuid," /*6*/"size," |
︙ | ︙ | |||
41838 41839 41840 41841 41842 41843 41844 | }else if( origPerm==FSL_FILE_PERM_LINK ){ changed = FSL_VFILE_CHANGE_NOT_SYMLINK; } } #endif if( currentMtime!=oldMtime || changed!=oldChanged ){ if(!stUpdate){ | | > > > > > | | > < < < > > | | > > > | 39085 39086 39087 39088 39089 39090 39091 39092 39093 39094 39095 39096 39097 39098 39099 39100 39101 39102 39103 39104 39105 39106 39107 39108 39109 39110 39111 39112 39113 39114 39115 39116 39117 39118 39119 39120 39121 39122 39123 39124 39125 39126 39127 39128 39129 39130 39131 39132 39133 39134 39135 39136 39137 39138 39139 39140 39141 39142 39143 | }else if( origPerm==FSL_FILE_PERM_LINK ){ changed = FSL_VFILE_CHANGE_NOT_SYMLINK; } } #endif if( currentMtime!=oldMtime || changed!=oldChanged ){ if(!stUpdate){ rc = fsl_db_prepare_cached(db, &stUpdate, "UPDATE vfile SET " "mtime=?1, chnged=?2 " "WHERE id=?3 " "/*%s()*/",__func__); if(rc) goto end; }else{ fsl_stmt_reset(stUpdate); } fsl_stmt_bind_int64(stUpdate, 1, currentMtime); fsl_stmt_bind_int32(stUpdate, 2, changed); fsl_stmt_bind_id(stUpdate, 3, id); rc = fsl_stmt_step(stUpdate); if(FSL_RC_STEP_DONE!=rc) goto end; rc = 0; /* MARKER(("UPDATED vfile.(mtime,chnged) for: %s\n", zName)); */ } }/*while(step)*/ #if 0 MARKER(("changed/deleted vfile contents post vfile scan:\n")); fsl_db_each( fsl_cx_db_ckout(f), fsl_stmt_each_f_dump, NULL, "SELECT vf.id, substr(b.uuid,0,8) hash, chnged, " "deleted, vf.pathname " "FROM vfile vf LEFT JOIN blob b " "ON b.rid=vf.rid " "WHERE vf.vid=%"FSL_ID_T_PFMT" " "AND (chnged<>0 OR pathname<>origname OR deleted<>0)" "ORDER BY vf.id", vid); #endif end: fsl__cx_scratchpad_yield(f, fileCksum); if(!rc && (cksigFlags & FSL_VFILE_CKSIG_WRITE_CKOUT_VERSION) && (f->ckout.rid != vid)){ rc = fsl__ckout_version_write(f, vid, 0); }else if(rc){ rc = fsl_cx_uplift_db_error2(f, db, rc); } if(rc) { fsl_db_transaction_rollback(db); }else{ rc = fsl_db_transaction_commit(db); if(rc){ rc = fsl_cx_uplift_db_error2(f, db, rc); } } fsl_stmt_cached_yield(stUpdate); fsl_stmt_finalize(&q); return rc; } int fsl__vfile_to_ckout(fsl_cx * const f, fsl_id_t vfileId, |
︙ | ︙ | |||
42022 42023 42024 42025 42026 42027 42028 | end: fsl_buffer_clear(&content); fsl_stmt_finalize(&q); return rc; } #undef MARKER | | | | 39277 39278 39279 39280 39281 39282 39283 39284 39285 39286 39287 39288 39289 39290 39291 39292 | end: fsl_buffer_clear(&content); fsl_stmt_finalize(&q); return rc; } #undef MARKER /* end of file vfile.c */ /* start of file vpath.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
42228 42229 42230 42231 42232 42233 42234 | fsl_stmt_finalize(&s); fsl_vpath_clear(path); return rc; } /** Creates, if needed, the [ancestor] table, else clears its | | < | | 39483 39484 39485 39486 39487 39488 39489 39490 39491 39492 39493 39494 39495 39496 39497 39498 | fsl_stmt_finalize(&s); fsl_vpath_clear(path); return rc; } /** Creates, if needed, the [ancestor] table, else clears its contents. Returns */ static int fsl__init_ancestor(fsl_cx * const f){ fsl_db * const db = fsl_cx_db_repo(f); int rc; if(db){ rc = fsl_db_exec_multi(db, "CREATE TEMP TABLE IF NOT EXISTS ancestor(" " rid INT UNIQUE," |
︙ | ︙ | |||
42467 42468 42469 42470 42471 42472 42473 | dberr: assert(rc); rc = fsl_cx_uplift_db_error2(f, db, rc); goto end; } #undef MARKER | | | | 39721 39722 39723 39724 39725 39726 39727 39728 39729 39730 39731 39732 39733 39734 39735 39736 | dberr: assert(rc); rc = fsl_cx_uplift_db_error2(f, db, rc); goto end; } #undef MARKER /* end of file vpath.c */ /* start of file wiki.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
42494 42495 42496 42497 42498 42499 42500 | #include <stdio.h> #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) | | | < < | | | > | | | | | | < < | > > | > | | | | | < | | | | | | | > < | 39748 39749 39750 39751 39752 39753 39754 39755 39756 39757 39758 39759 39760 39761 39762 39763 39764 39765 39766 39767 39768 39769 39770 39771 39772 39773 39774 39775 39776 39777 39778 39779 39780 39781 39782 39783 39784 39785 39786 39787 39788 39789 39790 39791 39792 39793 39794 39795 39796 39797 39798 39799 39800 39801 39802 39803 39804 39805 39806 39807 39808 39809 39810 39811 39812 39813 39814 39815 39816 39817 39818 39819 39820 39821 39822 39823 39824 39825 39826 39827 39828 39829 39830 39831 39832 39833 39834 39835 39836 39837 39838 39839 39840 39841 39842 39843 39844 39845 39846 39847 39848 39849 39850 39851 39852 39853 39854 39855 39856 39857 | #include <stdio.h> #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) int fsl_wiki_names_get( fsl_cx * f, fsl_list * tgt ){ fsl_db * db = fsl_needs_repo(f); if(!f || !tgt) return FSL_RC_MISUSE; else if(!db) return FSL_RC_NOT_A_REPO; else { int rc = fsl_db_select_slist( db, tgt, "SELECT substr(tagname,6) AS name " "FROM tag " "WHERE tagname GLOB 'wiki-*' " "ORDER BY lower(name)"); if(rc && db->error.code && !f->error.code){ fsl_cx_uplift_db_error(f, db); } return rc; } } int fsl_wiki_latest_rid( fsl_cx * f, char const * pageName, fsl_id_t * rid ){ fsl_db * db = f ? fsl_needs_repo(f) : NULL; if(!f || !pageName) return FSL_RC_MISUSE; else if(!*pageName) return FSL_RC_RANGE; else if(!db) return FSL_RC_NOT_A_REPO; else return fsl_db_get_id(db, rid, "SELECT x.rid FROM tag t, tagxref x " "WHERE x.tagid=t.tagid " "AND t.tagname='wiki-%q' " "ORDER BY mtime DESC LIMIT 1", pageName); } bool fsl_wiki_page_exists(fsl_cx * f, char const * pageName){ fsl_id_t rid = 0; return (0==fsl_wiki_latest_rid(f, pageName, &rid)) && (rid>0); } int fsl_wiki_load_latest( fsl_cx * f, char const * pageName, fsl_deck * d ){ fsl_db * db = f ? fsl_needs_repo(f) : NULL; if(!f || !pageName || !d) return FSL_RC_MISUSE; else if(!*pageName) return FSL_RC_RANGE; else if(!db) return FSL_RC_NOT_A_REPO; else{ fsl_id_t rid = 0; int rc = fsl_wiki_latest_rid(f, pageName, &rid); if(rc) return rc; else if(0==rid) return FSL_RC_NOT_FOUND; return fsl_deck_load_rid( f, d, rid, FSL_SATYPE_WIKI); } } int fsl_wiki_foreach_page( fsl_cx * f, fsl_deck_visitor_f cb, void * state ){ fsl_db * db = f ? fsl_needs_repo(f) : NULL; if(!f || !cb) return FSL_RC_MISUSE; else if(!db) return FSL_RC_NOT_A_REPO; else{ fsl_stmt st = fsl_stmt_empty; fsl_stmt names = fsl_stmt_empty; int rc; char doBreak = 0; rc = fsl_db_prepare(db, &names, "SELECT substr(tagname,6) AS name " "FROM tag " "WHERE tagname GLOB 'wiki-*' " "ORDER BY lower(name)"); if(rc) return rc; while( !doBreak && !rc && (FSL_RC_STEP_ROW==fsl_stmt_step(&names))){ fsl_size_t nameLen = 0; char const * pageName = fsl_stmt_g_text(&names, 0, &nameLen); if(!st.stmt){ rc = fsl_db_prepare(db, &st, "SELECT x.rid AS mrid FROM tag t, tagxref x " "WHERE x.tagid=t.tagid " "AND t.tagname='wiki-'||? " "ORDER BY mtime DESC LIMIT 1"); if(rc) goto end; } rc = fsl_stmt_bind_text(&st, 1, pageName, (fsl_int_t)nameLen, 0); if(rc) break; rc = fsl_stmt_step(&st); assert(FSL_RC_STEP_ROW==rc); if(FSL_RC_STEP_ROW==rc){ fsl_deck d = fsl_deck_empty; fsl_id_t rid = fsl_stmt_g_id(&st, 0); rc = fsl_deck_load_rid( f, &d, rid, FSL_SATYPE_WIKI); if(!rc){ rc = cb(f, &d, state); if(FSL_RC_BREAK==rc){ rc = 0; doBreak = 1; } } fsl_deck_finalize(&d); } fsl_stmt_reset(&st); } end: fsl_stmt_finalize(&st); fsl_stmt_finalize(&names); return rc; } } |
︙ | ︙ | |||
42666 42667 42668 42669 42670 42671 42672 | end: fsl_deck_finalize(&d); return rc; } } #undef MARKER | | | | 39919 39920 39921 39922 39923 39924 39925 39926 39927 39928 39929 39930 39931 39932 39933 39934 | end: fsl_deck_finalize(&d); return rc; } } #undef MARKER /* end of file wiki.c */ /* start of file zip.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* ** Copyright (c) 2017 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the Simplified BSD License (also |
︙ | ︙ | |||
43139 43140 43141 43142 43143 43144 43145 | } } } return rc; } | | | 40392 40393 40394 40395 40396 40397 40398 40399 40400 40401 40402 40403 40404 40405 40406 | } } } return rc; } int fsl_repo_zip_sym_to_filename( fsl_cx * f, char const * sym, char const * rootDir, char const * fileName, fsl_card_F_visitor_f progress, void * progressState ){ int rc; fsl_deck mf = fsl_deck_empty; ZipState zs = ZipState_empty; |
︙ | ︙ | |||
43188 43189 43190 43191 43192 43193 43194 | } /** Always write the manifest files to the zip, regardless of the repo-level settings. This decision is up for debate. */ if(rc) goto end; else { | | | 40441 40442 40443 40444 40445 40446 40447 40448 40449 40450 40451 40452 40453 40454 40455 | } /** Always write the manifest files to the zip, regardless of the repo-level settings. This decision is up for debate. */ if(rc) goto end; else { fsl_buffer * const bManifest = &f->fileContent; fsl_buffer * const bHash = fsl__cx_scratchpad(f); fsl_buffer * const bTags = fsl__cx_scratchpad(f); fsl_buffer_reuse(bManifest); rc = fsl_repo_manifest_write(f, mf.rid, bManifest, bHash, bTags); if(rc) goto mf_end; rc = fsl_zip_file_add(&zs.z, "manifest", bManifest, FSL_FILE_PERM_REGULAR); |
︙ | ︙ | |||
43225 43226 43227 43228 43229 43230 43231 | fsl_deck_clean(&mf); return rc; } #undef MARKER | | | > | | < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < > | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | > > > | 40478 40479 40480 40481 40482 40483 40484 40485 40486 40487 40488 40489 40490 40491 40492 40493 40494 40495 40496 40497 40498 40499 40500 40501 40502 40503 40504 40505 40506 40507 40508 40509 | fsl_deck_clean(&mf); return rc; } #undef MARKER /* end of file zip.c */ /* start of file schema_config_cstr.c */ /* Binary form of file ../sql/config.sql */ /** @page page_schema_config_cstr Schema: config.sql @code -- This file contains the schema for the database that is kept in the -- ~/.fossil file and that stores information about the users setup. -- CREATE TABLE cfg.global_config( name TEXT PRIMARY KEY, value TEXT ); -- Identifier for this file type. -- The integer is the same as 'FSLG'. PRAGMA cfg.application_id=252006675; @endcode @see schema_config() */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_config_cstr_a[] = { 45, 45, 32, 84, 104, 105, 115, 32, 102, 105, 108, 101, 32, 99, 111, 110, 116, 97, 105, 110, 115, 32, 116, 104, 101, 32, 115, 99, 104, 101, 109, 97, 32, 102, 111, 114, 32, 116, 104, 101, 32, 100, 97, 116, 97, 98, 97, 115, 101, 32, 116, 104, 97, 116, 32, 105, 115, 32, 107, 101, 112, 116, 32, 105, 110, 32, 116, 104, 101, 10, 45, 45, 32, 126, 47, 46, 102, 111, 115, 115, |
︙ | ︙ | |||
43964 43965 43966 43967 43968 43969 43970 | 105, 108, 101, 32, 116, 121, 112, 101, 46, 10, 45, 45, 32, 84, 104, 101, 32, 105, 110, 116, 101, 103, 101, 114, 32, 105, 115, 32, 116, 104, 101, 32, 115, 97, 109, 101, 32, 97, 115, 32, 39, 70, 83, 76, 71, 39, 46, 10, 80, 82, 65, 71, 77, 65, 32, 99, 102, 103, 46, 97, 112, 112, 108, 105, 99, 97, 116, 105, 111, 110, 95, 105, 100, 61, 50, 53, 50, 48, 48, 54, 54, 55, 53, 59, 10, 0}; char const * fsl_schema_config_cstr = fsl_schema_config_cstr_a; | | | | > | > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 40518 40519 40520 40521 40522 40523 40524 40525 40526 40527 40528 40529 40530 40531 40532 40533 40534 40535 40536 40537 40538 40539 40540 40541 40542 40543 40544 40545 40546 40547 40548 40549 40550 40551 40552 40553 40554 40555 40556 40557 40558 40559 40560 40561 40562 40563 40564 40565 40566 40567 40568 40569 40570 40571 40572 40573 40574 40575 40576 40577 40578 40579 40580 40581 40582 40583 40584 40585 40586 40587 40588 40589 40590 40591 40592 40593 40594 40595 40596 40597 40598 40599 40600 40601 40602 40603 40604 40605 40606 40607 40608 40609 40610 40611 40612 40613 40614 40615 40616 40617 40618 40619 40620 40621 40622 40623 40624 40625 40626 40627 40628 40629 40630 40631 40632 40633 40634 40635 40636 40637 40638 40639 40640 40641 40642 40643 40644 40645 40646 40647 40648 40649 40650 40651 40652 40653 40654 40655 40656 40657 40658 40659 40660 40661 40662 40663 40664 40665 40666 40667 40668 40669 40670 40671 40672 | 105, 108, 101, 32, 116, 121, 112, 101, 46, 10, 45, 45, 32, 84, 104, 101, 32, 105, 110, 116, 101, 103, 101, 114, 32, 105, 115, 32, 116, 104, 101, 32, 115, 97, 109, 101, 32, 97, 115, 32, 39, 70, 83, 76, 71, 39, 46, 10, 80, 82, 65, 71, 77, 65, 32, 99, 102, 103, 46, 97, 112, 112, 108, 105, 99, 97, 116, 105, 111, 110, 95, 105, 100, 61, 50, 53, 50, 48, 48, 54, 54, 55, 53, 59, 10, 0}; char const * fsl_schema_config_cstr = fsl_schema_config_cstr_a; /* end of ../sql/config.sql */ /* end of file schema_config_cstr.c */ /* start of file schema_repo1_cstr.c */ /* Binary form of file ../sql/repo-static.sql */ /** @page page_schema_repo1_cstr Schema: repo-static.sql @code -- This file contains parts of the schema that are fixed and -- unchanging across Fossil versions. -- The BLOB and DELTA tables contain all records held in the repository. -- -- The BLOB.CONTENT column is always compressed using zlib. This -- column might hold the full text of the record or it might hold -- a delta that is able to reconstruct the record from some other -- record. If BLOB.CONTENT holds a delta, then a DELTA table entry -- will exist for the record and that entry will point to another -- entry that holds the source of the delta. Deltas can be chained. -- -- The blob and delta tables collectively hold the "global state" of -- a Fossil repository. -- CREATE TABLE repo.blob( rid INTEGER PRIMARY KEY, -- Record ID rcvid INTEGER, -- Origin of this record size INTEGER, -- Size of content. -1 for a phantom. uuid TEXT UNIQUE NOT NULL, -- SHA1 hash of the content content BLOB, -- Compressed content of this record CHECK( length(uuid)>=40 AND rid>0 ) ); CREATE TABLE repo.delta( rid INTEGER PRIMARY KEY, -- Record ID srcid INTEGER NOT NULL REFERENCES blob -- Record holding source document ); CREATE INDEX repo.delta_i1 ON delta(srcid); ------------------------------------------------------------------------- -- The BLOB and DELTA tables above hold the "global state" of a Fossil -- project; the stuff that is normally exchanged during "sync". The -- "local state" of a repository is contained in the remaining tables of -- the zRepositorySchema1 string. ------------------------------------------------------------------------- -- Whenever new blobs are received into the repository, an entry -- in this table records the source of the blob. -- CREATE TABLE repo.rcvfrom( rcvid INTEGER PRIMARY KEY, -- Received-From ID uid INTEGER REFERENCES user, -- User login mtime DATETIME, -- Time of receipt. Julian day. nonce TEXT UNIQUE, -- Nonce used for login ipaddr TEXT -- Remote IP address. NULL for direct. ); INSERT INTO repo.rcvfrom(rcvid,uid,mtime,nonce,ipaddr) VALUES (1, 1, julianday('now'), NULL, NULL); -- Information about users -- -- The user.pw field can be either cleartext of the password, or -- a SHA1 hash of the password. If the user.pw field is exactly 40 -- characters long we assume it is a SHA1 hash. Otherwise, it is -- cleartext. The sha1_shared_secret() routine computes the password -- hash based on the project-code, the user login, and the cleartext -- password. -- CREATE TABLE repo.user( uid INTEGER PRIMARY KEY, -- User ID login TEXT UNIQUE, -- login name of the user pw TEXT, -- password cap TEXT, -- Capabilities of this user cookie TEXT, -- WWW login cookie ipaddr TEXT, -- IP address for which cookie is valid cexpire DATETIME, -- Time when cookie expires info TEXT, -- contact information mtime DATE, -- last change. seconds since 1970 photo BLOB -- JPEG image of this user ); -- The VAR table holds miscellanous information about the repository. -- in the form of name-value pairs. -- CREATE TABLE repo.config( name TEXT PRIMARY KEY NOT NULL, -- Primary name of the entry value CLOB, -- Content of the named parameter mtime DATE, -- last modified. seconds since 1970 CHECK( typeof(name)='text' AND length(name)>=1 ) ); -- Artifacts that should not be processed are identified in the -- "shun" table. Artifacts that are control-file forgeries or -- spam or artifacts whose contents violate administrative policy -- can be shunned in order to prevent them from contaminating -- the repository. -- -- Shunned artifacts do not exist in the blob table. Hence they -- have not artifact ID (rid) and we thus must store their full -- UUID. -- CREATE TABLE repo.shun( uuid UNIQUE, -- UUID of artifact to be shunned. Canonical form mtime DATE, -- When added. seconds since 1970 scom TEXT -- Optional text explaining why the shun occurred ); -- Artifacts that should not be pushed are stored in the "private" -- table. Private artifacts are omitted from the "unclustered" and -- "unsent" tables. -- CREATE TABLE repo.private(rid INTEGER PRIMARY KEY); -- An entry in this table describes a database query that generates a -- table of tickets. -- CREATE TABLE repo.reportfmt( rn INTEGER PRIMARY KEY, -- Report number owner TEXT, -- Owner of this report format (not used) title TEXT UNIQUE, -- Title of this report mtime DATE, -- Last modified. seconds since 1970 cols TEXT, -- A color-key specification sqlcode TEXT -- An SQL SELECT statement for this report ); -- Some ticket content (such as the originators email address or contact -- information) needs to be obscured to protect privacy. This is achieved -- by storing an SHA1 hash of the content. For display, the hash is -- mapped back into the original text using this table. -- -- This table contains sensitive information and should not be shared -- with unauthorized users. -- CREATE TABLE repo.concealed( hash TEXT PRIMARY KEY, -- The SHA1 hash of content mtime DATE, -- Time created. Seconds since 1970 content TEXT -- Content intended to be concealed ); -- The application ID helps the unix "file" command to identify the -- database as a fossil repository. PRAGMA repo.application_id=252006673; @endcode @see schema_repo1() */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_repo1_cstr_a[] = { 45, 45, 32, 84, 104, 105, 115, 32, 102, 105, 108, 101, 32, 99, 111, 110, 116, 97, 105, 110, 115, 32, 112, 97, 114, 116, 115, 32, 111, 102, 32, 116, 104, 101, 32, 115, 99, 104, 101, 109, 97, 32, 116, 104, 97, 116, 32, 97, 114, 101, 32, 102, 105, 120, 101, 100, 32, 97, 110, 100, 10, 45, 45, 32, 117, 110, 99, 104, 97, 110, 103, 105, 110, 103, 32, 97, 99, 114, 111, 115, |
︙ | ︙ | |||
44261 44262 44263 44264 44265 44266 44267 | 32, 99, 111, 109, 109, 97, 110, 100, 32, 116, 111, 32, 105, 100, 101, 110, 116, 105, 102, 121, 32, 116, 104, 101, 10, 45, 45, 32, 100, 97, 116, 97, 98, 97, 115, 101, 32, 97, 115, 32, 97, 32, 102, 111, 115, 115, 105, 108, 32, 114, 101, 112, 111, 115, 105, 116, 111, 114, 121, 46, 10, 80, 82, 65, 71, 77, 65, 32, 114, 101, 112, 111, 46, 97, 112, 112, 108, 105, 99, 97, 116, 105, 111, 110, 95, 105, 100, 61, 50, 53, 50, 48, 48, 54, 54, 55, 51, 59, 10, 0}; char const * fsl_schema_repo1_cstr = fsl_schema_repo1_cstr_a; | | | | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > > > > > > | 40949 40950 40951 40952 40953 40954 40955 40956 40957 40958 40959 40960 40961 40962 40963 40964 40965 40966 40967 40968 40969 40970 40971 40972 40973 40974 40975 40976 40977 40978 40979 40980 40981 40982 40983 40984 40985 40986 40987 40988 40989 40990 40991 40992 40993 40994 40995 40996 40997 40998 40999 41000 41001 41002 41003 41004 41005 41006 41007 41008 41009 41010 41011 41012 41013 41014 41015 41016 41017 41018 41019 41020 41021 41022 41023 41024 41025 41026 41027 41028 41029 41030 41031 41032 41033 41034 41035 41036 41037 41038 41039 41040 41041 41042 41043 41044 41045 41046 41047 41048 41049 41050 41051 41052 41053 41054 41055 41056 41057 41058 41059 41060 41061 41062 41063 41064 41065 41066 41067 41068 41069 41070 41071 41072 41073 41074 41075 41076 41077 41078 41079 41080 41081 41082 41083 41084 41085 41086 41087 41088 41089 41090 41091 41092 41093 41094 41095 41096 41097 41098 41099 41100 41101 41102 41103 41104 41105 41106 41107 41108 41109 41110 41111 41112 41113 41114 41115 41116 41117 41118 41119 41120 41121 41122 41123 41124 41125 41126 41127 41128 41129 41130 41131 41132 41133 41134 41135 41136 41137 41138 41139 41140 41141 41142 41143 41144 41145 41146 41147 41148 41149 41150 41151 41152 41153 41154 41155 41156 41157 41158 41159 41160 41161 41162 41163 41164 41165 41166 41167 41168 41169 41170 41171 41172 41173 41174 41175 41176 41177 41178 41179 41180 41181 41182 41183 41184 | 32, 99, 111, 109, 109, 97, 110, 100, 32, 116, 111, 32, 105, 100, 101, 110, 116, 105, 102, 121, 32, 116, 104, 101, 10, 45, 45, 32, 100, 97, 116, 97, 98, 97, 115, 101, 32, 97, 115, 32, 97, 32, 102, 111, 115, 115, 105, 108, 32, 114, 101, 112, 111, 115, 105, 116, 111, 114, 121, 46, 10, 80, 82, 65, 71, 77, 65, 32, 114, 101, 112, 111, 46, 97, 112, 112, 108, 105, 99, 97, 116, 105, 111, 110, 95, 105, 100, 61, 50, 53, 50, 48, 48, 54, 54, 55, 51, 59, 10, 0}; char const * fsl_schema_repo1_cstr = fsl_schema_repo1_cstr_a; /* end of ../sql/repo-static.sql */ /* end of file schema_repo1_cstr.c */ /* start of file schema_repo2_cstr.c */ /* Binary form of file ../sql/repo-transient.sql */ /** @page page_schema_repo2_cstr Schema: repo-transient.sql @code -- This file contains parts of the schema that can change from one -- version to the next. The data stored in these tables is -- reconstructed from the information in the main repo schema by the -- "rebuild" operation. -- Filenames -- CREATE TABLE repo.filename( fnid INTEGER PRIMARY KEY, -- Filename ID name TEXT UNIQUE -- Name of file page ); -- Linkages between check-ins, files created by each check-in, and -- the names of those files. -- -- Each entry represents a file that changed content from pid to fid -- due to the check-in that goes from pmid to mid. fnid is the name -- of the file in the mid check-in. If the file was renamed as part -- of the mid check-in, then pfnid is the previous filename. -- -- There can be multiple entries for (mid,fid) if the mid check-in was -- a merge. Entries with isaux==0 are from the primary parent. Merge -- parents have isaux set to true. -- -- Field name mnemonics: -- mid = Manifest ID. (Each check-in is stored as a "Manifest") -- fid = File ID. -- pmid = Parent Manifest ID. -- pid = Parent file ID. -- fnid = File Name ID. -- pfnid = Parent File Name ID. -- isaux = pmid IS AUXiliary parent, not primary parent -- -- pid==0 if the file is added by check-in mid. -- pid==(-1) if the file exists in a merge parents but not in the primary -- parent. In other words, if the file file was added by merge. -- (TODO: confirm if/where this is used in fossil and then make sure -- libfossil does so, too.) -- fid==0 if the file is removed by check-in mid. -- CREATE TABLE repo.mlink( mid INTEGER, -- Check-in that contains fid fid INTEGER, -- New file content RID. 0 if deleted pmid INTEGER, -- Check-in RID that contains pid pid INTEGER, -- Prev file content RID. 0 if new. -1 if from a merge fnid INTEGER REFERENCES filename, -- Name of the file pfnid INTEGER, -- Previous name. 0 if unchanged mperm INTEGER, -- File permissions. 1==exec isaux BOOLEAN DEFAULT 0 -- TRUE if pmid is the primary ); CREATE INDEX repo.mlink_i1 ON mlink(mid); CREATE INDEX repo.mlink_i2 ON mlink(fnid); CREATE INDEX repo.mlink_i3 ON mlink(fid); CREATE INDEX repo.mlink_i4 ON mlink(pid); -- Parent/child linkages between checkins -- CREATE TABLE repo.plink( pid INTEGER REFERENCES blob, -- Parent manifest cid INTEGER REFERENCES blob, -- Child manifest isprim BOOLEAN, -- pid is the primary parent of cid mtime DATETIME, -- the date/time stamp on cid. Julian day. baseid INTEGER REFERENCES blob, -- Baseline if cid is a delta manifest. UNIQUE(pid, cid) ); CREATE INDEX repo.plink_i2 ON plink(cid,pid); -- A "leaf" checkin is a checkin that has no children in the same -- branch. The set of all leaves is easily computed with a join, -- between the plink and tagxref tables, but it is a slower join for -- very large repositories (repositories with 100,000 or more checkins) -- and so it makes sense to precompute the set of leaves. There is -- one entry in the following table for each leaf. -- CREATE TABLE repo.leaf(rid INTEGER PRIMARY KEY); -- Events used to generate a timeline -- CREATE TABLE repo.event( type TEXT, -- Type of event: 'ci', 'w', 'e', 't', 'g' mtime DATETIME, -- Time of occurrence. Julian day. objid INTEGER PRIMARY KEY, -- Associated record ID tagid INTEGER, -- Associated ticket or wiki name tag uid INTEGER REFERENCES user, -- User who caused the event bgcolor TEXT, -- Color set by 'bgcolor' property euser TEXT, -- User set by 'user' property user TEXT, -- Name of the user ecomment TEXT, -- Comment set by 'comment' property comment TEXT, -- Comment describing the event brief TEXT, -- Short comment when tagid already seen omtime DATETIME -- Original unchanged date+time, or NULL ); CREATE INDEX repo.event_i1 ON event(mtime); -- A record of phantoms. A phantom is a record for which we know the -- UUID but we do not (yet) know the file content. -- CREATE TABLE repo.phantom( rid INTEGER PRIMARY KEY -- Record ID of the phantom ); -- A record of orphaned delta-manifests. An orphan is a delta-manifest -- for which we have content, but its baseline-manifest is a phantom. -- We have to track all orphan manifests so that when the baseline arrives, -- we know to process the orphaned deltas. CREATE TABLE repo.orphan( rid INTEGER PRIMARY KEY, -- Delta manifest with a phantom baseline baseline INTEGER -- Phantom baseline of this orphan ); CREATE INDEX repo.orphan_baseline ON orphan(baseline); -- Unclustered records. An unclustered record is a record (including -- a cluster records themselves) that is not mentioned by some other -- cluster. -- -- Phantoms are usually included in the unclustered table. A new cluster -- will never be created that contains a phantom. But another repository -- might send us a cluster that contains entries that are phantoms to -- us. -- CREATE TABLE repo.unclustered( rid INTEGER PRIMARY KEY -- Record ID of the unclustered file ); -- Records which have never been pushed to another server. This is -- used to reduce push operations to a single HTTP request in the -- common case when one repository only talks to a single server. -- CREATE TABLE repo.unsent( rid INTEGER PRIMARY KEY -- Record ID of the phantom ); -- Each baseline or manifest can have one or more tags. A tag -- is defined by a row in the next table. -- -- Wiki pages are tagged with "wiki-NAME" where NAME is the name of -- the wiki page. Tickets changes are tagged with "ticket-UUID" where -- UUID is the indentifier of the ticket. Tags used to assign symbolic -- names to baselines are branches are of the form "sym-NAME" where -- NAME is the symbolic name. -- CREATE TABLE repo.tag( tagid INTEGER PRIMARY KEY, -- Numeric tag ID tagname TEXT UNIQUE -- Tag name. ); INSERT INTO repo.tag VALUES(1, 'bgcolor'); -- FSL_TAGID_BGCOLOR INSERT INTO repo.tag VALUES(2, 'comment'); -- FSL_TAGID_COMMENT INSERT INTO repo.tag VALUES(3, 'user'); -- FSL_TAGID_USER INSERT INTO repo.tag VALUES(4, 'date'); -- FSL_TAGID_DATE INSERT INTO repo.tag VALUES(5, 'hidden'); -- FSL_TAGID_HIDDEN INSERT INTO repo.tag VALUES(6, 'private'); -- FSL_TAGID_PRIVATE INSERT INTO repo.tag VALUES(7, 'cluster'); -- FSL_TAGID_CLUSTER INSERT INTO repo.tag VALUES(8, 'branch'); -- FSL_TAGID_BRANCH INSERT INTO repo.tag VALUES(9, 'closed'); -- FSL_TAGID_CLOSED INSERT INTO repo.tag VALUES(10,'parent'); -- FSL_TAGID_PARENT INSERT INTO repo.tag VALUES(11,'note'); -- FSL_TAG_NOTE -- arguable, to force auto-increment to start at 100: -- INSERT INTO tag VALUES(99,'FSL_TAGID_MAX_INTERNAL'); -- Assignments of tags to baselines. Note that we allow tags to -- have values assigned to them. So we are not really dealing with -- tags here. These are really properties. But we are going to -- keep calling them tags because in many cases the value is ignored. -- CREATE TABLE repo.tagxref( tagid INTEGER REFERENCES tag, -- The tag that was added or removed tagtype INTEGER, -- 0:-,cancel 1:+,single 2:*,propagate srcid INTEGER REFERENCES blob, -- Artifact of tag. 0 for propagated tags origid INTEGER REFERENCES blob, -- check-in holding propagated tag value TEXT, -- Value of the tag. Might be NULL. mtime TIMESTAMP, -- Time of addition or removal. Julian day rid INTEGER REFERENCE blob, -- Artifact tag is applied to UNIQUE(rid, tagid) ); CREATE INDEX repo.tagxref_i1 ON tagxref(tagid, mtime); -- When a hyperlink occurs from one artifact to another (for example -- when a check-in comment refers to a ticket) an entry is made in -- the following table for that hyperlink. This table is used to -- facilitate the display of "back links". -- CREATE TABLE repo.backlink( target TEXT, -- Where the hyperlink points to srctype INT, -- 0: check-in 1: ticket 2: wiki srcid INT, -- rid for checkin or wiki. tkt_id for ticket. mtime TIMESTAMP, -- time that the hyperlink was added. Julian day. UNIQUE(target, srctype, srcid) ); CREATE INDEX repo.backlink_src ON backlink(srcid, srctype); -- Each attachment is an entry in the following table. Only -- the most recent attachment (identified by the D card) is saved. -- CREATE TABLE repo.attachment( attachid INTEGER PRIMARY KEY, -- Local id for this attachment isLatest BOOLEAN DEFAULT 0, -- True if this is the one to use mtime TIMESTAMP, -- Last changed. Julian day. src TEXT, -- UUID of the attachment. NULL to delete target TEXT, -- Object attached to. Wikiname or Tkt UUID filename TEXT, -- Filename for the attachment comment TEXT, -- Comment associated with this attachment user TEXT -- Name of user adding attachment ); CREATE INDEX repo.attachment_idx1 ON attachment(target, filename, mtime); CREATE INDEX repo.attachment_idx2 ON attachment(src); -- For tracking cherrypick merges CREATE TABLE repo.cherrypick( parentid INT, childid INT, isExclude BOOLEAN DEFAULT false, PRIMARY KEY(parentid, childid) ) WITHOUT ROWID; CREATE INDEX repo.cherrypick_cid ON cherrypick(childid); @endcode @see schema_repo2() */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_repo2_cstr_a[] = { 45, 45, 32, 84, 104, 105, 115, 32, 102, 105, 108, 101, 32, 99, 111, 110, 116, 97, 105, 110, 115, 32, 112, 97, 114, 116, 115, 32, 111, 102, 32, 116, 104, 101, 32, 115, 99, 104, 101, 109, 97, 32, 116, 104, 97, 116, 32, 99, 97, 110, 32, 99, 104, 97, 110, 103, 101, 32, 102, 114, 111, 109, 32, 111, 110, 101, 10, 45, 45, 32, 118, 101, 114, 115, 105, 111, 110, 32, 116, 111, |
︙ | ︙ | |||
44757 44758 44759 44760 44761 44762 44763 | 105, 108, 100, 105, 100, 41, 10, 41, 32, 87, 73, 84, 72, 79, 85, 84, 32, 82, 79, 87, 73, 68, 59, 10, 67, 82, 69, 65, 84, 69, 32, 73, 78, 68, 69, 88, 32, 114, 101, 112, 111, 46, 99, 104, 101, 114, 114, 121, 112, 105, 99, 107, 95, 99, 105, 100, 32, 79, 78, 32, 99, 104, 101, 114, 114, 121, 112, 105, 99, 107, 40, 99, 104, 105, 108, 100, 105, 100, 41, 59, 10, 0}; char const * fsl_schema_repo2_cstr = fsl_schema_repo2_cstr_a; | | | | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 41660 41661 41662 41663 41664 41665 41666 41667 41668 41669 41670 41671 41672 41673 41674 41675 41676 41677 41678 41679 41680 41681 41682 41683 41684 41685 41686 41687 41688 41689 41690 41691 41692 41693 41694 41695 41696 41697 41698 41699 41700 41701 41702 41703 41704 41705 41706 41707 41708 41709 41710 41711 41712 41713 41714 41715 41716 41717 41718 41719 41720 41721 41722 41723 41724 41725 41726 41727 41728 41729 41730 41731 41732 41733 41734 41735 41736 41737 41738 41739 41740 41741 41742 41743 41744 41745 41746 41747 41748 41749 41750 41751 41752 41753 41754 41755 41756 41757 | 105, 108, 100, 105, 100, 41, 10, 41, 32, 87, 73, 84, 72, 79, 85, 84, 32, 82, 79, 87, 73, 68, 59, 10, 67, 82, 69, 65, 84, 69, 32, 73, 78, 68, 69, 88, 32, 114, 101, 112, 111, 46, 99, 104, 101, 114, 114, 121, 112, 105, 99, 107, 95, 99, 105, 100, 32, 79, 78, 32, 99, 104, 101, 114, 114, 121, 112, 105, 99, 107, 40, 99, 104, 105, 108, 100, 105, 100, 41, 59, 10, 0}; char const * fsl_schema_repo2_cstr = fsl_schema_repo2_cstr_a; /* end of ../sql/repo-transient.sql */ /* end of file schema_repo2_cstr.c */ /* start of file schema_ckout_cstr.c */ /* Binary form of file ../sql/checkout.sql */ /** @page page_schema_ckout_cstr Schema: checkout.sql @code -- The VVAR table holds miscellanous information about the local database -- in the form of name-value pairs. This is similar to the VAR table -- table in the repository except that this table holds information that -- is specific to the local checkout. -- -- Important Variables: -- -- repository Full pathname of the repository database -- user-id Userid to use -- CREATE TABLE ckout.vvar( name TEXT PRIMARY KEY NOT NULL, -- Primary name of the entry value CLOB, -- Content of the named parameter CHECK( typeof(name)='text' AND length(name)>=1 ) ); -- Each entry in the vfile table represents a single file in the -- current checkout. -- -- The file.rid field is 0 for files or folders that have been -- added but not yet committed. -- -- Vfile.chnged is 0 for unmodified files, 1 for files that have -- been edited or which have been subjected to a 3-way merge. -- Vfile.chnged is 2 if the file has been replaced from a different -- version by the merge and 3 if the file has been added by a merge. -- Vfile.chnged is 4|5 is the same as 2|3, but the operation has been -- done by an --integrate merge. The difference between vfile.chnged==2|4 -- and a regular add is that with vfile.chnged==2|4 we know that the -- current version of the file is already in the repository. -- CREATE TABLE ckout.vfile( id INTEGER PRIMARY KEY, -- ID of the checked out file vid INTEGER REFERENCES blob, -- The baseline this file is part of. chnged INT DEFAULT 0, -- 0:unchnged 1:edited 2:m-chng 3:m-add 4:i-chng 5:i-add deleted BOOLEAN DEFAULT 0, -- True if deleted isexe BOOLEAN, -- True if file should be executable islink BOOLEAN, -- True if file should be symlink rid INTEGER, -- Originally from this repository record mrid INTEGER, -- Based on this record due to a merge mtime INTEGER, -- Mtime of file on disk. sec since 1970 pathname TEXT, -- Full pathname relative to root origname TEXT, -- Original pathname. NULL if unchanged mhash TEXT, -- Hash of mrid iff mrid!=rid. Added 2019-01-19. UNIQUE(pathname,vid) ); -- This table holds a record of uncommitted merges in the local -- file tree. If a VFILE entry with id has merged with another -- record, there is an entry in this table with (id,merge) where -- merge is the RECORD table entry that the file merged against. -- An id of 0 or <-3 here means the version record itself. When -- id==(-1) that is a cherrypick merge, id==(-2) that is a -- backout merge and id==(-4) is a integrate merge. CREATE TABLE ckout.vmerge( id INTEGER REFERENCES vfile, -- VFILE entry that has been merged merge INTEGER, -- Merged with this record mhash TEXT -- SHA1/SHA3 hash for merge object ); CREATE UNIQUE INDEX ckout.vmergex1 ON vmerge(id,mhash); -- The following trigger will prevent older versions of Fossil that -- do not know about the new vmerge.mhash column from updating the -- vmerge table. This must be done with a trigger, since legacy Fossil -- uses INSERT OR IGNORE to update vmerge, and the OR IGNORE will cause -- a NOT NULL constraint to be silently ignored. CREATE TRIGGER ckout.vmerge_ck1 AFTER INSERT ON vmerge WHEN new.mhash IS NULL BEGIN SELECT raise(FAIL, 'trying to update a newer checkout with an older version of Fossil'); END; -- Identifier for this file type. -- The integer is the same as 'FSLC'. PRAGMA ckout.application_id=252006674; @endcode @see schema_ckout() */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_ckout_cstr_a[] = { 45, 45, 32, 84, 104, 101, 32, 86, 86, 65, 82, 32, 116, 97, 98, 108, 101, 32, 104, 111, 108, 100, 115, 32, 109, 105, 115, 99, 101, 108, 108, 97, 110, 111, 117, 115, 32, 105, 110, 102, 111, 114, 109, 97, 116, 105, 111, 110, 32, 97, 98, 111, 117, 116, 32, 116, 104, 101, 32, 108, 111, 99, 97, 108, 32, 100, 97, 116, 97, 98, 97, 115, 101, 10, 45, 45, 32, 105, 110, 32, |
︙ | ︙ | |||
44951 44952 44953 44954 44955 44956 44957 | 115, 32, 102, 105, 108, 101, 32, 116, 121, 112, 101, 46, 10, 45, 45, 32, 84, 104, 101, 32, 105, 110, 116, 101, 103, 101, 114, 32, 105, 115, 32, 116, 104, 101, 32, 115, 97, 109, 101, 32, 97, 115, 32, 39, 70, 83, 76, 67, 39, 46, 10, 80, 82, 65, 71, 77, 65, 32, 99, 107, 111, 117, 116, 46, 97, 112, 112, 108, 105, 99, 97, 116, 105, 111, 110, 95, 105, 100, 61, 50, 53, 50, 48, 48, 54, 54, 55, 52, 59, 10, 0}; char const * fsl_schema_ckout_cstr = fsl_schema_ckout_cstr_a; | | | | > | | > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 41931 41932 41933 41934 41935 41936 41937 41938 41939 41940 41941 41942 41943 41944 41945 41946 41947 41948 41949 41950 41951 41952 41953 41954 41955 41956 41957 41958 41959 41960 41961 41962 41963 41964 41965 41966 41967 41968 41969 41970 41971 41972 41973 41974 41975 41976 41977 41978 41979 41980 41981 41982 41983 | 115, 32, 102, 105, 108, 101, 32, 116, 121, 112, 101, 46, 10, 45, 45, 32, 84, 104, 101, 32, 105, 110, 116, 101, 103, 101, 114, 32, 105, 115, 32, 116, 104, 101, 32, 115, 97, 109, 101, 32, 97, 115, 32, 39, 70, 83, 76, 67, 39, 46, 10, 80, 82, 65, 71, 77, 65, 32, 99, 107, 111, 117, 116, 46, 97, 112, 112, 108, 105, 99, 97, 116, 105, 111, 110, 95, 105, 100, 61, 50, 53, 50, 48, 48, 54, 54, 55, 52, 59, 10, 0}; char const * fsl_schema_ckout_cstr = fsl_schema_ckout_cstr_a; /* end of ../sql/checkout.sql */ /* end of file schema_ckout_cstr.c */ /* start of file schema_ticket_cstr.c */ /* Binary form of file ../sql/ticket.sql */ /** @page page_schema_ticket_cstr Schema: ticket.sql @code -- Template for the TICKET table CREATE TABLE repo.ticket( -- Do not change any column that begins with tkt_ tkt_id INTEGER PRIMARY KEY, tkt_uuid TEXT UNIQUE, tkt_mtime DATE, tkt_ctime DATE, -- Add as many field as required below this line type TEXT, status TEXT, subsystem TEXT, priority TEXT, severity TEXT, foundin TEXT, private_contact TEXT, resolution TEXT, title TEXT, comment TEXT ); CREATE TABLE repo.ticketchng( -- Do not change any column that begins with tkt_ tkt_id INTEGER REFERENCES ticket, tkt_rid INTEGER REFERENCES blob, tkt_mtime DATE, -- Add as many fields as required below this line login TEXT, username TEXT, mimetype TEXT, icomment TEXT ); CREATE INDEX repo.ticketchng_idx1 ON ticketchng(tkt_id, tkt_mtime); @endcode @see schema_ticket() */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_ticket_cstr_a[] = { 45, 45, 32, 84, 101, 109, 112, 108, 97, 116, 101, 32, 102, 111, 114, 32, 116, 104, 101, 32, 84, 73, 67, 75, 69, 84, 32, 116, 97, 98, 108, 101, 10, 67, 82, 69, 65, 84, 69, 32, 84, 65, 66, 76, 69, 32, 114, 101, 112, 111, 46, 116, 105, 99, 107, 101, 116, 40, 10, 32, 32, 45, 45, 32, 68, 111, 32, 110, 111, 116, 32, 99, 104, 97, 110, 103, 101, 32, 97, 110, |
︙ | ︙ | |||
45003 45004 45005 45006 45007 45008 45009 | 109, 101, 110, 116, 32, 84, 69, 88, 84, 10, 41, 59, 10, 67, 82, 69, 65, 84, 69, 32, 73, 78, 68, 69, 88, 32, 114, 101, 112, 111, 46, 116, 105, 99, 107, 101, 116, 99, 104, 110, 103, 95, 105, 100, 120, 49, 32, 79, 78, 32, 116, 105, 99, 107, 101, 116, 99, 104, 110, 103, 40, 116, 107, 116, 95, 105, 100, 44, 32, 116, 107, 116, 95, 109, 116, 105, 109, 101, 41, 59, 10, 0}; char const * fsl_schema_ticket_cstr = fsl_schema_ticket_cstr_a; | | | | > | | > > > > > > > > > > > > > > > > > > > > | | > | 42015 42016 42017 42018 42019 42020 42021 42022 42023 42024 42025 42026 42027 42028 42029 42030 42031 42032 42033 42034 42035 42036 42037 42038 42039 42040 42041 42042 42043 42044 42045 42046 42047 42048 42049 42050 42051 42052 42053 42054 42055 42056 42057 | 109, 101, 110, 116, 32, 84, 69, 88, 84, 10, 41, 59, 10, 67, 82, 69, 65, 84, 69, 32, 73, 78, 68, 69, 88, 32, 114, 101, 112, 111, 46, 116, 105, 99, 107, 101, 116, 99, 104, 110, 103, 95, 105, 100, 120, 49, 32, 79, 78, 32, 116, 105, 99, 107, 101, 116, 99, 104, 110, 103, 40, 116, 107, 116, 95, 105, 100, 44, 32, 116, 107, 116, 95, 109, 116, 105, 109, 101, 41, 59, 10, 0}; char const * fsl_schema_ticket_cstr = fsl_schema_ticket_cstr_a; /* end of ../sql/ticket.sql */ /* end of file schema_ticket_cstr.c */ /* start of file schema_ticket_reports_cstr.c */ /* Binary form of file ../sql/ticket-reports.sql */ /** @page page_schema_ticket_reports_cstr Schema: ticket-reports.sql @code INSERT INTO reportfmt(title,mtime,cols,sqlcode) VALUES('All Tickets',julianday('1970-01-01'),'#ffffff Key: #f2dcdc Active #e8e8e8 Review #cfe8bd Fixed #bde5d6 Tested #cacae5 Deferred #c8c8c8 Closed','SELECT CASE WHEN status IN (''Open'',''Verified'') THEN ''#f2dcdc'' WHEN status=''Review'' THEN ''#e8e8e8'' WHEN status=''Fixed'' THEN ''#cfe8bd'' WHEN status=''Tested'' THEN ''#bde5d6'' WHEN status=''Deferred'' THEN ''#cacae5'' ELSE ''#c8c8c8'' END AS ''bgcolor'', substr(tkt_uuid,1,10) AS ''#'', datetime(tkt_mtime) AS ''mtime'', type, status, subsystem, title FROM ticket'); @endcode @see schema_ticket_reports() */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_ticket_reports_cstr_a[] = { 73, 78, 83, 69, 82, 84, 32, 73, 78, 84, 79, 32, 114, 101, 112, 111, 114, 116, 102, 109, 116, 40, 116, 105, 116, 108, 101, 44, 109, 116, 105, 109, 101, 44, 99, 111, 108, 115, 44, 115, 113, 108, 99, 111, 100, 101, 41, 32, 10, 86, 65, 76, 85, 69, 83, 40, 39, 65, 108, 108, 32, 84, 105, 99, 107, 101, 116, 115, 39, 44, 106, 117, 108, 105, 97, 110, 100, 97, 121, 40, |
︙ | ︙ | |||
45047 45048 45049 45050 45051 45052 45053 | 100, 97, 116, 101, 116, 105, 109, 101, 40, 116, 107, 116, 95, 109, 116, 105, 109, 101, 41, 32, 65, 83, 32, 39, 39, 109, 116, 105, 109, 101, 39, 39, 44, 10, 32, 32, 116, 121, 112, 101, 44, 10, 32, 32, 115, 116, 97, 116, 117, 115, 44, 10, 32, 32, 115, 117, 98, 115, 121, 115, 116, 101, 109, 44, 10, 32, 32, 116, 105, 116, 108, 101, 10, 70, 82, 79, 77, 32, 116, 105, 99, 107, 101, 116, 39, 41, 59, 10, 0}; char const * fsl_schema_ticket_reports_cstr = fsl_schema_ticket_reports_cstr_a; | | | | > | | | | > > > > > > > > | 42081 42082 42083 42084 42085 42086 42087 42088 42089 42090 42091 42092 42093 42094 42095 42096 42097 42098 42099 42100 42101 42102 42103 42104 42105 42106 42107 42108 42109 42110 | 100, 97, 116, 101, 116, 105, 109, 101, 40, 116, 107, 116, 95, 109, 116, 105, 109, 101, 41, 32, 65, 83, 32, 39, 39, 109, 116, 105, 109, 101, 39, 39, 44, 10, 32, 32, 116, 121, 112, 101, 44, 10, 32, 32, 115, 116, 97, 116, 117, 115, 44, 10, 32, 32, 115, 117, 98, 115, 121, 115, 116, 101, 109, 44, 10, 32, 32, 116, 105, 116, 108, 101, 10, 70, 82, 79, 77, 32, 116, 105, 99, 107, 101, 116, 39, 41, 59, 10, 0}; char const * fsl_schema_ticket_reports_cstr = fsl_schema_ticket_reports_cstr_a; /* end of ../sql/ticket-reports.sql */ /* end of file schema_ticket_reports_cstr.c */ /* start of file schema_forum_cstr.c */ /* Binary form of file ../sql/forum.sql */ /** @page page_schema_forum_cstr Schema: forum.sql @code CREATE TABLE repo.forumpost( fpid INTEGER PRIMARY KEY, -- BLOB.rid for the artifact froot INT, -- fpid of the thread root fprev INT, -- Previous version of this same post firt INT, -- This post is in-reply-to fmtime REAL -- When posted. Julian day ); CREATE INDEX repo.forumthread ON forumpost(froot,fmtime); @endcode @see schema_forum() */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_forum_cstr_a[] = { 67, 82, 69, 65, 84, 69, 32, 84, 65, 66, 76, 69, 32, 114, 101, 112, 111, 46, 102, 111, 114, 117, 109, 112, 111, 115, 116, 40, 10, 32, 32, 102, 112, 105, 100, 32, 73, 78, 84, 69, 71, 69, 82, 32, 80, 82, 73, 77, 65, 82, 89, 32, 75, 69, 89, 44, 32, 32, 45, 45, 32, 66, 76, 79, 66, 46, 114, 105, 100, 32, 102, 111, 114, 32, 116, 104, 101, 32, 97, 114, |
︙ | ︙ | |||
45079 45080 45081 45082 45083 45084 45085 | 104, 101, 110, 32, 112, 111, 115, 116, 101, 100, 46, 32, 32, 74, 117, 108, 105, 97, 110, 32, 100, 97, 121, 10, 41, 59, 10, 67, 82, 69, 65, 84, 69, 32, 73, 78, 68, 69, 88, 32, 114, 101, 112, 111, 46, 102, 111, 114, 117, 109, 116, 104, 114, 101, 97, 100, 32, 79, 78, 32, 102, 111, 114, 117, 109, 112, 111, 115, 116, 40, 102, 114, 111, 111, 116, 44, 102, 109, 116, 105, 109, 101, 41, 59, 10, 0}; char const * fsl_schema_forum_cstr = fsl_schema_forum_cstr_a; | | | | 42122 42123 42124 42125 42126 42127 42128 42129 42130 | 104, 101, 110, 32, 112, 111, 115, 116, 101, 100, 46, 32, 32, 74, 117, 108, 105, 97, 110, 32, 100, 97, 121, 10, 41, 59, 10, 67, 82, 69, 65, 84, 69, 32, 73, 78, 68, 69, 88, 32, 114, 101, 112, 111, 46, 102, 111, 114, 117, 109, 116, 104, 114, 101, 97, 100, 32, 79, 78, 32, 102, 111, 114, 117, 109, 112, 111, 115, 116, 40, 102, 114, 111, 111, 116, 44, 102, 109, 116, 105, 109, 101, 41, 59, 10, 0}; char const * fsl_schema_forum_cstr = fsl_schema_forum_cstr_a; /* end of ../sql/forum.sql */ /* end of file schema_forum_cstr.c */ |
Changes to lib/libfossil.h.
1 2 3 4 5 6 7 | #if !defined(FSL_AMALGAMATION_BUILD) #define FSL_AMALGAMATION_BUILD 1 #endif #if defined(HAVE_CONFIG_H) # include "config.h" #endif #include "libfossil-config.h" | < | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | #if !defined(FSL_AMALGAMATION_BUILD) #define FSL_AMALGAMATION_BUILD 1 #endif #if defined(HAVE_CONFIG_H) # include "config.h" #endif #include "libfossil-config.h" /* start of file ../include/fossil-scm/fossil-config.h */ #if !defined (ORG_FOSSIL_SCM_FSL_CONFIG_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_CONFIG_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ #if defined(_MSC_VER) && !defined(FSL_AMALGAMATION_BUILD) # include "config-win32.h" /* manually generated */ #else #endif #if !defined(_ISOC99_SOURCE) /* glibc apparently guards snprintf() on this #define, even though snprintf() is part of C99 and we're building in C99 mode. */ # define _ISOC99_SOURCE |
︙ | ︙ | |||
246 247 248 249 250 251 252 | otherwise they do not. */ #define FSL_CONFIG_ENABLE_TIMER 1 #endif /* ORG_FOSSIL_SCM_FSL_CONFIG_H_INCLUDED */ | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > | | 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 | otherwise they do not. */ #define FSL_CONFIG_ENABLE_TIMER 1 #endif /* ORG_FOSSIL_SCM_FSL_CONFIG_H_INCLUDED */ /* end of file ../include/fossil-scm/fossil-config.h */ /* start of file ../include/fossil-scm/fossil.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_LIBFOSSIL_H_INCLUDED) #define ORG_FOSSIL_SCM_LIBFOSSIL_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /** @file fossil.h This file is the primary header for the public APIs. It includes various other header files. They are split into multiple headers primarily becuase my lower-end systems choke on syntax-highlighting them and browsing their (large) Doxygen output. */ /* fossil-config.h MUST be included first so we can set some portability flags and config-dependent typedefs! */ #endif /* ORG_FOSSIL_SCM_LIBFOSSIL_H_INCLUDED */ /* end of file ../include/fossil-scm/fossil.h */ /* start of file ../include/fossil-scm/fossil-util.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_UTIL_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_UTIL_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /** @file fossil-util.h This file declares a number of utility classes and routines used by libfossil. All of them considered "public", suitable for direct use by client code. */ #include <stdio.h> /* FILE type */ |
︙ | ︙ | |||
831 832 833 834 835 836 837 | initialize them properly leads to undefined behaviour. - ALWAYS fsl_buffer_clear() buffers when done with them. Remember that failed routines which output to buffers might partially populate the buffer, so be sure to clean up on error cases. | | | < < < | | | < < | | | | | < < < > | > | > > > > > > > > > > > | | < < | < < < | < < < < < < < < < < < < | | | | < < < < < | 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 | initialize them properly leads to undefined behaviour. - ALWAYS fsl_buffer_clear() buffers when done with them. Remember that failed routines which output to buffers might partially populate the buffer, so be sure to clean up on error cases. - The 'capacity' member specifies how much memory the buffer current holds in its 'mem' member. - The 'used' member specifies how much of the memory is actually "in use" by the client. - As a rule, the API tries to keep (used<capacity) and always (unless documented otherwise) tries to keep the memory buffer NUL-terminated (if it has any memory at all). - Use fsl_buffer_reuse() to keep memory around and reset the 'used' amount to 0. Most rountines which write to buffers will re-use that memory if they can. This example demonstrates the difference between 'used' and 'capacity' (error checking reduced to assert()ions for clarity): ``` fsl_buffer b = fsl_buffer_empty; int rc = fsl_buffer_reserve(&b, 20); assert(0==rc); assert(b.capacity>=20); // it may reserve more! assert(0==b.used); rc = fsl_buffer_append(&b, "abc", 3); assert(0==rc); assert(3==b.used); assert(0==b.mem[b.used]); // API always NUL-terminates ``` Potential TODO: add an allocator member which gets internally used for allocation of the buffer member. fossil(1) uses this approach, and swaps the allocator out as needed, to support a buffer pointing to memory it does not own, e.g. a slice of another buffer or to static memory, and then (re)allocate as necessary, e.g. to switch from static memory to dynamic. That may be useful in order to effectively port over some of the memory-intensive algos such as merging. That would not affect [much of] the public API, just how the buffer internally manages the memory. Certain API members would need to specify that the memory is not owned by the blob and needs to outlive the blob, though. We could potentially implement this same thing without a new member by using the convention that a `capacity` value of 0 when `mem` is!=00 means that the pointed-to memory is owned by someone else and must be copied before modification (effectively what fossil's approach does). @see fsl_buffer_reserve() @see fsl_buffer_append() @see fsl_buffer_appendf() @see fsl_buffer_cstr() @see fsl_buffer_size() @see fsl_buffer_capacity() @see fsl_buffer_clear() @see fsl_buffer_reuse() */ struct fsl_buffer { /** The raw memory owned by this buffer. It is this->capacity bytes long, of which this->used are considered "used" by the client. The difference beween (this->capacity - this->used) represents space the buffer has available for use before it will require another expansion/reallocation. */ unsigned char * mem; /** Number of bytes allocated for this buffer. */ fsl_size_t capacity; /** Number of "used" bytes in the buffer. This is generally interpreted as the string length of this->mem, and the buffer APIs which add data to a buffer always ensure that this->capacity is large enough to account for a trailing NUL byte in this->mem. |
︙ | ︙ | |||
1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 | (z+5), and a positive value means the MM part starts at (z+6). z need not be NUL terminated - this function does not read past the first invalid byte. Thus is can be used on, e.g., full ISO8601-format strings. If z is NULL, 0 is returned. */ FSL_EXPORT int fsl_str_is_date2(const char *z); /** Reserves at least n bytes of capacity in buf. Returns 0 on success, FSL_RC_OOM if allocation fails, FSL_RC_MISUSE if !buf. | > < < < < < < < < < < < < < < | | | | < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | > | < < < < < | | | < < | < < < | < < < < < < < < < < | < < | | 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 | (z+5), and a positive value means the MM part starts at (z+6). z need not be NUL terminated - this function does not read past the first invalid byte. Thus is can be used on, e.g., full ISO8601-format strings. If z is NULL, 0 is returned. */ FSL_EXPORT int fsl_str_is_date2(const char *z); /** Reserves at least n bytes of capacity in buf. Returns 0 on success, FSL_RC_OOM if allocation fails, FSL_RC_MISUSE if !buf. This does not change buf->used, nor will it shrink the buffer (reduce buf->capacity) unless n is 0, in which case it immediately frees buf->mem and sets buf->capacity and buf->used to 0. @see fsl_buffer_resize() @see fsl_buffer_clear() */ FSL_EXPORT int fsl_buffer_reserve( fsl_buffer * buf, fsl_size_t n ); /** Convenience equivalent of fsl_buffer_reserve(buf,0). This a no-op if buf==NULL. */ FSL_EXPORT void fsl_buffer_clear( fsl_buffer * buf ); /** Resets buf->used to 0 and sets buf->mem[0] (if buf->mem is not NULL) to 0. Does not (de)allocate memory, only changes the logical "used" size of the buffer. Returns its argument. Achtung for fossil(1) porters: this function's semantics are much different from the fossil's blob_reset(). To get those semantics, use fsl_buffer_reserve(buf, 0) or its convenience form fsl_buffer_clear(). (This function _used_ to be called fsl_buffer_reset(), but it was renamed in the hope of avoiding related confusion.) */ FSL_EXPORT fsl_buffer * fsl_buffer_reuse( fsl_buffer * buf ); /** Similar to fsl_buffer_reserve() except that... - It does not free all memory when n==0. Instead it essentially makes the memory a length-0, NUL-terminated string. - It will try to shrink (realloc) buf's memory if (n<buf->capacity). - It sets buf->capacity to (n+1) and buf->used to n. This routine allocates one extra byte to ensure that buf is always NUL-terminated. - On success it always NUL-terminates the buffer at offset buf->used. Returns 0 on success, FSL_RC_MISUSE if !buf, FSL_RC_OOM if (re)allocation fails. @see fsl_buffer_reserve() @see fsl_buffer_clear() */ FSL_EXPORT int fsl_buffer_resize( fsl_buffer * buf, fsl_size_t n ); /** Swaps the contents of the left and right arguments. Results are undefined if either argument is NULL or points to uninitialized memory. */ FSL_EXPORT void fsl_buffer_swap( fsl_buffer * left, fsl_buffer * right ); |
︙ | ︙ | |||
1336 1337 1338 1339 1340 1341 1342 | /** Appends the first n bytes of src, plus a NUL byte, to b, expanding b as necessary and incrementing b->used by n. If n is less than 0 then the equivalent of fsl_strlen((char const*)src) is used to calculate the length. | < < < < < > > > > | | | > | | 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 | /** Appends the first n bytes of src, plus a NUL byte, to b, expanding b as necessary and incrementing b->used by n. If n is less than 0 then the equivalent of fsl_strlen((char const*)src) is used to calculate the length. If n is 0 (or negative and !*src), this function ensures that b->mem is not NULL and is NUL-terminated, so it may allocate to have space for that NUL byte. src may only be NULL if n==0. If passed (src==NULL, n!=0) then FSL_RC_RANGE is returned. Returns 0 on success, FSL_RC_MISUSE if !f, !b, or !src, FSL_RC_OOM if allocation of memory fails. If this function succeeds, it guarantees that it NUL-terminates the buffer (but that the NUL terminator is not counted in b->used). @see fsl_buffer_appendf() @see fsl_buffer_reserve() */ FSL_EXPORT int fsl_buffer_append( fsl_buffer * b, void const * src, fsl_int_t n ); /** Uses fsl_appendf() to append formatted output to the given buffer. Returns 0 on success and FSL_RC_OOM if an allocation fails while expanding dest. Results are undefined if either of the first two arguments are NULL. |
︙ | ︙ | |||
1421 1422 1423 1424 1425 1426 1427 | */ FSL_EXPORT int fsl_buffer_compress2(fsl_buffer const *pIn1, fsl_buffer const *pIn2, fsl_buffer *pOut); /** Uncompress buffer pIn and store the result in pOut. It is ok for | | | < < | < < | < < | < < | < | | | | | | | | < < | | > | | | < < < < < < < < < < | < < < | < < < < | < < | < < < | | | | 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 | */ FSL_EXPORT int fsl_buffer_compress2(fsl_buffer const *pIn1, fsl_buffer const *pIn2, fsl_buffer *pOut); /** Uncompress buffer pIn and store the result in pOut. It is ok for pIn and pOut to be the same buffer. Returns 0 on success. On error pOut is not modified. pOut must be either cleanly initialized/empty or the same as pIn. Results are undefined if any argument is NULL. Returns 0 on success, FSL_RC_OOM on allocation error, and FSL_RC_ERROR if the lower-level decompression routines fail. TODO: if pOut!=(pIn1 or pIn2) then re-use its memory, if it has any. @see fsl_buffer_compress() @see fsl_buffer_compress2() @see fsl_buffer_is_compressed() */ FSL_EXPORT int fsl_buffer_uncompress(fsl_buffer const *pIn, fsl_buffer *pOut); /** Returns true if this function believes that mem (which must be at least len bytes of valid memory long) appears to have been compressed by fsl_buffer_compress() or equivalent. This is not a 100% reliable check - it could potentially have false positives on certain inputs, but that is thought to be unlikely (at least for text data). Returns 0 if mem is NULL. */ FSL_EXPORT bool fsl_data_is_compressed(unsigned char const * mem, fsl_size_t len); /** Equivalent to fsl_data_is_compressed(buf->mem, buf->used). */ FSL_EXPORT bool fsl_buffer_is_compressed(fsl_buffer const * buf); /** If fsl_data_is_compressed(mem,len) returns true then this function returns the uncompressed size of the data, else it returns a negative value. */ FSL_EXPORT fsl_int_t fsl_data_uncompressed_size(unsigned char const *mem, fsl_size_t len); /** The fsl_buffer counterpart of fsl_data_uncompressed_size(). */ FSL_EXPORT fsl_int_t fsl_buffer_uncompressed_size(fsl_buffer const * b); /** Equivalent to ((char const *)b->mem), but returns NULL if !b. The returned string is effectively b->used bytes long unless the user decides to apply his own conventions. Note that the buffer APIs generally assure that buffers are NUL-terminated, meaning that strings returned from this function can (for the vast majority of cases) assume that the returned string is NUL-terminated (with a string length of b->used _bytes_). @see fsl_buffer_str() @see fsl_buffer_cstr2() */ FSL_EXPORT char const * fsl_buffer_cstr(fsl_buffer const *b); /** If buf is not NULL and has any memory allocated to it, that memory is returned. If both b and len are not NULL then *len is set to b->used. If b has no dynamic memory then NULL is returned and *len (if len is not NULL) is set to 0. @see fsl_buffer_str() @see fsl_buffer_cstr() */ FSL_EXPORT char const * fsl_buffer_cstr2(fsl_buffer const *b, fsl_size_t * len); /** Equivalent to ((char *)b->mem). The returned memory is effectively b->used bytes long unless the user decides to apply their own conventions. */ FSL_EXPORT char * fsl_buffer_str(fsl_buffer const *b); /** "Takes" the memory refered to by the given buffer, transfering ownership to the caller. After calling this, b's state will be empty. */ FSL_EXPORT char * fsl_buffer_take(fsl_buffer *b); /** Returns the "used" size of b, or 0 if !b. */ FSL_EXPORT fsl_size_t fsl_buffer_size(fsl_buffer const * b); /** Returns the current capacity of b, or 0 if !b. */ FSL_EXPORT fsl_size_t fsl_buffer_capacity(fsl_buffer const * b); /** Compares the contents of buffers lhs and rhs using memcmp(3) semantics. Return negative, zero, or positive if the first buffer is less then, equal to, or greater than the second. Results are undefined if either argument is NULL. When buffers of different length match on the first N bytes, where N is the shorter of the two buffers' lengths, it treats the shorter buffer as being "less than" the longer one. */ FSL_EXPORT int fsl_buffer_compare(fsl_buffer const * lhs, fsl_buffer const * rhs); /** Bitwise-compares the contents of b against the file named by zFile. Returns 0 if they have the same size and contents, else non-zero. This function has no way to report if zFile cannot be opened, and any error results in a non-0 return value. No interpretation/canonicalization of zFile is performed - it is |
︙ | ︙ | |||
1592 1593 1594 1595 1596 1597 1598 | where the timing/duration of fsl_buffer_compare() (or an equivalent memcmp()) might inadvertently leak security-relevant information. Specifically, it address the concern that attackers can use timing differences to check for password misses, to narrow down an attack to passwords of a specific length or content properties. */ | | | 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 | where the timing/duration of fsl_buffer_compare() (or an equivalent memcmp()) might inadvertently leak security-relevant information. Specifically, it address the concern that attackers can use timing differences to check for password misses, to narrow down an attack to passwords of a specific length or content properties. */ FSL_EXPORT int fsl_buffer_compare_O1(fsl_buffer const * lhs, fsl_buffer const * rhs); /** Overwrites dest's contents with a copy of those from src (reusing dest's memory if it has any). Results are undefined if either pointer is NULL or invalid. Returns 0 on success, FSL_RC_OOM on allocation error. */ |
︙ | ︙ | |||
1617 1618 1619 1620 1621 1622 1623 | Return 0 on success. @see fsl_buffer_delta_apply() @see fsl_delta_apply() @see fsl_delta_apply2() */ | | | | | | | | | 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 | Return 0 on success. @see fsl_buffer_delta_apply() @see fsl_delta_apply() @see fsl_delta_apply2() */ FSL_EXPORT int fsl_buffer_delta_apply( fsl_buffer const * pOriginal, fsl_buffer const * pDelta, fsl_buffer * pTarget); /** Identical to fsl_buffer_delta_apply() except that if delta application fails then any error messages/codes are written to pErr if it is not NULL. It is rare that delta application fails (only if the inputs are invalid, e.g. do not belong together or are corrupt), but when it does, having error information can be useful. @see fsl_buffer_delta_apply() @see fsl_delta_apply() @see fsl_delta_apply2() */ FSL_EXPORT int fsl_buffer_delta_apply2( fsl_buffer const * pOriginal, fsl_buffer const * pDelta, fsl_buffer * pTarget, fsl_error * pErr); /** Uses a fsl_input_f() function to buffer input into a fsl_buffer. dest must be a non-NULL, initialized (though possibly empty) fsl_buffer object. Its contents, if any, will be overwritten by |
︙ | ︙ | |||
1738 1739 1740 1741 1742 1743 1744 | /** Writes the given buffer to the given filename. Returns 0 on success, FSL_RC_MISUSE if !b or !fname, FSL_RC_IO if opening or writing fails. Uses fsl_fopen() to open the file, so it supports the name '-' as an alias for stdout. */ | | | 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 | /** Writes the given buffer to the given filename. Returns 0 on success, FSL_RC_MISUSE if !b or !fname, FSL_RC_IO if opening or writing fails. Uses fsl_fopen() to open the file, so it supports the name '-' as an alias for stdout. */ FSL_EXPORT int fsl_buffer_to_filename( fsl_buffer const * b, char const * fname ); /** Copy N lines of text from pFrom into pTo. The copy begins at the current pFrom->cursor position. pFrom->cursor is left pointing at the first character past the last `\n` copied. (Modification of the cursor is why pFrom is not const.) |
︙ | ︙ | |||
1886 1887 1888 1889 1890 1891 1892 | */ FSL_EXPORT int fsl_strncmp(const char *zA, const char *zB, fsl_size_t nByte); /** BSD strlcpy() variant which is less error prone than strncpy. Copy up to dstsz - 1 characters from src to dst and NUL-terminate the resulting string if dstsz is not 0. | < < < < < < < | 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 | */ FSL_EXPORT int fsl_strncmp(const char *zA, const char *zB, fsl_size_t nByte); /** BSD strlcpy() variant which is less error prone than strncpy. Copy up to dstsz - 1 characters from src to dst and NUL-terminate the resulting string if dstsz is not 0. */ FSL_EXPORT fsl_size_t fsl_strlcpy(char *dst, const char *src, fsl_size_t dstsz); /** BSD strlcat() variant which is less error prone than strncat. Append src to the end of dst. Append at most dstsz - strlen(dst - 1) characters, and NUL-terminate unless dstsize is 0 or the passed in dst string was longer than dstsz to begin with. */ FSL_EXPORT fsl_size_t fsl_strlcat(char *dst, const char *src, fsl_size_t dstsz); /** Equivalent to fsl_strncmp(lhs, rhs, X), where X is either FSL_STRLEN_SHA1 or FSL_STRLEN_K256: if both lhs and rhs are longer than FSL_STRLEN_SHA1 then they are assumed to be |
︙ | ︙ | |||
2159 2160 2161 2162 2163 2164 2165 | int const rc = fsl_list_reserve( myList, n ); if( rc ) { ... error ... } ``` @see fsl_list_clear() @see fsl_list_visit_free() */ | | | | | 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 | int const rc = fsl_list_reserve( myList, n ); if( rc ) { ... error ... } ``` @see fsl_list_clear() @see fsl_list_visit_free() */ FSL_EXPORT int fsl_list_reserve( fsl_list * self, fsl_size_t n ); /** Appends a bitwise copy of cp to self->list, expanding the list as necessary and adjusting self->used. Ownership of cp is unchanged by this call. cp may not be NULL. Returns 0 on success, FSL_RC_MISUSE if any argument is NULL, or FSL_RC_OOM on allocation error. */ FSL_EXPORT int fsl_list_append( fsl_list * self, void * cp ); /** Swaps all contents of both lhs and rhs. Results are undefined if lhs or rhs are NULL or not properly initialized (via initial copy initialization from fsl_list_empty resp. fsl_list_empty_m). */ FSL_EXPORT void fsl_list_swap( fsl_list * lhs, fsl_list * rhs ); /** @typedef typedef int (*fsl_list_visitor_f)(void * p, void * visitorState ) Generic visitor interface for fsl_list lists. Used by fsl_list_visit(). p is the pointer held by that list entry and visitorState is the 4th argument passed to fsl_list_visit(). |
︙ | ︙ | |||
2243 2244 2245 2246 2247 2248 2249 | the client has no way (unless the finalizer somehow accounts for it) to know which entries in the list were cleaned up. Thus it is highly recommended that finalizer functions follow the conventional wisdom of "destructors do not throw." @see fsl_list_visit_free() */ | | < | | < | | 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 | the client has no way (unless the finalizer somehow accounts for it) to know which entries in the list were cleaned up. Thus it is highly recommended that finalizer functions follow the conventional wisdom of "destructors do not throw." @see fsl_list_visit_free() */ FSL_EXPORT int fsl_list_clear( fsl_list * list, fsl_list_visitor_f childFinalizer, void * finalizerState ); /** Similar to fsl_list_clear(list, fsl_list_v_fsl_free, NULL), but only frees list->list if the second argument is true, otherwise it sets the list's length to 0 but keep the list->list memory intact for later use. Note that this function never frees the list argument, only its contents. Be sure only to use this on lists of types for which fsl_free() is legal. i.e. don't use it on a list of fsl_deck objects or other types which have their own finalizers. Results are undefined if list is NULL. @see fsl_list_clear() */ FSL_EXPORT void fsl_list_visit_free( fsl_list * list, bool freeListMem ); /** Works similarly to the visit operation without the _p suffix except that the pointer the visitor function gets is a (**) pointing back to the entry within this list. That means that callers can assign the entry in the list to another value during the traversal process (e.g. set it to 0). If shiftIfNulled is true then if the callback sets the list's value to 0 then it is removed from the list and self->used is adjusted (self->capacity is not changed). */ FSL_EXPORT int fsl_list_visit_p( fsl_list * self, int order, bool shiftIfNulled, fsl_list_visitor_f visitor, void * visitorState ); /** Sorts the given list using the given comparison function. Neither argument may be NULL. The arugments passed to the comparison function will be pointers to pointers to the original entries, and may (depending on how the list is used) point to NULL. */ FSL_EXPORT void fsl_list_sort( fsl_list * li, fsl_generic_cmp_f cmp); /** Searches for a value in the given list, using the given comparison function to determine equivalence. The comparison function will never be passed a NULL value by this function - if value is NULL then only a NULL entry will compare equal to it. Results are undefined if li or cmpf are NULL. |
︙ | ︙ | |||
2361 2362 2363 2364 2365 2366 2367 | } assert(0 == fsl_strcmp( "/a/b/foo.bar, fsl_buffer_cstr(&buf))); fsl_buffer_clear(&buf); ``` */ FSL_EXPORT int fsl_file_canonical_name2(const char *zRoot, const char *zOrigName, | < | | | 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 | } assert(0 == fsl_strcmp( "/a/b/foo.bar, fsl_buffer_cstr(&buf))); fsl_buffer_clear(&buf); ``` */ FSL_EXPORT int fsl_file_canonical_name2(const char *zRoot, const char *zOrigName, fsl_buffer *pOut, bool slash); /** Equivalent to fsl_file_canonical_name2(NULL, zOrigName, pOut, slash). @see fsl_file_canonical_name2() */ FSL_EXPORT int fsl_file_canonical_name(const char *zOrigName, fsl_buffer *pOut, bool slash); /** Calculates the "directory part" of zFilename and _appends_ it to pOut. The directory part is all parts up to the final path separator ('\\' or '/'). If leaveSlash is true (non-0) then the separator part is appended to pOut, otherwise it is not. This function only examines the first nLen bytes of zFilename. If |
︙ | ︙ | |||
2398 2399 2400 2401 2402 2403 2404 | separator and leaveSlash is false then only a NUL terminator is appended to pOut if it is not already NUL-terminated. This function does no filesystem-level validation of the the given path - only string evaluation. */ FSL_EXPORT int fsl_file_dirpart(char const * zFilename, fsl_int_t nLen, | | | 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 | separator and leaveSlash is false then only a NUL terminator is appended to pOut if it is not already NUL-terminated. This function does no filesystem-level validation of the the given path - only string evaluation. */ FSL_EXPORT int fsl_file_dirpart(char const * zFilename, fsl_int_t nLen, fsl_buffer * pOut, bool leaveSlash); /** Writes the absolute path name of the current directory to zBuf, which must be at least nBuf bytes long (nBuf includes the space for a trailing NUL terminator). |
︙ | ︙ | |||
2489 2490 2491 2492 2493 2494 2495 | for directories, devices, fifos, symlinks, etc. The name may be absolute or relative to the current working dir. */ FSL_EXPORT bool fsl_is_file(const char *zFilename); /** Returns true if the given file is a symlink, else false. The name | | < | 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 | for directories, devices, fifos, symlinks, etc. The name may be absolute or relative to the current working dir. */ FSL_EXPORT bool fsl_is_file(const char *zFilename); /** Returns true if the given file is a symlink, else false. The name may be absolute or relative to the current working dir. */ FSL_EXPORT bool fsl_is_symlink(const char *zFilename); /** Returns true if the given filename refers to a plain file or symlink, else returns false. The name may be absolute or relative to the current working dir. |
︙ | ︙ | |||
2517 2518 2519 2520 2521 2522 2523 | Simplify a filename by: * converting all \ into / on windows and cygwin * removing any trailing and duplicate / * removing /./ * removing /A/../ | | | | | < < < < < < < | 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 | Simplify a filename by: * converting all \ into / on windows and cygwin * removing any trailing and duplicate / * removing /./ * removing /A/../ Changes are made in-place. Return the new name length. If the slash parameter is non-zero, the trailing slash, if any, is retained. If n is <0 then fsl_strlen() is used to calculate the length. */ FSL_EXPORT fsl_size_t fsl_file_simplify_name(char *z, fsl_int_t n_, bool slash); /** Return true (non-zero) if string z matches glob pattern zGlob and zero if the pattern does not match. Always returns 0 if either argument is NULL. Supports all globbing rules |
︙ | ︙ | |||
2572 2573 2574 2575 2576 2577 2578 | "*.c *.h, *.sh, '*.in'" ``` @see fsl_glob_list_append() @see fsl_glob_list_matches() @see fsl_glob_list_clear() */ | | | | 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 | "*.c *.h, *.sh, '*.in'" ``` @see fsl_glob_list_append() @see fsl_glob_list_matches() @see fsl_glob_list_clear() */ FSL_EXPORT int fsl_glob_list_parse( fsl_list * tgt, char const * zPatternList ); /** Appends a single blob pattern to tgt, in the form of a new (char *) owned by tgt. This function copies zGlob and appends that copy to tgt. Returns 0 on success, FSL_RC_MISUSE if !tgt or !zGlob or !*zGlob, FSL_RC_OOM if appending to the list fails. @see fsl_glob_list_parse() @see fsl_glob_list_matches() @see fsl_glob_list_clear() */ FSL_EXPORT int fsl_glob_list_append( fsl_list * tgt, char const * zGlob ); /** Assumes globList is a list of (char [const] *) glob values and tries to match each one against zNeedle using fsl_str_glob(). If any glob matches, it returns a pointer to the matched globList->list entry. If no matches are found, or if any argument is invalid, NULL is returned. |
︙ | ︙ | |||
2783 2784 2785 2786 2787 2788 2789 | the more widespread OSes often have to be converted to something portable and this requires allocation on such platforms, but not on Unix. For API transparency, that means all platforms get the copy(-like) behaviour. */ FSL_EXPORT char *fsl_getenv(const char *zName); | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 | the more widespread OSes often have to be converted to something portable and this requires allocation on such platforms, but not on Unix. For API transparency, that means all platforms get the copy(-like) behaviour. */ FSL_EXPORT char *fsl_getenv(const char *zName); /** Returns a positive value if zFilename is a directory, 0 if zFilename does not exist, or a negative value if zFilename exists but is something other than a directory. Results are undefined if zFilename is NULL. This function expects zFilename to be a well-formed path - |
︙ | ︙ | |||
2917 2918 2919 2920 2921 2922 2923 2924 2925 | Results are undefined if zFilename is NULL. Potential TODO: if it refers to a dir, forward the call to fsl_rmdir(). */ FSL_EXPORT int fsl_file_unlink(const char *zFilename); /** | > < < | > | | | | 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 | Results are undefined if zFilename is NULL. Potential TODO: if it refers to a dir, forward the call to fsl_rmdir(). */ FSL_EXPORT int fsl_file_unlink(const char *zFilename); /** Renames zFrom to zTo, as per rename(3). Returns 0 on success. On error it returns FSL_RC_OOM on allocation error when converting the names to platforms-specific character sets (on platforms where that happens) or an FSL_RC_xxx value approximating an errno value, as per fsl_errno_to_rc(). */ FSL_EXPORT int fsl_file_rename(const char *zFrom, const char *zTo); /** Deletes an empty directory from the filesystem. Returns 0 on success. There are any number of reasons why deletion of a directory can fail, some of which include: |
︙ | ︙ | |||
2965 2966 2967 2968 2969 2970 2971 | returning 0. If the target is a directory or a symlink, this is a no-op and returns 0. */ FSL_EXPORT int fsl_file_exec_set(const char *zFilename, bool isExec); | < < < < < < < < < < < < < < < < < < < < < | 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 | returning 0. If the target is a directory or a symlink, this is a no-op and returns 0. */ FSL_EXPORT int fsl_file_exec_set(const char *zFilename, bool isExec); /** Create the directory with the given name if it does not already exist. If forceFlag is true, delete any prior non-directory object with the same name. Return 0 on success, non-0 on error. |
︙ | ︙ | |||
3043 3044 3045 3046 3047 3048 3049 | "/foo/bar" creates (if needed) /foo, but assumes "bar" is a file component. "/foo/bar/" creates /foo/bar. However "foo" will not create a directory - because the string has no path component, it is assumed to be a filename. Both "/foo/bar/my.doc" and "/foo/bar/" result in the directories | | < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < | 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 | "/foo/bar" creates (if needed) /foo, but assumes "bar" is a file component. "/foo/bar/" creates /foo/bar. However "foo" will not create a directory - because the string has no path component, it is assumed to be a filename. Both "/foo/bar/my.doc" and "/foo/bar/" result in the directories /foo/bar. */ FSL_EXPORT int fsl_mkdir_for_file(char const *zName, bool forceFlag); /** Uses fsl_getenv() to look for the environment variables (FOSSIL_USER, (Windows: USERNAME), (Unix: USER, LOGNAME)). If it finds one it returns a copy of that value, which must eventually be passed to fsl_free() to free it (NOT fsl_filename_free(), though fsl_getenv() requires that one). If |
︙ | ︙ | |||
3249 3250 3251 3252 3253 3254 3255 | #define fsl_fstat_empty_m {FSL_FSTAT_TYPE_UNKNOWN,0,0,-1,0} /** Empty-initialized fsl_fstat instance, intended for non-const copy construction. */ FSL_EXPORT const fsl_fstat fsl_fstat_empty; /** | | | 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 | #define fsl_fstat_empty_m {FSL_FSTAT_TYPE_UNKNOWN,0,0,-1,0} /** Empty-initialized fsl_fstat instance, intended for non-const copy construction. */ FSL_EXPORT const fsl_fstat fsl_fstat_empty; /** Runs the OS's stat(2) equivalent to populate fst with information about the given file. Returns 0 on success, FSL_RC_MISUSE if zFilename is NULL, and FSL_RC_RANGE if zFilename starts with a NUL byte. Returns FSL_RC_NOT_FOUND if no filesystem entry is found for the given name. Returns FSL_RC_IO if the underlying stat() (or equivalent) fails for undetermined reasons inside the underlying |
︙ | ︙ | |||
3272 3273 3274 3275 3276 3277 3278 | to differentiate between symlinks and files. The fsl_fstat_type_e family of flags can be used to determine the type of the filesystem object being stat()'d (file, directory, or symlink). It does not apply any special logic for platform-specific oddities other than symlinks (e.g. character devices and such). */ | | | 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 | to differentiate between symlinks and files. The fsl_fstat_type_e family of flags can be used to determine the type of the filesystem object being stat()'d (file, directory, or symlink). It does not apply any special logic for platform-specific oddities other than symlinks (e.g. character devices and such). */ FSL_EXPORT int fsl_stat(const char *zFilename, fsl_fstat * fst, bool derefSymlinks); /** Create a new delta between the memory zIn and zOut. The delta is written into a preallocated buffer, zDelta, which must be at least 60 bytes longer than the target memory, zOut. |
︙ | ︙ | |||
3367 3368 3369 3370 3371 3372 3373 | number of times to emit delta output. Each time it is called it should append the new bytes to its output channel. The semantics of the return value and the first four arguments are identical to fsl_delta_create(), with these ammendments regarding the return value: | | | | | | | < | | | | 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 | number of times to emit delta output. Each time it is called it should append the new bytes to its output channel. The semantics of the return value and the first four arguments are identical to fsl_delta_create(), with these ammendments regarding the return value: - Returns FSL_RC_MISUSE if any of (zSrc, zOut, out) are NULL. - If out() returns non-0 at any time, delta generation is aborted and that code is returned. Example usage: ``` int rc = fsl_delta_create( v1, v1len, v2, v2len, fsl_output_f_FILE, stdout); ``` */ FSL_EXPORT int fsl_delta_create2( unsigned char const *zSrc, fsl_size_t lenSrc, unsigned char const *zOut, fsl_size_t lenOut, fsl_output_f out, void * outState); /** A fsl_delta_create() wrapper which uses the first two arguments as the original and "new" content versions to delta, and outputs the delta to the 3rd argument (overwriting any existing contents and re-using any memory it had allocated). If the output buffer (delta) is the same as src or newVers, FSL_RC_MISUSE is returned, and results are undefined if delta indirectly refers to the same buffer as either src or newVers. Returns 0 on success. */ FSL_EXPORT int fsl_buffer_delta_create( fsl_buffer const * src, fsl_buffer const * newVers, fsl_buffer * delta); /** Apply a delta created using fsl_delta_create(). The output buffer must be big enough to hold the whole output file and a NUL terminator at the end. The fsl_delta_applied_size() routine can be used to determine that |
︙ | ︙ | |||
3520 3521 3522 3523 3524 3525 3526 | */ FSL_EXPORT void fsl_bytes_defossilize( unsigned char * inp, fsl_size_t * resultLen ); /** Defossilizes the contents of b. Equivalent to: fsl_bytes_defossilize( b->mem, &b->used ); */ | | | 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 | */ FSL_EXPORT void fsl_bytes_defossilize( unsigned char * inp, fsl_size_t * resultLen ); /** Defossilizes the contents of b. Equivalent to: fsl_bytes_defossilize( b->mem, &b->used ); */ FSL_EXPORT void fsl_buffer_defossilize( fsl_buffer * b ); /** Returns true if the input string contains only valid lower-case base-16 digits. If any invalid characters appear in the string, false is returned. */ FSL_EXPORT bool fsl_validate16(const char *zIn, fsl_size_t nIn); |
︙ | ︙ | |||
3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 | untransformed characters and the strlen of *xlate for others. Bytes returned via xlate are static and immutable. Results are undefined if xlate is NULL. */ FSL_EXPORT fsl_size_t fsl_htmlize_xlate(int c, char const ** xlate); /** @enum fsl_diff2_flag_e Flags for use with the 2021-era text-diff generation APIs | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | < < | < < < < < < < < < < < < < | 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 | untransformed characters and the strlen of *xlate for others. Bytes returned via xlate are static and immutable. Results are undefined if xlate is NULL. */ FSL_EXPORT fsl_size_t fsl_htmlize_xlate(int c, char const ** xlate); /** Flags for use with text-diff generation APIs, e.g. fsl_diff_text(). Maintenance reminder: these values are holy and must not be changed without also changing the corresponding code in diff.c. @deprecated Prefer fsl_diff2_flag_e and fsl_diff_v2() instead. */ enum fsl_diff_flag_e { /** Ignore end-of-line whitespace */ FSL_DIFF_IGNORE_EOLWS = 0x01, /** Ignore end-of-line whitespace */ FSL_DIFF_IGNORE_ALLWS = 0x03, /** Generate a side-by-side diff */ FSL_DIFF_SIDEBYSIDE = 0x04, /** Missing shown as empty files */ FSL_DIFF_VERBOSE = 0x08, /** Show filenames only. Not used in this impl! */ FSL_DIFF_BRIEF = 0x10, /** Render HTML. */ FSL_DIFF_HTML = 0x20, /** Show line numbers. */ FSL_DIFF_LINENO = 0x40, /** Suppress optimizations (debug). */ FSL_DIFF_NOOPT = 0x0100, /** Invert the diff (debug). */ FSL_DIFF_INVERT = 0x0200, /** Only display if not "too big." */ FSL_DIFF_NOTTOOBIG = 0x0800, /** Strip trailing CR */ FSL_DIFF_STRIP_EOLCR = 0x1000, /** This flag tells text-mode diff generation to add ANSI color sequences to some output. The colors are currently hard-coded and non-configurable. This has no effect for HTML output, and that flag trumps this one. It also currently only affects unified diffs, not side-by-side. Maintenance reminder: this one currently has no counterpart in fossil(1), is not tracked in the same way, and need not map to an internal flag value. */ FSL_DIFF_ANSI_COLOR = 0x2000 }; /** Generates a textual diff from two text inputs and writes it to the given output function. pA and pB are the buffers to diff. contextLines is the number of lines of context to output. This parameter has a built-in limit of 2^16, and values larger than that get truncated. A value of 0 is legal, in which case no surrounding context is provided. A negative value translates to some unspecified default value. sbsWidth specifies the width (in characters) of the side-by-side columns. If sbsWidth is not 0 then this function behaves as if diffFlags contains the FSL_DIFF_SIDEBYSIDE flag. If sbsWidth is negative, OR if diffFlags explicitly contains FSL_DIFF_SIDEBYSIDE and sbsWidth is 0, then some default width is used. This parameter has a built-in limit of 255, and values larger than that get truncated to 255. diffFlags is a mask of fsl_diff_flag_t values. Not all of the fsl_diff_flag_t flags are yet [sup]ported. The output is sent to out(outState,...). If out() returns non-0 during processing, processing stops and that result is returned to the caller of this function. Returns 0 on success, FSL_RC_OOM on allocation error, FSL_RC_MISUSE if any arguments are invalid, FSL_RC_TYPE if any of the content appears to be binary (contains embedded NUL bytes), FSL_RC_RANGE if some range is exceeded (e.g. the maximum number of input lines). None of (pA, pB, out) may be NULL. TODOs: - Add a predicate function for outputing only matching differences, analog to fossil(1)'s regex support (but more flexible). - Expose the raw diff-generation bits via the internal API to facilitate/enable the creation of custom diff formats. @see fsl_diff_v2() @deprecated Prefer fsl_diff_v2() for new code. */ FSL_EXPORT int fsl_diff_text(fsl_buffer const *pA, fsl_buffer const *pB, fsl_output_f out, void * outState, short contextLines, short sbsWidth, int diffFlags ); /** Functionally equivalent to: ``` fsl_diff_text(pA, pB, fsl_output_f_buffer, pOut, contextLines, sbsWidth, diffFlags); ``` Except that it returns FSL_RC_MISUSE if !pOut. @see fsl_diff_v2() @deprecated Prefer fsl_diff_v2() for new code. */ FSL_EXPORT int fsl_diff_text_to_buffer(fsl_buffer const *pA, fsl_buffer const *pB, fsl_buffer *pOut, short contextLines, short sbsWidth, int diffFlags ); /** @enum fsl_diff2_flag_e Flags for use with the 2021-era text-diff generation APIs (fsl_diff_builder and friends). This set of flags may still change considerably. Maintenance reminder: some of these values are holy and must not be changed without also changing the corresponding code in diff2.c. */ enum fsl_diff2_flag_e { /** Ignore end-of-line whitespace. Applies to all diff builders. */ FSL_DIFF2_IGNORE_EOLWS = 0x01, /** Ignore end-of-line whitespace. Applies to all diff builders. */ |
︙ | ︙ | |||
3695 3696 3697 3698 3699 3700 3701 | FSL_RC_RANGE. */ FSL_DIFF2_NOTTOOBIG = 0x0800, /** Strip trailing CR before diffing. Applies to all diff builders. */ FSL_DIFF2_STRIP_EOLCR = 0x1000, | < < < < | > > > > > > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | | | 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 | FSL_RC_RANGE. */ FSL_DIFF2_NOTTOOBIG = 0x0800, /** Strip trailing CR before diffing. Applies to all diff builders. */ FSL_DIFF2_STRIP_EOLCR = 0x1000, /** More precise but slower side-by-side diff algorithm, for diffs which use that. */ FSL_DIFF2_SLOW_SBS = 0x2000, /** Tells diff builders which support it to include line numbers in their output. */ FSL_DIFF2_LINE_NUMBERS = 0x10000, /** Tells diff builders which optionally support an "index" line to NOT include it in their output. */ FSL_DIFF2_NOINDEX = 0x20000, /** Tells the TCL diff builder that the complete output and each line should be wrapped in {...}. */ FSL_DIFF2_TCL_BRACES = 0x40000, /** Reserved for client-defined diff builder use. */ FSL_DIFF2_CLIENT1 = 0x01000000, /** Reserved for client-defined diff builder use. */ FSL_DIFF2_CLIENT2 = 0x02000000, /** Reserved for client-defined diff builder use. */ FSL_DIFF2_CLIENT3 = 0x04000000, /** Reserved for client-defined diff builder use. */ FSL_DIFF2_CLIENT4 = 0x08000000 }; /** An instance of this class is used to convey certain state to fsl_diff_builder objects. Some of this state is configuration provided by the client and some is volatile, used for communicating common state to diff builder instances during the diff rendering process. Certain fsl_diff_builder implementations may require that some ostensibly optional fields be filled out. Documenting that is TODO, as the builders get developed. */ struct fsl_diff_opt { /** Flags from the fsl_diff2_flag_e enum. */ uint32_t diffFlags; /** Number of lines of diff context (number of lines common to the LHS and RHS of the diff). Library-wide default is 5. */ unsigned short contextLines; /** Maximum column width for side-by-side, a.k.a. split, diffs. FSL_DIFF_BUILDER_SPLIT_TEXT truncates its content columns (as opposed to line numbers and its modification marker) to, at most, this width. By default it uses as much width as is necessary to render whole lines. It treats this limit as UTF8 characters, not bytes. This is a hint, not a rule. A given diff builder is free to ignore it or to ignore values which are arbitrarily deemed "too |
︙ | ︙ | |||
3831 3832 3833 3834 3835 3836 3837 | may be NULL. */ const char * hashRHS; /** Output destination. Any given builder might, depending on how it actually constructs the diff, buffer output and delay calling this until its finish() method is called. | < < < < < > | | 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 | may be NULL. */ const char * hashRHS; /** Output destination. Any given builder might, depending on how it actually constructs the diff, buffer output and delay calling this until its finish() method is called. */ fsl_output_f out; /** State for this->out(). Ownership is unspecified by this interface: it is for use by this->out() but what is supposed to happen to it after this object is done with it depends on higher-level code. */ void * outState; /** EXPERIMENTAL AND SUBJECT TO CHANGE. Optional ANSI color control sequences to be injected into text-mode diff output by diff builders which support them. All members of this struct must either be NULL, an empty string, or a valid ANSI escape sequence. The reset option must be the escape sequence to reset either just the color or to reset all ANSI control attributes, depending on how the other members are set. If any member other than reset is set, all must be set. The diff driver will treat any members of this which are NULL as empty strings to simplify diff builder color integration. The exception is the reset member - see its docs for details. */ struct fsl_diff_opt_ansi { /** Color escape sequence for inserted lines. */ char const * insertion; /** Color escape sequence for edited or replaced lines. This option might be ignored, depending on how the renderer works. Some |
︙ | ︙ | |||
3885 3886 3887 3888 3889 3890 3891 | were the ANSI code to reset all color attributes. */ char const * reset; } ansiColor; }; /** Convenience typedef. */ | | | | | | | | 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 | were the ANSI code to reset all color attributes. */ char const * reset; } ansiColor; }; /** Convenience typedef. */ typedef struct fsl_diff_opt fsl_diff_opt; /** Initialized-with-defaults fsl_diff_opt structure, intended for const-copy initialization. */ #define fsl_diff_opt_empty_m {\ 0/*diffFlags*/, 5/*contextLines*/, 0/*columnWidth*/,\ NULL/*nameLHS*/,NULL/*hashLHS*/, \ NULL/*nameRHS*/, NULL/*hashRHS*/, \ NULL/*out*/, NULL/*outState*/, \ {/*ansiColor*/ ""/*insertion*/,""/*edit*/,""/*deletion*/,\ ""/*reset*/} \ } /** Initialized-with-defaults fsl_diff_opt structure, intended for non-const copy initialization. */ extern const fsl_diff_opt fsl_diff_opt_empty; /** Information about each line of a file being diffed. This type is only in the public API for use by the fsl_diff_builder interface, specifically for use with fsl_dline_change_spans(). It is not otherwise intended for public use. None of its members are considered even remotely public except for this->z and this->n. */ struct fsl_dline { /** The text of the line. Owned by higher-level code. Not |
︙ | ︙ | |||
3953 3954 3955 3956 3957 3958 3959 | */ #define fsl_dline_change_max_spans 8 /** This "mostly-internal" type describes zero or more (up to fsl_dline_change_max_spans) areas of difference between two lines of text. This type is only in the public API for use with concrete | | | 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 | */ #define fsl_dline_change_max_spans 8 /** This "mostly-internal" type describes zero or more (up to fsl_dline_change_max_spans) areas of difference between two lines of text. This type is only in the public API for use with concrete fsl_diff_builder implementations. */ struct fsl_dline_change { /** Number of change spans (number of used elements in this->a). */ unsigned char n; /** Array of change spans, in left-to-right order */ struct fsl_dline_change_span { /* Reminder: int instead of uint b/c some ported-in algos use |
︙ | ︙ | |||
4001 4002 4003 4004 4005 4006 4007 | Given two lines of a diff, this routine computes a set of changes between those lines for display purposes and writes a description of those changes into the 3rd argument. After returning, p->n contains the number of elements in p->a which were populated by this routine. This function is only in the public API for use with | | | 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 | Given two lines of a diff, this routine computes a set of changes between those lines for display purposes and writes a description of those changes into the 3rd argument. After returning, p->n contains the number of elements in p->a which were populated by this routine. This function is only in the public API for use with fsl_diff_builder objects. It is not a requirement for such objects but can be used to provide more detailed diff changes than marking whole lines as simply changed or not. */ FSL_EXPORT void fsl_dline_change_spans(const fsl_dline *pLeft, const fsl_dline *pRight, fsl_dline_change * const p); |
︙ | ︙ | |||
4057 4058 4059 4060 4061 4062 4063 | - FSL_RC_OOM on allocation error. */ FSL_EXPORT int fsl_break_into_dlines(const char *z, fsl_int_t n, uint32_t *pnLine, fsl_dline **pOut, uint64_t diff2Flags); /** Convenience typedef. */ | | | < > > > > > > > > > > > | | < < < < < < | | | | | | < < | | 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 | - FSL_RC_OOM on allocation error. */ FSL_EXPORT int fsl_break_into_dlines(const char *z, fsl_int_t n, uint32_t *pnLine, fsl_dline **pOut, uint64_t diff2Flags); /** Convenience typedef. */ typedef struct fsl_diff_builder fsl_diff_builder; /** This class is the basis of libfossil's port of the diff engine added to fossil(1) in 2021-09. A diff builder is an object responsible for formatting low-level diff info another form, typically for human readability but also for machine readability (patches). The library generates a low-level diff then feeds that through an algorithm which determines which methods of this class to call, delegating all rendering of the diff to an instance of this class. The internal APIs which drive each instance of this class guaranty that if any method of this class returns non-0 (an error code) then no futher methods will be called except for finalize(). Potential TODO: add a two-phase option to this interface. If builder->passes is greater than 0, builder->currentPass gets set to the current pass number (1 or 2) then it gets passed the diff once for each pass the builder needs, updating the currentPass flag between runs. The first phase is simply for it to analyze what needs to be done and the second is to do it. That would allow, e.g. the split-mode impl to avoid buffering all of the output because the first pass would allow it to calculate the width it needs for outputing the text columns. It would also allow for it to dynamically resize the line number columns more easily. */ struct fsl_diff_builder { /** Config info, owned by higher-level routines. Every diff builder requires one of these. Builders are prohibited from modifying these but the diff driver will. Note that the diff driver may make a bitwise copy of this object and use _that_ one for the actual diff generation. That is, methods of this class must never assume that this member's pointer refers to a specific object. (This leeway is necessary in order to implement diff inversion (swapping the LHS/RHS of a diff).) */ fsl_diff_opt * opt; /** If not NULL, this is called once per diff to give the builder a chance to perform any bootstrapping initialization or header output. At the point this is called, this->cfg is assumed to have been filled out properly. Diff builder implementations which require dynamic resource allocation may perform it here or in their factory routine(s). This method should also reset any dynamic state of a builder so that it may be reused for subsequent diffs. This enables the API to use a single builder for a collection of logically grouped files without having to destroy and reallocate the builder. Must return 0 on success, non-0 on error. If it returns non-0, the only other method of the instance which may be legally called is finalize(). The diff driver sets this->lnLHS and this->lnRHS to 0 before calling this. */ int (*start)(fsl_diff_builder* const); /** If this is not NULL, it is called one time at the start of each chunk of diff for a given file and is passed the line number of each half of the diff and the number of lines in that chunk for that half (including insertions and deletions). This is primarily intended for generating conventional unified diff chunk headers |
︙ | ︙ | |||
4142 4143 4144 4145 4146 4147 4148 | those two chunks together. That "readability optimization" is skipped when this method is set because this method may otherwise report that lines are being skipped which then subsequently get output by the driver. Must return 0 on success, non-0 on error. */ | | | | | | | | < < < < < < | < < < < < < < < < < < < < > > > > | > > | | < | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | | | < | | | | < < < < | | | 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 | those two chunks together. That "readability optimization" is skipped when this method is set because this method may otherwise report that lines are being skipped which then subsequently get output by the driver. Must return 0 on success, non-0 on error. */ int (*chunkHeader)(fsl_diff_builder* const, uint32_t A, uint32_t B, uint32_t C, uint32_t D); /** Tells the builder that n lines of common output are to be skipped. How it represents this is up to the impl. Must return 0 on success, non-0 on error. Typical common implementation details: - Increment both this->lnLHS and this->lnRHS by n. */ int (*skip)(fsl_diff_builder* const, uint32_t n); /** Tells the builder that the given line represents one line of common output. Must return 0 on success, non-0 on error. Typical common implementation details: - Increment both this->lnLHS and this->lnRHS by 1. */ int (*common)(fsl_diff_builder* const, fsl_dline const * line); /** Tells the builder that the given line represents an "insert" into the RHS. Must return 0 on success, non-0 on error. Typical common implementation details: - Increment this->lnRHS by 1. */ int (*insertion)(fsl_diff_builder* const, fsl_dline const * line); /** Tells the builder that the given line represents a "deletion" - a line removed from the LHS. Must return 0 on success, non-0 on error. Typical common implementation details: - Increment this->lnLHS by 1. */ int (*deletion)(fsl_diff_builder* const, fsl_dline const * line); /** Tells the builder that the given line represents a replacement from the LHS to the RHS. Must return 0 on success, non-0 on error. This differs from an "edit" in that the line being replaced seems to have on relationship to the replacement. Even so, builders are free to represent replacements and edits identically, and are free to represent either or both as a pair of deletion/insertion operations. Typical common implementation details: - Increment both this->lnLHS and this->lnRHS by 1. */ int (*replacement)(fsl_diff_builder* const, fsl_dline const * lineLhs, fsl_dline const * lineRhs); /** Tells the builder that the given line represents an "edit" from the LHS to the RHS. Must return 0 on success, non-0 on error. Builders are free, syntax permitting, to usse the fsl_dline_change_spans() API to elaborate on edits for display purposes, to treat it identically to this->replacement(), or to treat this as a single pair of calls to this->deletion() and this->insertion(). In the latter case they simply need to pass lineLhs to this->deletion() and lineRhs to this->insertion(). Typical common implementation details: - Increment both this->lnLHS and this->lnRHS by 1. */ int (*edit)(fsl_diff_builder* const, fsl_dline const * lineLhs, fsl_dline const * lineRhs); /** Must "finish" the diff process. Depending on the diff impl, this might flush any pending output or may be a no-op. This is only called if the rest of the diff was generated without producing an error result. This member may be NULL. Implementations are free to collect all of their output in an internal representation and delay flushing it until this routine is called. Must return 0 on success, non-0 on error (e.g. output flushing fails). */ int (*finish)(fsl_diff_builder* const); /** Must free any state owned by this builder, including the builder object. It must not generate any output. Must return 0 on success, non-0 on error (e.g. output flushing fails), but must clean up its own state and the builder object in either case. */ void (*finalize)(fsl_diff_builder* const); /** If true, this builder gets passed through the diff generation process twice. See this->passNumber for details. */ bool twoPass; /** Gets set to the "pass number" immediately before this->start() is called, starting with pass number 1. This value is only relevant for two-pass builders, which can use this to control their mode of operation, e.g. data collection in pass 1 and actual work in pass 2. Note that all of the diff-building API methods are call for both passes, including start() and finish(). Only finalize() is not affected by this. */ unsigned short passNumber; /** Impl-specific diff-generation state. If it is owned by this instance then this->finalize() must clean it up. */ void * pimpl; /** Impl-specific int for tracking basic output state, e.g. of opening/closing tags. This must not be modified by clients. */ unsigned int implFlags; /** A place to store the number of files seen by this builder so far, for builders which need to distinguish that somehow (e.g. adding a separator before each file after the first). Implementations which use this should increment it in their start() method. */ uint32_t fileCount; /** Number of lines seen of the LHS content. It is up to the concrete builder impl to update this if it's needed. The core diff driver sets this to 0 before calling this->start(). */ uint32_t lnLHS; /** Number of lines seen of the RHS content. It is up to the concrete builder impl to update this if it's needed. The core diff driver sets this to 0 before calling this->start(). */ uint32_t lnRHS; }; /** Initialized-with-defaults fsl_diff_builder structure, intended for const-copy initialization. */ #define fsl_diff_builder_empty_m { \ NULL/*cfg*/, \ NULL/*start()*/,NULL/*chunkHeader()*/,NULL/*skip()*/, NULL/*common()*/, \ NULL/*insertion()*/,NULL/*deletion()*/, NULL/*replacement()*/, \ NULL/*edit()*/, NULL/*finish()*/, NULL/*finalize()*/, \ false/*twoPass*/,0U/*passNumber*/, \ NULL/*pimpl*/, 0U/*implFlags*/,0U/*fileCount*/, \ 0/*lnLHS*/,0/*lnRHS*/ \ } /** Initialized-with-defaults fsl_diff_builder structure, intended for non-const copy initialization. */ extern const fsl_diff_builder fsl_diff_builder_empty; /** Type IDs for use with fsl_diff_builder_factory(). */ enum fsl_diff_builder_e { /** A "dummy" diff builder intended only for testing the fsl_diff_builder interface and related APIs. It does not produce output which is generically useful. */ FSL_DIFF_BUILDER_DEBUG = 1, /** Generates diffs in a compact low(ist)-level form originally designed for use by diff renderers implemented in JavaScript. This diff builder outputs a JSON object with the following properties: |
︙ | ︙ | |||
4412 4413 4414 4415 4416 4417 4418 | ``` The SUBARRAY is an array of 3*N+1 strings with N>=0. The triples represent common-text, left-text, and right-text. The last string in SUBARRAY is the common-suffix. Any string can be empty if it does not apply. */ | | | | | | | | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 | ``` The SUBARRAY is an array of 3*N+1 strings with N>=0. The triples represent common-text, left-text, and right-text. The last string in SUBARRAY is the common-suffix. Any string can be empty if it does not apply. */ FSL_DIFF_BUILDER_JSON1, /** A diff builder which produces output compatible with the patch(1) command. Its output is functionally identical to fossil(1)'s default diff output except that by default includes an Index line at the top of each file (use the FSL_DIFF2_NOINDEX flag in its fsl_diff_opt::diffFlags to disable that). Supported flags: - FSL_DIFF2_LINE_NUMBERS (makes it incompatible with patch(1)) - FSL_DIFF2_NOINDEX */ FSL_DIFF_BUILDER_UNIFIED_TEXT, /** A diff builder which outputs a description of the diff in a TCL-readable form. It requires external TCL code in order to function. TODO: a flag which includes the tcl/tk script as part of the output. We first need to compile fossil's diff.tcl into the library. */ FSL_DIFF_BUILDER_TCL, /** A pain-text side-by-side (a.k.a. split) diff view. This diff always behaves as if the FSL_DIFF2_LINE_NUMBERS flag were set because its output is fairly useless without line numbers. It optionally supports ANSI coloring. */ FSL_DIFF_BUILDER_SPLIT_TEXT }; typedef enum fsl_diff_builder_e fsl_diff_builder_e; /** A factory for creating fsl_diff_builder instances of types which are built in to the library. This does not preclude the creation of client-side diff builders (e.g. ones which write to ncurses widgets or similar special-case output). On success, returns 0 and assigns *pOut to a new builder instance which must eventually be freed by calling its pOut->finalize() method. On error, returns non-0 and *pOut is not modified. Error codes include FSL_RC_OOM (alloc failed) and FSL_RC_TYPE (unknown type ID), FSL_RC_TYPE (type is not (or not yet) implemented). */ FSL_EXPORT int fsl_diff_builder_factory( fsl_diff_builder_e type, fsl_diff_builder **pOut ); /** This counterpart of fsl_diff_text() defines its output format in terms of a fsl_diff_builder instance which the caller must provide. The caller is responsible for pointing pBuilder->cfg to a configuration object suitable for the desired diff. In particular, pBuilder->cfg->out and (if necessary) pBuilder->cfg->outState must be set to non-NULL values. This function generates a low-level diff of two versions of content, contained in the given buffers, and passes that diff through the |
︙ | ︙ | |||
4527 4528 4529 4530 4531 4532 4533 | - FSL_RC_DIFF_BINARY if the to-diff content appears to be binary, noting that "appears to be" is heuristric-driven and subject to false positives. Specifically, files with extremely long lines will be recognized as binary (and are, in any case, generally less than useful for most graphical diff purposes). | | | | < < | > | 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 | - FSL_RC_DIFF_BINARY if the to-diff content appears to be binary, noting that "appears to be" is heuristric-driven and subject to false positives. Specifically, files with extremely long lines will be recognized as binary (and are, in any case, generally less than useful for most graphical diff purposes). @see fsl_diff_builder_factory() @see fsl_diff_text() @see fsl_diff_raw_v2() */ FSL_EXPORT int fsl_diff_v2(fsl_buffer const * pv1, fsl_buffer const * pv2, fsl_diff_builder * const pBuilder); /** Performs a diff, as for fsl_diff_v2(), but returns the results in the form of an array of COPY, DELETE, INSERT triples terminated by 3 entries with the value 0. Each triple in the list specifies how many *lines* of each half of the diff (the first 2 arguments to this function) to COPY as-is (common code), DELETE (exists in the LHS but not in the RHS), and INSERT (exists in the RHS but not in the LHS). By breaking the input into lines and following these values, a line-level text-mode diff of the two blobs can be generated. See fsl_diff_v2() for the details, all of which apply except for the output: - cfg->out is ignored. - On success, *outRaw is assigned to the output array and ownership of it is transfered to the caller, who must eventually pass it to fsl_free() to free it. */ FSL_EXPORT int fsl_diff_v2_raw(fsl_buffer const * pv1, fsl_buffer const * pv2, fsl_diff_opt const * const cfg, int **outRaw ); /** If zDate is an ISO8601-format string, optionally with a .NNN fractional suffix, then this function returns true and sets *pOut (if pOut is not NULL) to the corresponding Julian value. If zDate is not an ISO8601-format string then this returns false and pOut is not modified. |
︙ | ︙ | |||
5366 5367 5368 5369 5370 5371 5372 | FSL_EXPORT fsl_size_t fsl_simplify_sql( char * sql, fsl_int_t len ); /** Convenience form of fsl_simplify_sql() which assumes b holds an SQL string. It gets processed by fsl_simplify_sql() and its 'used' length potentially gets adjusted to match the adjusted SQL string. */ | | > | | | < < | > | 5035 5036 5037 5038 5039 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058 5059 5060 | FSL_EXPORT fsl_size_t fsl_simplify_sql( char * sql, fsl_int_t len ); /** Convenience form of fsl_simplify_sql() which assumes b holds an SQL string. It gets processed by fsl_simplify_sql() and its 'used' length potentially gets adjusted to match the adjusted SQL string. */ FSL_EXPORT fsl_size_t fsl_simplify_sql_buffer( fsl_buffer * b ); /** Returns the result of calling the platform's equivalent of isatty(fd). e.g. on Windows this is _isatty() and on Unix isatty(). i.e. it returns a true value (non-0) if it thinks that the given file descriptor value is attached to an interactive terminal, else it returns false. */ FSL_EXPORT char fsl_isatty(int fd); /** A container type for lists of db record IDs. This is used in several places as a cache for record IDs, to keep track of ones we know about, ones we know that we don't know about, and to avoid duplicate processing in some contexts. |
︙ | ︙ | |||
5529 5530 5531 5532 5533 5534 5535 | If merge conflicts are encountered, it continues as best as it can and injects "indiscrete" markers in the output to denote the nature of each conflict. If conflictCount is not NULL then on success the number of merge conflicts is written to *conflictCount. Returns 0 on success, FSL_RC_OOM on OOM, FSL_RC_TYPE if any input | | < < < < < < < < < < | 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226 5227 | If merge conflicts are encountered, it continues as best as it can and injects "indiscrete" markers in the output to denote the nature of each conflict. If conflictCount is not NULL then on success the number of merge conflicts is written to *conflictCount. Returns 0 on success, FSL_RC_OOM on OOM, FSL_RC_TYPE if any input appears to be binary. @see fsl_buffer_contains_merge_marker() */ FSL_EXPORT int fsl_buffer_merge3(fsl_buffer * const pPivot, fsl_buffer * const pV1, fsl_buffer * const pV2, fsl_buffer * const pOut, unsigned int * const conflictCount); /** Appends the first n bytes of string z to buffer b in the form of TCL-format string literal. If n<0 then fsl_strlen() is used to determine the length. Returns 0 on success, FSL_RC_OOM on error. */ FSL_EXPORT int fsl_buffer_append_tcl_literal(fsl_buffer * const b, char const * z, fsl_int_t n); /** Event IDs for use with fsl_confirm_callback_f implementations. The idea here is to send, via callback, events from the library to |
︙ | ︙ | |||
5861 5862 5863 5864 5865 5866 5867 | typedef struct fsl_dircrawl_state fsl_dircrawl_state; /** Callback type for use with fsl_dircrawl(). It gets passed the absolute name of the target directory, the name of the directory entry (no path part), the type of the entry, and the client state pointer which is passed to that routine. It must return 0 on | | < < < | | < < < | 5520 5521 5522 5523 5524 5525 5526 5527 5528 5529 5530 5531 5532 5533 5534 5535 5536 | typedef struct fsl_dircrawl_state fsl_dircrawl_state; /** Callback type for use with fsl_dircrawl(). It gets passed the absolute name of the target directory, the name of the directory entry (no path part), the type of the entry, and the client state pointer which is passed to that routine. It must return 0 on success or another FSL_RC_xxx value on error. Returning FSL_RC_BREAK will cause directory-crawling to stop without an error. All pointers in the state argument are owned by fsl_dircrawl() and will be invalidated as soon as the callback returns, thus they must be copied if they are needed for later. */ typedef int (*fsl_dircrawl_f)(fsl_dircrawl_state const *); |
︙ | ︙ | |||
5909 5910 5911 5912 5913 5914 5915 | but libfossil does not.) It silently skips any files for which stat() fails or is not of a "basic" file type (e.g. character devices and such). Returns 0 on success, FSL_RC_TYPE if the given name is not a directory, and FSL_RC_RANGE if it recurses "too deep," (some | | | | < | 5562 5563 5564 5565 5566 5567 5568 5569 5570 5571 5572 5573 5574 5575 5576 5577 5578 5579 5580 5581 | but libfossil does not.) It silently skips any files for which stat() fails or is not of a "basic" file type (e.g. character devices and such). Returns 0 on success, FSL_RC_TYPE if the given name is not a directory, and FSL_RC_RANGE if it recurses "too deep," (some "reasonable" internally hard-coded limit), in order to prevent a stack overflow. If the callback returns non-0, iteration stops and returns that result code unless the result is FSL_RC_BREAK, which stops iteration but causes 0 to be returned from this function. */ FSL_EXPORT int fsl_dircrawl(char const * dirName, fsl_dircrawl_f callback, void * callbackState); /** Strips any trailing slashes ('/') from the given string by assigning those bytes to NUL and returns the number of slashes |
︙ | ︙ | |||
5977 5978 5979 5980 5981 5982 5983 | FSL_LOOKSLIKE_BINARY = FSL_LOOKSLIKE_NUL | FSL_LOOKSLIKE_LONG | FSL_LOOKSLIKE_SHORT, /* Line separators. */ FSL_LOOKSLIKE_EOL = (FSL_LOOKSLIKE_LONE_CR | FSL_LOOKSLIKE_LONE_LF | FSL_LOOKSLIKE_CRLF) }; /** Returns true if b appears to contain "binary" (non-UTF8/16) content, | | | 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638 5639 5640 5641 5642 5643 | FSL_LOOKSLIKE_BINARY = FSL_LOOKSLIKE_NUL | FSL_LOOKSLIKE_LONG | FSL_LOOKSLIKE_SHORT, /* Line separators. */ FSL_LOOKSLIKE_EOL = (FSL_LOOKSLIKE_LONE_CR | FSL_LOOKSLIKE_LONE_LF | FSL_LOOKSLIKE_CRLF) }; /** Returns true if b appears to contain "binary" (non-UTF8/16) content, else returns true. */ FSL_EXPORT bool fsl_looks_like_binary(fsl_buffer const * const b); /** If b appears to contain any non-UTF8 content, returns a truthy value: one or more values from the fsl_lookslike_e enum indicating which sort of data was seen which triggered its conclusion: |
︙ | ︙ | |||
6045 6046 6047 6048 6049 6050 6051 | Returns true if b starts with a UTF8 BOM. If the 2nd argument is not NULL, *pBomSize is set to the number of bytes in the BOM (always 3), regardless of whether or not the function returns true or false. */ FSL_EXPORT bool fsl_starts_with_bom_utf8(fsl_buffer const * const b, unsigned int *pBomSize); | < < < < < < < < | 5697 5698 5699 5700 5701 5702 5703 5704 5705 5706 5707 5708 5709 5710 | Returns true if b starts with a UTF8 BOM. If the 2nd argument is not NULL, *pBomSize is set to the number of bytes in the BOM (always 3), regardless of whether or not the function returns true or false. */ FSL_EXPORT bool fsl_starts_with_bom_utf8(fsl_buffer const * const b, unsigned int *pBomSize); #if 0 /** The UTF16 counterpart of fsl_looks_like_utf8(), with the addition that the 2nd argument, if true, specifies that the 2nd argument is true then the contents of the buffer are byte-swapped for checking purposes. This is not validate that the blob is valid UTF16. It assumes that all |
︙ | ︙ | |||
6088 6089 6090 6091 6092 6093 6094 | /* ^^^^ UTF-16 interfaces */ #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_UTIL_H_INCLUDED */ | | | | | 5732 5733 5734 5735 5736 5737 5738 5739 5740 5741 5742 5743 5744 5745 5746 5747 5748 5749 5750 5751 5752 5753 5754 5755 5756 5757 5758 5759 5760 5761 5762 5763 | /* ^^^^ UTF-16 interfaces */ #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_UTIL_H_INCLUDED */ /* end of file ../include/fossil-scm/fossil-util.h */ /* start of file ../include/fossil-scm/fossil-core.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_CORE_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_CORE_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /** @file fossil-core.h This file declares the core SCM-related public APIs. */ #include <time.h> /* struct tm, time_t */ #if defined(__cplusplus) /** |
︙ | ︙ | |||
6208 6209 6210 6211 6212 6213 6214 | fsl_cx_db_repo() and fsl_cx_db_ckout() will always return the same database handle, but they can tell whether a given role has been attached or not and will fail in their documented ways when the role's corresponding database has not yet been attached. e.g. `fsl_cx_db_repo()` will return `NULL` if a repo database is not attached. | | > | 5852 5853 5854 5855 5856 5857 5858 5859 5860 5861 5862 5863 5864 5865 5866 5867 | fsl_cx_db_repo() and fsl_cx_db_ckout() will always return the same database handle, but they can tell whether a given role has been attached or not and will fail in their documented ways when the role's corresponding database has not yet been attached. e.g. `fsl_cx_db_repo()` will return `NULL` if a repo database is not attached. @see fsl_db_role_label() @see fsl_cx_db_name_for_role() @see fsl_cx_db_file_for_role() */ enum fsl_dbrole_e { /** Sentinel "no role" value. */ FSL_DBROLE_NONE = 0, |
︙ | ︙ | |||
6304 6305 6306 6307 6308 6309 6310 | FSL_CX_F_CALC_R_CARD = 0x01, /** When encounting artifact types in the crosslinking phase which the library does not currently support crosslinking for, skip over them instead of generating an error. For day-to-day use this is, perhaps counter-intuitively, generally desirable. | < < < < | 5949 5950 5951 5952 5953 5954 5955 5956 5957 5958 5959 5960 5961 5962 | FSL_CX_F_CALC_R_CARD = 0x01, /** When encounting artifact types in the crosslinking phase which the library does not currently support crosslinking for, skip over them instead of generating an error. For day-to-day use this is, perhaps counter-intuitively, generally desirable. */ FSL_CX_F_SKIP_UNKNOWN_CROSSLINKS = 0x02, /** By default, fsl_reserved_fn_check() will fail if the given filename is reserved on Windows platforms because such filenames cannot be checked out on Windows. This flag removes that limitation. It |
︙ | ︙ | |||
6622 6623 6624 6625 6626 6627 6628 | Special case of FSL_RC_TYPE triggered in some diff APIs, indicating that the API cannot diff what appears to be binary data. */ FSL_RC_DIFF_BINARY, /** Triggered by some diff APIs to indicate that only whitespace changes we found and the diff was requested to ignore whitespace. | | | 6263 6264 6265 6266 6267 6268 6269 6270 6271 6272 6273 6274 6275 6276 6277 | Special case of FSL_RC_TYPE triggered in some diff APIs, indicating that the API cannot diff what appears to be binary data. */ FSL_RC_DIFF_BINARY, /** Triggered by some diff APIs to indicate that only whitespace changes we found and the diff was requested to ignore whitespace. */ FSL_RC_DIFF_WS_ONLY, /** Intended to be used with fsl_cx_interrupt() by signal handlers and UI threads. */ FSL_RC_INTERRUPTED, |
︙ | ︙ | |||
6677 6678 6679 6680 6681 6682 6683 | /** Returns the value of FSL_LIBRARY_VERSION used to compile the library. If this value differs from the value the caller was compiled with, Chaos might ensue. The API does not yet have any mechanism for determining | | | | | < < | 6318 6319 6320 6321 6322 6323 6324 6325 6326 6327 6328 6329 6330 6331 6332 6333 6334 6335 6336 6337 6338 6339 | /** Returns the value of FSL_LIBRARY_VERSION used to compile the library. If this value differs from the value the caller was compiled with, Chaos might ensue. The API does not yet have any mechanism for determining compatibility between repository versions and it also currently does no explicit checking to disallow incompatible versions. */ FSL_EXPORT char const * fsl_library_version(); /** Returns true (non-0) if yourLibVersion compares lexically equal to FSL_LIBRARY_VERSION, else it returns false (0). */ FSL_EXPORT bool fsl_library_version_matches(char const * yourLibVersion); /** This type, accessible to clients via the ::fsl_lib_configurable global, contains configuration-related data for the library which can be swapped out by clients. |
︙ | ︙ | |||
6725 6726 6727 6728 6729 6730 6731 | /** A part of the configuration used by fsl_cx_init() and friends. */ struct fsl_cx_config { /** If true, all SQL which goes through the fossil engine | | < < | 6364 6365 6366 6367 6368 6369 6370 6371 6372 6373 6374 6375 6376 6377 6378 | /** A part of the configuration used by fsl_cx_init() and friends. */ struct fsl_cx_config { /** If true, all SQL which goes through the fossil engine will be traced to the fsl_output()-configured channel. */ bool traceSql; /** If true, the fsl_print() SQL function will output its output to the fsl_output()-configured channel, else it is a no-op. */ bool sqlPrint; |
︙ | ︙ | |||
6916 6917 6918 6919 6920 6921 6922 | of the parameters and return value. */ FSL_EXPORT int fsl_cx_err_get( fsl_cx * const f, char const ** str, fsl_size_t * len ); /** Returns f's error state object. This pointer is guaranteed by the API to be stable until f is finalized, but its contents are | | > > | 6553 6554 6555 6556 6557 6558 6559 6560 6561 6562 6563 6564 6565 6566 6567 6568 6569 | of the parameters and return value. */ FSL_EXPORT int fsl_cx_err_get( fsl_cx * const f, char const ** str, fsl_size_t * len ); /** Returns f's error state object. This pointer is guaranteed by the API to be stable until f is finalized, but its contents are modified my routines as part of the error reporting process. Returns NULL if !f. */ FSL_EXPORT fsl_error const * fsl_cx_err_get_e(fsl_cx const * f); /** Resets's f's error state, basically equivalent to fsl_cx_err_set(f,0,NULL). This may be necessary for apps if they rely on looking at fsl_cx_err_get() at the end of their |
︙ | ︙ | |||
7037 7038 7039 7040 7041 7042 7043 7044 7045 7046 7047 7048 7049 7050 | FSL_EXPORT int fsl_outputf( fsl_cx * const f, char const * fmt, ... ); /** va_list counterpart to fsl_outputf(). */ FSL_EXPORT int fsl_outputfv( fsl_cx * const f, char const * fmt, va_list args ); /** Sets or clears (if userName is NULL or empty) the default repository user name for operations which require one. Returns 0 on success, FSL_RC_MISUSE if f is NULL, FSL_RC_OOM if copying of the userName fails. | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 6676 6677 6678 6679 6680 6681 6682 6683 6684 6685 6686 6687 6688 6689 6690 6691 6692 6693 6694 6695 6696 6697 6698 6699 6700 6701 6702 6703 6704 6705 6706 6707 6708 6709 6710 6711 6712 6713 6714 6715 6716 6717 6718 6719 6720 6721 6722 6723 6724 6725 6726 6727 6728 6729 6730 6731 6732 6733 6734 6735 6736 6737 6738 6739 6740 6741 6742 6743 6744 6745 6746 6747 6748 6749 | FSL_EXPORT int fsl_outputf( fsl_cx * const f, char const * fmt, ... ); /** va_list counterpart to fsl_outputf(). */ FSL_EXPORT int fsl_outputfv( fsl_cx * const f, char const * fmt, va_list args ); /** Opens the given db file name as f's repository. Returns 0 on success. On error it sets f's error state and returns that code unless the error was FSL_RC_MISUSE (which indicates invalid arguments and it does not set the error state). Returns FSL_RC_ACCESS if f already has an opened repo db (use fsl_repo_close() or fsl_ckout_close() to close it). Returns FSL_RC_NOT_FOUND if repoDbFile is not found, as this routine cannot create a new repository db. Results are undefined if any argument is NULL. When a repository is opened, the fossil-level user name associated with f (if any) is overwritten with the default user from the repo's login table (the one with uid=1). Thus fsl_cx_user_get() may return a value even if the client has not called fsl_cx_user_set(). It would be nice to have a parameter specifying that the repo should be opened read-only. That's not as straightforward as it sounds because of how the various dbs are internally managed (via one db handle). Until then, the permissions of the underlying repo file will determine how it is opened. i.e. a read-only repo will be opened read-only. Potentially interesting side-effects: - On success this re-sets several bits of f's configuration to match the repository-side settings. @see fsl_repo_create() @see fsl_repo_close() */ FSL_EXPORT int fsl_repo_open( fsl_cx * const f, char const * repoDbFile/*, char readOnlyCurrentlyIgnored*/ ); /** If fsl_repo_open_xxx() has been used to open a respository db, this call closes that db. Returns 0 on success or if no config db is opened. It may propagate an error from the db layer if closing/detaching the db fails. Returns FSL_RC_MISUSE if f has any transactions pending or if f still has a checkout opened (a checkout db is only valid in conjunction with its repository db). If a repository is opened "indirectly" via fsl_ckout_open_dir() then attempting to close it using this function will result in FSL_RC_MISUSE and f's error state will hold a description of the problem (the checkout must be closed before closing its repository). Such a repository will be closed implicitly when the checkout db is closed. @see fsl_repo_open() @see fsl_repo_create() */ FSL_EXPORT int fsl_repo_close( fsl_cx * const f ); /** Sets or clears (if userName is NULL or empty) the default repository user name for operations which require one. Returns 0 on success, FSL_RC_MISUSE if f is NULL, FSL_RC_OOM if copying of the userName fails. |
︙ | ︙ | |||
7080 7081 7082 7083 7084 7085 7086 | be invalidated by any future calls to fsl_cx_user_set(). @see fsl_cx_user_guess() */ FSL_EXPORT char const * fsl_cx_user_get( fsl_cx const * const f ); /** | > > > > | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | 6779 6780 6781 6782 6783 6784 6785 6786 6787 6788 6789 6790 6791 6792 6793 6794 6795 6796 6797 6798 6799 6800 6801 6802 6803 6804 6805 6806 6807 6808 6809 6810 6811 6812 6813 6814 6815 6816 6817 6818 6819 6820 6821 6822 6823 6824 6825 6826 6827 6828 6829 6830 6831 6832 6833 6834 6835 6836 6837 6838 6839 6840 6841 6842 6843 6844 6845 6846 6847 6848 6849 6850 6851 6852 6853 6854 6855 6856 6857 6858 6859 6860 6861 6862 6863 6864 6865 6866 6867 6868 6869 6870 6871 6872 6873 6874 6875 6876 6877 6878 6879 6880 6881 6882 6883 6884 6885 6886 6887 6888 6889 6890 6891 6892 6893 6894 6895 6896 6897 6898 6899 6900 6901 6902 6903 6904 6905 6906 6907 6908 6909 6910 6911 6912 6913 6914 6915 6916 6917 6918 6919 6920 6921 6922 6923 6924 6925 6926 6927 6928 6929 6930 6931 6932 6933 6934 6935 6936 6937 6938 6939 6940 6941 6942 6943 6944 6945 6946 6947 6948 6949 6950 6951 6952 6953 6954 6955 6956 6957 6958 6959 6960 6961 6962 6963 6964 6965 6966 6967 6968 6969 6970 6971 6972 6973 6974 6975 6976 6977 6978 6979 6980 6981 6982 6983 6984 6985 6986 6987 6988 6989 6990 6991 6992 6993 6994 6995 6996 6997 6998 6999 7000 7001 7002 7003 7004 7005 7006 7007 7008 7009 7010 7011 7012 7013 7014 7015 7016 7017 7018 7019 7020 7021 7022 7023 7024 7025 7026 7027 7028 7029 7030 7031 7032 7033 7034 7035 7036 7037 7038 7039 7040 7041 7042 7043 7044 7045 7046 7047 7048 7049 7050 7051 7052 7053 7054 7055 7056 7057 7058 7059 7060 | be invalidated by any future calls to fsl_cx_user_set(). @see fsl_cx_user_guess() */ FSL_EXPORT char const * fsl_cx_user_get( fsl_cx const * const f ); /** Configuration parameters for fsl_repo_create(). Always copy-construct these from fsl_repo_create_opt_empty resp. fsl_repo_create_opt_empty_m in order to ensure proper behaviour vis-a-vis default values. TODOs: - Add project name/description, and possibly other configuration bits. - Allow client to set password for default user (currently set randomly, as fossil(1) does). */ struct fsl_repo_create_opt { /** The file name for the new repository. */ char const * filename; /** Fossil user name for the admin user in the new repo. If NULL, defaults to the Fossil context's user (see fsl_cx_user_get()). If that is NULL, it defaults to "root" for historical reasons. */ char const * username; /** The comment text used for the initial commit. If NULL or empty (starts with a NUL byte) then no initial check is created. fossil(1) is largely untested with that scenario (but it seems to work), so for compatibility it is not recommended that this be set to NULL. The default value (when copy-initialized) is "egg". There's a story behind the use of "egg" as the initial checkin comment, and it all started with a typo: "initial chicken" */ char const * commitMessage; /** Mime type for the commit message (manifest N-card). Manifests support this but fossil(1) has never (as of 2021-02) made use of it. It is provided for completeness but should, for compatibility's sake, probably not be set, as the fossil UI may not honor it. The implied default is text/x-fossil-wiki. Other ostensibly legal values include text/plain and text/x-markdown. This API will accept any value, but results are technically undefined with any values other than those listed above. */ char const * commitMessageMimetype; /** If not NULL and not empty, fsl_repo_create() will use this repository database to copy the configuration, copying over the following settings: - The reportfmt table, overwriting any existing entries. - The user table fields (cap, info, mtime, photo) are copied for the "system users". The system users are: anonymous, nobody, developer, reader. - The vast majority of the config table is copied, arguably more than it should (e.g. the 'manifest' setting). */ char const * configRepo; /** If false, fsl_repo_create() will fail if this->filename already exists. */ bool allowOverwrite; }; typedef struct fsl_repo_create_opt fsl_repo_create_opt; /** Initialized-with-defaults fsl_repo_create_opt struct, intended for in-struct initialization. */ #define fsl_repo_create_opt_empty_m { \ NULL/*filename*/, \ NULL/*username*/, \ "egg"/*commitMessage*/, \ NULL/*commitMessageMimetype*/, \ NULL/*configRepo*/, \ false/*allowOverwrite*/ \ } /** Initialized-with-defaults fsl_repo_create_opt struct, intended for copy-initialization. */ FSL_EXPORT const fsl_repo_create_opt fsl_repo_create_opt_empty; /** Creates a new repository database using the options provided in the second argument. If f is not NULL, it must be a valid context instance, though it need not have an opened checkout/repository. If f has an opened repo or checkout, this routine closes them but that closing _will fail_ if a transaction is currently active! If f is NULL, a temporary context is used for creating the repository, in which case the caller will not have access to detailed error information (only the result code) if this operation fails. In that case, the resulting repository file will, on success, be found at the location referred to by opt.filename. The opt argument may not be NULL. If opt->allowOverwrite is false (0) and the file exists, it fails with FSL_RC_ALREADY_EXISTS, otherwise is creates/overwrites the file. This is a destructive operation if opt->allowOverwrite is true, so be careful: the existing database will be truncated and re-created. This operation installs the various "static" repository schemas into the db, sets up some default settings, and installs a default user. This operation always closes any repository/checkout opened by f because setting up the new db requires wiring it to f to set up some of the db-side infrastructure. The one exception is if argument validation fails, in which case f's repo/checkout-related state are not modified. Note that closing will fail if a transaction is currently active and that, in turn, will cause this operation to fail. See the fsl_repo_create_opt docs for more details regarding the creation options. On success, 0 is returned and f (if not NULL) is left with the new repository opened and ready for use. On error, f's error state is updated and any number of the FSL_RC_xxx codes may be returned - there are no less than 30 different _potential_ error conditions on the way to creating a new repository. If initialization of the repository fails, this routine will attempt to remove its partially-initialize corpse from the filesystem but will ignore any errors encountered while doing so. Example usage: ``` fsl_repo_create_opt opt = fsl_repo_create_opt_empty; int rc; opt.filename = "my.fossil"; // ... any other opt.xxx you want to set, e.g.: // opt.user = "fred"; // Assume fsl is a valid fsl_cx instance: rc = fsl_repo_create(fsl, &opt); if(rc) { ...error... } else { fsl_db * db = fsl_cx_db_repo(f); assert(db); // == the new repo db ... } ``` @see fsl_repo_open() @see fsl_repo_close() */ FSL_EXPORT int fsl_repo_create(fsl_cx * f, fsl_repo_create_opt const * opt ); /** UNTESTED. Returns true if f has an opened repository database which is opened in read-only mode, else returns false. */ FSL_EXPORT char fsl_repo_is_readonly(fsl_cx const * f); /** Tries to open a checked-out fossil repository db in the given directory. The (dirName, checkParentDirs) parameters are passed on as-is to fsl_ckout_db_search() to find a checkout db, so see that routine for how it searches. If this routine finds/opens a checkout, it also tries to open the repository database from which the checkout derives, and fails if it cannot. The library never allows a checkout to be opened without its corresponding repository partner because a checkout has hard dependencies on the repo's state. Returns 0 on success. If there is an error opening or validating the checkout or its repository db, f's error state will be updated. Error codes/conditions include: - FSL_RC_MISUSE if f is NULL. - FSL_RC_ACCESS if f already has and opened checkout. - FSL_RC_OOM if an allocation fails. - FSL_RC_NOT_FOUND if no checkout is foud or if a checkout's repository is not found. - FSL_RC_RANGE if dirname is not NULL but has a length of 0. - Various codes from fsl_getcwd() (if dirName is NULL). - Various codes if opening the associated repository DB fails. TODO: there's really nothing in the architecture which restricts a checkout db to being in the same directory as the checkout, except for some historical bits which "could" be refactored. It "might be interesting" to eventually provide a variant which opens a checkout db file directly. We have the infrastructure, just need some refactoring. We would need to add the working directory path to the checkout db's config (`vvar` table), but should otherwise require no trickery or incompatibilities with fossil(1). */ FSL_EXPORT int fsl_ckout_open_dir( fsl_cx * f, char const * dirName, bool checkParentDirs ); /** Searches the given directory (or the current directory if dirName is 0) for a fossil checkout database file named one of (_FOSSIL_, .fslckout). If it finds one, it returns 0 and appends the file's path to pOut if pOut is not 0. If neither is found AND if checkParentDirs is true an then it moves up the path one directory and tries again, until it hits the root of the dirPath (see below for a note/caveat). If dirName is NULL then it behaves as if it had been passed the absolute path of the current directory (as determined by fsl_getcwd()). This function does no normalization of dirName. Because of that... Achtung: if dirName is relative, this routine might not find a checkout where it would find one if given an absolute path (because it traverses the path string given it instead of its canonical form). Wether this is a bug or a feature is not yet clear. When in doubt, use fsl_file_canonical_name() to normalize the directory name before passing it in here. If it turns out that we always want that behaviour, this routine will be modified to canonicalize the name. This routine can return at least the following error codes: - FSL_RC_NOT_FOUND: either no checkout db was found or the given directory was not found. - FSL_RC_RANGE if dirName is an empty string. (We could arguably interpret this as a NULL string, i.e. the current directory.) - FSL_RC_OOM if allocation of a filename buffer fails. */ FSL_EXPORT int fsl_ckout_db_search( char const * dirName, bool checkParentDirs, fsl_buffer * const pOut ); /** If fsl_ckout_open_dir() (or similar) has been used to open a checkout db, this call closes that db. Returns 0 on success or if no config db is opened. It may propagate an error from the db layer if closing/detaching the db fails. Returns FSL_RC_MISUSE if f has any transactions pending. This also closes the repository which was implicitly opened for the checkout. */ FSL_EXPORT int fsl_ckout_close( fsl_cx * const f ); /** Attempts to close any opened databases (repo/checkout/config). This will fail if any transactions are pending. Any databases which are already closed are silently skipped. This will fail if any cached statements are currently active for the being-closed db(s). "Active" means that fsl_db_prepare_cached() was used without a corresponding call to fsl_stmt_cached_yield(). */ FSL_EXPORT int fsl_cx_close_dbs( fsl_cx * const f ); |
︙ | ︙ | |||
7143 7144 7145 7146 7147 7148 7149 7150 7151 7152 7153 7154 7155 7156 | Note that the role of FSL_DBROLE_TEMP is invalid here. */ FSL_EXPORT char const * fsl_cx_db_file_for_role(fsl_cx const * f, fsl_dbrole_e r, fsl_size_t * len); /** If f has an opened checkout db (from fsl_ckout_open_dir()) then this function returns the directory part of the path for the checkout, including (for historical and internal convenience reasons) a trailing slash. The returned bytes are valid until that db connection is closed. If len is not NULL then *len is (on success) assigned to the length of the returned string, in bytes. | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 7106 7107 7108 7109 7110 7111 7112 7113 7114 7115 7116 7117 7118 7119 7120 7121 7122 7123 7124 7125 7126 7127 7128 7129 7130 7131 7132 7133 7134 7135 7136 7137 7138 7139 7140 7141 7142 7143 7144 7145 7146 7147 7148 7149 | Note that the role of FSL_DBROLE_TEMP is invalid here. */ FSL_EXPORT char const * fsl_cx_db_file_for_role(fsl_cx const * f, fsl_dbrole_e r, fsl_size_t * len); /** Similar to fsl_cx_db_file_ckout() and friends except that it applies to DB name (as opposed to DB _file_ name) implied by the specified role (2nd parameter). If no such role is opened, or the role is invalid, NULL is returned. If the 3rd argument is not NULL, it is set to the length, in bytes, of the returned string. The returned strings are static and NUL-terminated. This is the "easiest" way to figure out the DB name of the given role, independent of what order f's databases were opened (because the first-opened DB is always called "main"). The Fossil-standard names of its primary databases are: "localdb" (checkout), "repository", and "configdb" (global config DB), but libfossil uses "ckout", "repo", and "cfg", respective. So long as queries use table names which unambiguously refer to a given database, the DB name is normally not needed. It is needed when creating new non-TEMP db tables and views. By default such tables/views would go into the "main" DB, which is actually a transient DB in this API, so it's important to use the correct DB name when creating such constructs. Note that the role of FSL_DBROLE_TEMP is invalid here. */ FSL_EXPORT char const * fsl_cx_db_name_for_role(fsl_cx const * f, fsl_dbrole_e r, fsl_size_t * len); /** If f has an opened checkout db (from fsl_ckout_open_dir()) then this function returns the directory part of the path for the checkout, including (for historical and internal convenience reasons) a trailing slash. The returned bytes are valid until that db connection is closed. If len is not NULL then *len is (on success) assigned to the length of the returned string, in bytes. |
︙ | ︙ | |||
7164 7165 7166 7167 7168 7169 7170 | */ FSL_EXPORT char const * fsl_cx_ckout_dir_name(fsl_cx const * f, fsl_size_t * len); /** Returns a handle to f's main db (which may or may not have any relationship to the repo/checkout/config databases - that's | | | < < < < | | | | < | 7157 7158 7159 7160 7161 7162 7163 7164 7165 7166 7167 7168 7169 7170 7171 7172 7173 7174 7175 7176 7177 7178 7179 7180 7181 7182 7183 7184 7185 7186 7187 7188 7189 7190 7191 7192 7193 7194 | */ FSL_EXPORT char const * fsl_cx_ckout_dir_name(fsl_cx const * f, fsl_size_t * len); /** Returns a handle to f's main db (which may or may not have any relationship to the repo/checkout/config databases - that's unspecified!), or NULL if !f. The returned object is owned by f and the client MUST NOT do any of the following: - Close the db handle. - Use transactions without using fsl_db_transaction_begin() and friends. - Fiddle with the handle's internals. Doing so might confuse its owning context. Clients MAY add new user-defined functions, use the handle with fsl_db_prepare(), and other "mundane" db-related tasks. Design notes: The current architecture uses an in-memory db as the "main" db and attaches the repo, checkout, and config dbs using well-defined names. Even so, it uses separate fsl_db instances to track each one so that we "could," if needed, switch back to a multi-db-instance approach if needed. @see fsl_cx_db_repo() @see fsl_cx_db_ckout() */ FSL_EXPORT fsl_db * fsl_cx_db( fsl_cx * const f ); /** If f is not NULL and has had its repo opened via fsl_repo_open(), fsl_ckout_open_dir(), or similar, this returns a pointer to that database, else it returns NULL. |
︙ | ︙ | |||
7253 7254 7255 7256 7257 7258 7259 | /** Opens the given database file as f's configuration database. If f already has a config database opened then: 1) If passed a NULL dbName or dbName is an empty string then this | | > > > > > > > > > | | < < | < < < < | | | | < < < | | < < < | 7241 7242 7243 7244 7245 7246 7247 7248 7249 7250 7251 7252 7253 7254 7255 7256 7257 7258 7259 7260 7261 7262 7263 7264 7265 7266 7267 7268 7269 7270 7271 7272 7273 7274 7275 7276 7277 7278 7279 7280 7281 7282 7283 7284 7285 7286 7287 7288 7289 7290 7291 7292 7293 7294 7295 7296 7297 7298 7299 7300 7301 7302 | /** Opens the given database file as f's configuration database. If f already has a config database opened then: 1) If passed a NULL dbName or dbName is an empty string then this function returns without side-effects. 2) If passed a non-NULL/non-empty dbName, any existing config db is closed before opening the named one. The database is created and populated with an initial schema if needed. If dbName is NULL or empty then it uses a default db name, "probably" under the user's home directory (see fsl_config_global_preferred_name()). To get the name of the database after it has been opened/attached, use fsl_cx_db_file_config(). Results are undefined if f is NULL or not properly initialized. TODO(?): strongly consider supporting non-attached (i.e. sqlite3_open()'d) use of the config db. Comments in fossil(1) suggest that it is possible to lock the config db for other apps when it is attached to a long-running op by a fossil process. That change is easier said than done, as it affects many different functions and rules out any SQL JOINs against the rest of the repository state (whether any such joins are needed is as yet unknown). @see fsl_cx_db_config() @see fsl_config_close() @see fsl_config_global_preferred_name() */ FSL_EXPORT int fsl_config_open( fsl_cx * const f, char const * dbName ); /** Closes/detaches the database connection opened by fsl_config_open(). Returns 0 on success or if no config db is opened. It may propagate an error from the db layer if closing/detaching the db fails. ACHTUNG: the config handle cannot be closed if any active (stepped-but-not-reset) statements are opened on any of f's db handles because the attached config db will be locked for the duration of such statements. In such cases, this routine WILL FAIL. @see fsl_cx_db_config() @see fsl_config_open() */ FSL_EXPORT int fsl_config_close( fsl_cx * const f ); /** If f has an opened/attached configuration db then its handle is returned, else 0 is returned. @see fsl_config_open() @see fsl_config_close() */ FSL_EXPORT fsl_db * fsl_cx_db_config( fsl_cx * const f ); /** |
︙ | ︙ | |||
7432 7433 7434 7435 7436 7437 7438 | Returns 0 on success. On stat() error, nameOut is not updated, but after stat()'ing, allocation of memory for nameOut's buffer may fail. If zName ends with a trailing slash, that slash is retained in nameOut. | | | | | | < < < < | | | < < < | | 7417 7418 7419 7420 7421 7422 7423 7424 7425 7426 7427 7428 7429 7430 7431 7432 7433 7434 7435 7436 7437 7438 7439 7440 7441 7442 7443 7444 7445 7446 7447 7448 7449 7450 7451 7452 7453 7454 7455 7456 7457 7458 7459 | Returns 0 on success. On stat() error, nameOut is not updated, but after stat()'ing, allocation of memory for nameOut's buffer may fail. If zName ends with a trailing slash, that slash is retained in nameOut. This function DOES NOT resolve symlinks, stat()nig the link instead of what it points to. @see fsl_cx_stat() */ FSL_EXPORT int fsl_cx_stat2( fsl_cx * const f, bool relativeToCwd, char const * zName, fsl_fstat * const tgt, fsl_buffer * const nameOut, bool fullPath); /** Sets the case-sensitivity flag for f to the given value. This flag alters how some filename-search/comparison operations operate. This option is only intended to have an effect on plaforms with case-insensitive filesystems. @see fsl_cx_is_case_sensitive() */ FSL_EXPORT void fsl_cx_case_sensitive_set(fsl_cx * f, bool caseSensitive); /** Returns true (non-0) if f is set for case-sensitive filename handling, else 0. Returns 0 if !f. @see fsl_cx_case_sensitive_set() */ FSL_EXPORT bool fsl_cx_is_case_sensitive(fsl_cx const * f); /** If f is set to use case-sensitive filename handling, returns a pointer to an empty string, otherwise a pointer to the string "COLLATE nocase" is returned. Results are undefined if f is NULL. The returned bytes are static. |
︙ | ︙ | |||
7671 7672 7673 7674 7675 7676 7677 | - "ignore-glob" = FSL_GLOBS_IGNORE - "binary-glob" = FSL_GLOBS_BINARY - "crnl-glob" = FSL_GLOBS_CRNL - Anything else = FSL_GLOBS_INVALID To simplify this function's use via an SQL-accessible UDF, the `*-glob` names may be passed in without their `-glob` suffix, | | | 7649 7650 7651 7652 7653 7654 7655 7656 7657 7658 7659 7660 7661 7662 7663 | - "ignore-glob" = FSL_GLOBS_IGNORE - "binary-glob" = FSL_GLOBS_BINARY - "crnl-glob" = FSL_GLOBS_CRNL - Anything else = FSL_GLOBS_INVALID To simplify this function's use via an SQL-accessible UDF, the `*-glob` names may be passed in without their `-glob` suffix, e.g. `"igore"` instead of `"ignore-glob"`. */ FSL_EXPORT fsl_glob_category_e fsl_glob_name_to_category(char const * str); /** Fetches f's glob list of the given category. If forceReload is true then the context will check whether the list has had any content added to its source since it was initially loaded. |
︙ | ︙ | |||
7758 7759 7760 7761 7762 7763 7764 | const char * zFilename, fsl_buffer * pOut); /** Works like fsl_getcwd() but updates f's error state on error and appends the current directory's name to the given buffer. Returns 0 on success. */ | | | 7736 7737 7738 7739 7740 7741 7742 7743 7744 7745 7746 7747 7748 7749 7750 | const char * zFilename, fsl_buffer * pOut); /** Works like fsl_getcwd() but updates f's error state on error and appends the current directory's name to the given buffer. Returns 0 on success. */ FSL_EXPORT int fsl_cx_getcwd(fsl_cx * f, fsl_buffer * pOut); /** Returns the same as passing fsl_cx_db() to fsl_db_transaction_level(), or 0 if f has no db opened. @see fsl_cx_db() */ |
︙ | ︙ | |||
7907 7908 7909 7910 7911 7912 7913 | The va_list counterpart of fsl_cx_interrupt(). */ FSL_EXPORT int fsl_cx_interruptv(fsl_cx * const f, int code, char const * fmt, va_list args); /** If f's is-interrupted flag is set, this function returns its value. Note that there is inherently a race condition when calling | | < < < < < < < < < < < < < < < < < < < | 7885 7886 7887 7888 7889 7890 7891 7892 7893 7894 7895 7896 7897 7898 7899 7900 7901 7902 7903 | The va_list counterpart of fsl_cx_interrupt(). */ FSL_EXPORT int fsl_cx_interruptv(fsl_cx * const f, int code, char const * fmt, va_list args); /** If f's is-interrupted flag is set, this function returns its value. Note that there is inherently a race condition when calling fsl_cx_interrupt() (to set the flag) from another thread (e.g. a UI thread while showing a progress indicator). */ FSL_EXPORT int fsl_cx_interrupted(fsl_cx const * const f); #if 0 /** DO NOT USE - not yet tested and ready. Returns the result of either localtime(clock) or gmtime(clock), depending on f: |
︙ | ︙ | |||
7970 7971 7972 7973 7974 7975 7976 | */ FSL_EXPORT time_t fsl_cx_time_adj(fsl_cx const * f, time_t clock); #endif #if defined(__cplusplus) } /*extern "C"*/ #endif | > | | | | 7929 7930 7931 7932 7933 7934 7935 7936 7937 7938 7939 7940 7941 7942 7943 7944 7945 7946 | */ FSL_EXPORT time_t fsl_cx_time_adj(fsl_cx const * f, time_t clock); #endif #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_CORE_H_INCLUDED */ /* end of file ../include/fossil-scm/fossil-core.h */ /* start of file ../include/fossil-scm/fossil-db.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_DB_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_DB_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt |
︙ | ︙ | |||
7998 7999 8000 8001 8002 8003 8004 8005 8006 8007 8008 8009 8010 8011 | */ /* We don't _really_ want to include sqlite3.h at this point, but if we do not then we have to typedef the sqlite3 struct here and that breaks when client code includes both this file and sqlite3.h. */ #if defined(__cplusplus) extern "C" { #endif #if 0 /** | > | 7958 7959 7960 7961 7962 7963 7964 7965 7966 7967 7968 7969 7970 7971 7972 | */ /* We don't _really_ want to include sqlite3.h at this point, but if we do not then we have to typedef the sqlite3 struct here and that breaks when client code includes both this file and sqlite3.h. */ #include "sqlite3.h" #if defined(__cplusplus) extern "C" { #endif #if 0 /** |
︙ | ︙ | |||
8022 8023 8024 8025 8026 8027 8028 | #define fsl_commit_hook_empty_m {NULL,0,NULL} typedef struct fsl_commit_hook fsl_commit_hook; /* extern const fsl_commit_hook fsl_commit_hook_empty; */ /** Potential TODO. */ | | | 7983 7984 7985 7986 7987 7988 7989 7990 7991 7992 7993 7994 7995 7996 7997 | #define fsl_commit_hook_empty_m {NULL,0,NULL} typedef struct fsl_commit_hook fsl_commit_hook; /* extern const fsl_commit_hook fsl_commit_hook_empty; */ /** Potential TODO. */ FSL_EXPORT int fsl_db_before_commit_hook( fsl_db * db, fsl_commit_hook_f f, int sequence, void * state ); #endif #if 0 /* We can't do this because it breaks when clients include both this header and sqlite3.h. Is there a solution which lets us _not_ include sqlite3.h from this file and also compiles when |
︙ | ︙ | |||
8065 8066 8067 8068 8069 8070 8071 | in read-write mode, but should not create the db if it does not already exist. */ FSL_OPEN_F_RW = 0x02, /** Flag for fsl_db_open() specifying that the db should be opened in read-write mode, creating the db if it does not already exist. | < < < < < < < < < < < < < | | < | | 8026 8027 8028 8029 8030 8031 8032 8033 8034 8035 8036 8037 8038 8039 8040 8041 8042 8043 8044 8045 8046 8047 8048 8049 8050 8051 8052 8053 | in read-write mode, but should not create the db if it does not already exist. */ FSL_OPEN_F_RW = 0x02, /** Flag for fsl_db_open() specifying that the db should be opened in read-write mode, creating the db if it does not already exist. */ FSL_OPEN_F_CREATE = 0x04, /** Shorthand for RW+CREATE flags. */ FSL_OPEN_F_RWC = FSL_OPEN_F_RW | FSL_OPEN_F_CREATE, /** Tells fsl_repo_open_xxx() to confirm that the db is a repository. */ FSL_OPEN_F_SCHEMA_VALIDATE = 0x20, /** Used by fsl_db_open() to to tell 1the underlying db connection to trace all SQL to stdout. This is often useful for testing, debugging, and learning about what's going on behind the scenes. */ FSL_OPEN_F_TRACE_SQL = 0x40 }; /** |
︙ | ︙ | |||
8490 8491 8492 8493 8494 8495 8496 | Returns NULL on allocation error. */ FSL_EXPORT fsl_stmt * fsl_stmt_malloc(); /** | | | > | 8437 8438 8439 8440 8441 8442 8443 8444 8445 8446 8447 8448 8449 8450 8451 8452 8453 | Returns NULL on allocation error. */ FSL_EXPORT fsl_stmt * fsl_stmt_malloc(); /** If db is not NULL this behaves like fsl_error_get(), using the db's underlying error state. If !db then it returns FSL_RC_MISUSE. */ FSL_EXPORT int fsl_db_err_get( fsl_db const * const db, char const ** msg, fsl_size_t * len ); /** Resets any error state in db, but might keep the string memory allocated for later use. |
︙ | ︙ | |||
8705 8706 8707 8708 8709 8710 8711 | copying fsl_stmt_empty so that this function knows whether or not to fsl_free() them). Returns FSL_RC_MISUSE if !stmt or it has already been finalized (but was not freed). */ FSL_EXPORT int fsl_stmt_finalize( fsl_stmt * const stmt ); /** | | | < < < | | | | < < < | 8653 8654 8655 8656 8657 8658 8659 8660 8661 8662 8663 8664 8665 8666 8667 8668 8669 8670 8671 8672 8673 8674 8675 8676 8677 8678 8679 8680 | copying fsl_stmt_empty so that this function knows whether or not to fsl_free() them). Returns FSL_RC_MISUSE if !stmt or it has already been finalized (but was not freed). */ FSL_EXPORT int fsl_stmt_finalize( fsl_stmt * const stmt ); /** "Steps" the given SQL cursor one time and returns one of the following: FSL_RC_STEP_ROW, FSL_RC_STEP_DONE, FSL_RC_STEP_ERROR. On a db error this will update the underlying db's error state. This function increments stmt->rowCount by 1 if it returns FSL_RC_STEP_ROW. Returns FSL_RC_MISUSE if !stmt or stmt has not been prepared. It is only legal to call the fsl_stmt_g_xxx() and fsl_stmt_get_xxx() functions if this functon returns FSL_RC_STEP_ROW. FSL_RC_STEP_DONE is returned upon successfully ending iteration or if there is no iteration to perform (e.g. a UPDATE or INSERT). @see fsl_stmt_reset() @see fsl_stmt_reset2() @see fsl_stmt_each() */ FSL_EXPORT int fsl_stmt_step( fsl_stmt * const stmt ); |
︙ | ︙ | |||
8797 8798 8799 8800 8801 8802 8803 | /** Equivalent to fsl_stmt_reset2(stmt, 0). */ FSL_EXPORT int fsl_stmt_reset( fsl_stmt * const stmt ); /** Returns the db handle which prepared the given statement, or | | | | | | | | 8739 8740 8741 8742 8743 8744 8745 8746 8747 8748 8749 8750 8751 8752 8753 8754 8755 8756 8757 8758 8759 8760 8761 8762 | /** Equivalent to fsl_stmt_reset2(stmt, 0). */ FSL_EXPORT int fsl_stmt_reset( fsl_stmt * const stmt ); /** Returns the db handle which prepared the given statement, or NULL if !stmt or stmt has not been prepared. */ FSL_EXPORT fsl_db * fsl_stmt_db( fsl_stmt * const stmt ); /** Returns the SQL string used to prepare the given statement, or NULL if !stmt or stmt has not been prepared. If len is not NULL then *len is set to the length of the returned string (which is NUL-terminated). The returned bytes are owned by stmt and are invalidated when it is finalized. */ FSL_EXPORT char const * fsl_stmt_sql( fsl_stmt * const stmt, fsl_size_t * const len ); /** Returns the name of the given 0-based result column index, or NULL if !stmt, stmt is not prepared, or index is out out of |
︙ | ︙ | |||
8833 8834 8835 8836 8837 8838 8839 | */ FSL_EXPORT char const * fsl_stmt_col_name(fsl_stmt * const stmt, int index); /** Returns the result column count for the given statement, or -1 if !stmt or it has not been prepared. Note that this value is cached when the statement is created. Note that non-fetching queries | | | < | | 8775 8776 8777 8778 8779 8780 8781 8782 8783 8784 8785 8786 8787 8788 8789 8790 8791 | */ FSL_EXPORT char const * fsl_stmt_col_name(fsl_stmt * const stmt, int index); /** Returns the result column count for the given statement, or -1 if !stmt or it has not been prepared. Note that this value is cached when the statement is created. Note that non-fetching queries (e.g. INSERT and UPDATE) have a column count of 0. Some non-SELECT constructs, e.g. PRAGMA table_info(tname), behave like SELECT and have a positive column count. @see fsl_stmt_param_count() @see fsl_stmt_col_name() */ FSL_EXPORT int fsl_stmt_col_count( fsl_stmt const * const stmt ); /** |
︙ | ︙ | |||
9035 9036 9037 9038 9039 9040 9041 | Gets a string value from the given 0-based result set column, assigns *out (if out is not NULL) to that value, assigns *outLen (if outLen is not NULL) to *out's length in bytes, and returns 0 on success. Ownership of the string memory is unchanged - it is owned by the statement and the caller should immediately copy it if it will be needed for much longer. | | | < < | | < < | | | < < < | 8976 8977 8978 8979 8980 8981 8982 8983 8984 8985 8986 8987 8988 8989 8990 8991 8992 8993 8994 8995 8996 8997 8998 8999 9000 9001 9002 9003 9004 9005 9006 9007 9008 9009 9010 9011 9012 9013 9014 9015 9016 9017 9018 9019 9020 9021 9022 | Gets a string value from the given 0-based result set column, assigns *out (if out is not NULL) to that value, assigns *outLen (if outLen is not NULL) to *out's length in bytes, and returns 0 on success. Ownership of the string memory is unchanged - it is owned by the statement and the caller should immediately copy it if it will be needed for much longer. Returns FSL_RC_RANGE if index is out of range for stmt, FSL_RC_MISUSE if stmt has no result columns. */ FSL_EXPORT int fsl_stmt_get_text( fsl_stmt * const stmt, int index, char const **out, fsl_size_t * outLen ); /** The Blob counterpart of fsl_stmt_get_text(). Identical to that function except that its output result (3rd paramter) type differs, and it fetches the data as a raw blob, without any sort of string interpretation. Returns FSL_RC_RANGE if index is out of range for stmt, FSL_RC_MISUSE if stmt has no result columns. */ FSL_EXPORT int fsl_stmt_get_blob( fsl_stmt * const stmt, int index, void const **out, fsl_size_t * outLen ); /** Executes multiple SQL statements, ignoring any results they might collect. Returns 0 on success, non-0 on error. On error db->error might be updated to report the problem. */ FSL_EXPORT int fsl_db_exec_multi( fsl_db * const db, const char * sql, ...); /** va_list counterpart of db_exec_multi(). */ FSL_EXPORT int fsl_db_exec_multiv( fsl_db * const db, const char * sql, va_list args); /** Executes a single SQL statement, skipping over any results it may have. Returns 0 on success. On error db's error state may be updated. */ FSL_EXPORT int fsl_db_exec( fsl_db * const db, char const * sql, ... ); /** va_list counterpart of fs_db_exec(). */ FSL_EXPORT int fsl_db_execv( fsl_db * const db, char const * sql, va_list args ); |
︙ | ︙ | |||
9132 9133 9134 9135 9136 9137 9138 | /** Equivalent to fsl_db_transaction_end(db, 1). */ FSL_EXPORT int fsl_db_transaction_rollback(fsl_db * const db); /** | | | | | | | | < < < < | | | | > | | | < < < < < < < < < < < < < < | 9066 9067 9068 9069 9070 9071 9072 9073 9074 9075 9076 9077 9078 9079 9080 9081 9082 9083 9084 9085 9086 9087 9088 9089 9090 9091 9092 9093 9094 9095 9096 9097 9098 9099 9100 9101 9102 9103 9104 9105 9106 9107 9108 9109 9110 9111 9112 9113 9114 9115 9116 | /** Equivalent to fsl_db_transaction_end(db, 1). */ FSL_EXPORT int fsl_db_transaction_rollback(fsl_db * const db); /** Forces a rollback of any pending transaction in db, regardless of the internal transaction begin/end counter. Returns FSL_RC_MISUSE if !db or db is not opened, else returns the value of the underlying ROLLBACK call. This also re-sets/frees any transaction-related state held by db (e.g. db->beforeCommit). Use with care, as this mucks about with db state in a way which is not all that pretty and it may confuse downstream code. Returns 0 on success. */ FSL_EXPORT int fsl_db_rollback_force(fsl_db * const db); /** Decrements the transaction counter incremented by fsl_db_transaction_begin() and commits or rolls back the transaction if the counter goes to 0. If doRollback is true then this rolls back (or schedules a rollback of) a transaction started by fsl_db_transaction_begin(). If doRollback is false is commits (or schedules a commit). If db fsl_db_transaction_begin() is used in a nested manner and doRollback is true for any one of the nested calls, then that value will be remembered, such that the downstream calls to this function within the same transaction will behave like a rollback even if they pass 0 for the second argument. Returns FSL_RC_MISUSE if !db or the db is not opened, 0 if the transaction counter is above 0, else the result of the (potentially many) underlying database operations. Unfortunate low-level co-dependency: if db->f is not NULL and (db->role & FSL_DBROLE_REPO) then this function may perform extra repository-related post-processing on any commit, and checking the result code is particularly important for those cases. */ FSL_EXPORT int fsl_db_transaction_end(fsl_db * const db, bool doRollback); /** Returns the given db's current transaction depth. If the value is negative, its absolute value represents the depth but indicates that a rollback is pending. If it is positive, the transaction is |
︙ | ︙ | |||
9247 9248 9249 9250 9251 9252 9253 | int32_t defaultValue, char const * sql, ... ); /** The int64 counterpart of fsl_db_get_int32(). See that function for the semantics. */ | | | | | | | | | | < | | | | | | | | | | | | | | | | | | | | | 9164 9165 9166 9167 9168 9169 9170 9171 9172 9173 9174 9175 9176 9177 9178 9179 9180 9181 9182 9183 9184 9185 9186 9187 9188 9189 9190 9191 9192 9193 9194 9195 9196 9197 9198 9199 9200 9201 9202 9203 9204 9205 9206 9207 9208 9209 9210 9211 9212 9213 9214 9215 9216 9217 9218 9219 9220 9221 9222 9223 9224 9225 9226 9227 9228 9229 9230 9231 9232 9233 9234 9235 9236 9237 9238 9239 9240 9241 9242 9243 9244 9245 9246 9247 9248 9249 9250 9251 9252 9253 9254 9255 9256 9257 9258 9259 9260 9261 9262 9263 9264 9265 9266 9267 9268 9269 9270 9271 9272 9273 9274 9275 9276 9277 9278 9279 9280 9281 9282 9283 9284 9285 9286 9287 9288 9289 9290 9291 9292 9293 9294 9295 9296 9297 9298 9299 9300 9301 9302 9303 9304 9305 9306 9307 9308 9309 9310 9311 9312 9313 9314 9315 9316 9317 9318 9319 9320 9321 9322 9323 9324 9325 9326 9327 9328 9329 9330 9331 9332 9333 9334 9335 9336 9337 9338 9339 9340 9341 9342 9343 9344 9345 9346 9347 9348 9349 9350 9351 9352 9353 9354 9355 9356 9357 9358 9359 9360 9361 9362 9363 | int32_t defaultValue, char const * sql, ... ); /** The int64 counterpart of fsl_db_get_int32(). See that function for the semantics. */ FSL_EXPORT int fsl_db_get_int64( fsl_db * db, int64_t * rv, char const * sql, ... ); /** va_list counterpart of fsl_db_get_int64(). */ FSL_EXPORT int fsl_db_get_int64v( fsl_db * db, int64_t * rv, char const * sql, va_list args); /** Convenience form of fsl_db_get_int64() which returns the value directly but provides no way of checking for errors. On error, or if no result is found, defaultValue is returned. */ FSL_EXPORT int64_t fsl_db_g_int64( fsl_db * db, int64_t defaultValue, char const * sql, ... ); /** The fsl_id_t counterpart of fsl_db_get_int32(). See that function for the semantics. */ FSL_EXPORT int fsl_db_get_id( fsl_db * db, fsl_id_t * rv, char const * sql, ... ); /** va_list counterpart of fsl_db_get_id(). */ FSL_EXPORT int fsl_db_get_idv( fsl_db * db, fsl_id_t * rv, char const * sql, va_list args); /** Convenience form of fsl_db_get_id() which returns the value directly but provides no way of checking for errors. On error, or if no result is found, defaultValue is returned. */ FSL_EXPORT fsl_id_t fsl_db_g_id( fsl_db * db, fsl_id_t defaultValue, char const * sql, ... ); /** The fsl_size_t counterpart of fsl_db_get_int32(). See that function for the semantics. If this function would fetch a negative value, it returns FSL_RC_RANGE and *rv is not modified. */ FSL_EXPORT int fsl_db_get_size( fsl_db * db, fsl_size_t * rv, char const * sql, ... ); /** va_list counterpart of fsl_db_get_size(). */ FSL_EXPORT int fsl_db_get_sizev( fsl_db * db, fsl_size_t * rv, char const * sql, va_list args); /** Convenience form of fsl_db_get_size() which returns the value directly but provides no way of checking for errors. On error, or if no result is found, defaultValue is returned. */ FSL_EXPORT fsl_size_t fsl_db_g_size( fsl_db * db, fsl_size_t defaultValue, char const * sql, ... ); /** The double counterpart of fsl_db_get_int32(). See that function for the semantics. */ FSL_EXPORT int fsl_db_get_double( fsl_db * db, double * rv, char const * sql, ... ); /** va_list counterpart of fsl_db_get_double(). */ FSL_EXPORT int fsl_db_get_doublev( fsl_db * db, double * rv, char const * sql, va_list args); /** Convenience form of fsl_db_get_double() which returns the value directly but provides no way of checking for errors. On error, or if no result is found, defaultValue is returned. */ FSL_EXPORT double fsl_db_g_double( fsl_db * db, double defaultValue, char const * sql, ... ); /** The C-string counterpart of fsl_db_get_int32(). On success *rv will be set to a dynamically allocated string copied from the first column of the first result row. If rvLen is not NULL then *rvLen will be assigned the byte-length of that string. If no row is found, *rv is set to NULL and *rvLen (if not NULL) is set to 0, and 0 is returned. Note that NULL is also a legal result (an SQL NULL translates as a NULL string), The caller must eventually free the returned string value using fsl_free(). */ FSL_EXPORT int fsl_db_get_text( fsl_db * db, char ** rv, fsl_size_t * rvLen, char const * sql, ... ); /** va_list counterpart of fsl_db_get_text(). */ FSL_EXPORT int fsl_db_get_textv( fsl_db * db, char ** rv, fsl_size_t * rvLen, char const * sql, va_list args ); /** Convenience form of fsl_db_get_text() which returns the value directly but provides no way of checking for errors. On error, or if no result is found, NULL is returned. The returned string must eventually be passed to fsl_free() to free it. If len is not NULL then if non-NULL is returned, *len will be assigned the byte-length of the returned string. */ FSL_EXPORT char * fsl_db_g_text( fsl_db * db, fsl_size_t * len, char const * sql, ... ); /** The Blob counterpart of fsl_db_get_text(). Identical to that function except that its output result (2nd paramter) type differs, and it fetches the data as a raw blob, without any sort of string interpretation. The returned *rv memory must eventually be passed to fsl_free() to free it. If len is not NULL then on success *len will be set to the byte length of the returned blob. If no row is found, *rv is set to NULL and *rvLen (if not NULL) is set to 0, and 0 is returned. Note that NULL is also a legal result (an SQL NULL translates as a NULL string), */ FSL_EXPORT int fsl_db_get_blob( fsl_db * db, void ** rv, fsl_size_t * len, char const * sql, ... ); /** va_list counterpart of fsl_db_get_blob(). */ FSL_EXPORT int fsl_db_get_blobv( fsl_db * db, void ** rv, fsl_size_t * stmtLen, char const * sql, va_list args ); /** Convenience form of fsl_db_get_blob() which returns the value directly but provides no way of checking for errors. On error, or if no result is found, NULL is returned. */ FSL_EXPORT void * fsl_db_g_blob( fsl_db * db, fsl_size_t * len, char const * sql, ... ); /** Similar to fsl_db_get_text() and fsl_db_get_blob(), but writes its result to tgt, overwriting (not appennding to) any existing memory it might hold. If asBlob is true then the underlying BLOB API is used to populate the buffer, else the underlying STRING/TEXT API is used. For many purposes there will be no difference, but if you know you might have binary data, be sure to pass a true value for asBlob to avoid any potential encoding-related problems. */ FSL_EXPORT int fsl_db_get_buffer( fsl_db * db, fsl_buffer * tgt, char asBlob, char const * sql, ... ); /** va_list counterpart of fsl_db_get_buffer(). */ FSL_EXPORT int fsl_db_get_bufferv( fsl_db * db, fsl_buffer * tgt, char asBlob, char const * sql, va_list args ); /** Expects sql to be a SELECT-style query which (potentially) returns a result set. For each row in the set callback() is called, as described for fsl_stmt_each(). Returns 0 on success. The callback is _not_ called for queries which return no rows. If clients need to know if rows were returned, they can add a counter to their callbackState and increment it from the callback. Returns FSL_RC_MISUSE if !db, db is not opened, !callback, !sql. Returns FSL_RC_RANGE if !*sql. */ FSL_EXPORT int fsl_db_each( fsl_db * db, fsl_stmt_each_f callback, void * callbackState, char const * sql, ... ); /** va_list counterpart to fsl_db_each(). */ FSL_EXPORT int fsl_db_eachv( fsl_db * db, fsl_stmt_each_f callback, void * callbackState, char const * sql, va_list args ); /** Returns the given Julian date value formatted as an ISO8601 string (with a fractional seconds part if msPrecision is true, else without it). Returns NULL if !db, db is not connected, j |
︙ | ︙ | |||
9476 9477 9478 9479 9480 9481 9482 | bool localTime ); /** Returns the current time in Julian Date format. Returns a negative value if !db or db is not opened. */ | | | | 9392 9393 9394 9395 9396 9397 9398 9399 9400 9401 9402 9403 9404 9405 9406 9407 9408 9409 9410 9411 9412 9413 9414 9415 9416 9417 9418 9419 9420 9421 | bool localTime ); /** Returns the current time in Julian Date format. Returns a negative value if !db or db is not opened. */ FSL_EXPORT double fsl_db_julian_now(fsl_db * db); /** Uses the given db to convert the given time string to Julian Day format. If it cannot be converted, a negative value is returned. The str parameter can be anything suitable for passing to sqlite's: SELECT julianday(str) Note that this routine will escape str for use with SQL - the caller must not do so. @see fsl_julian_to_iso8601() @see fsl_iso8601_to_julian() */ FSL_EXPORT double fsl_db_string_to_julian(fsl_db * db, char const * str); /** Opens the given db file and populates db with its handle. db must have been cleanly initialized by copy-initializing it from fsl_db_empty (or fsl_db_empty_m) or by allocating it using fsl_db_malloc(). Failure to do so will lead to undefined behaviour. |
︙ | ︙ | |||
9545 9546 9547 9548 9549 9550 9551 | - If FSL_OPEN_F_SCHEMA_VALIDATE is set in openFlags then the db is validated to see if it has a fossil schema. If that validation fails, FSL_RC_REPO_NEEDS_REBUILD or FSL_RC_NOT_A_REPO will be returned and db's error state will be updated. db->f does not need to be set for that check to work. | > | > > | > > < | | 9461 9462 9463 9464 9465 9466 9467 9468 9469 9470 9471 9472 9473 9474 9475 9476 9477 9478 9479 9480 9481 9482 9483 9484 9485 9486 9487 9488 9489 9490 9491 9492 | - If FSL_OPEN_F_SCHEMA_VALIDATE is set in openFlags then the db is validated to see if it has a fossil schema. If that validation fails, FSL_RC_REPO_NEEDS_REBUILD or FSL_RC_NOT_A_REPO will be returned and db's error state will be updated. db->f does not need to be set for that check to work. If db->f is not NULL when this function is called then a number of fossil-specific SQL-accessible functions are installed. See the file doc/db-udf.md in the libfossil source tree for complete docs. Note that functions in those docs described as "triggering a db error" will propagate that error, such that fsl_db_err_get() can report it to the client. @see fsl_db_close() @see fsl_db_prepare() @see fsl_db_malloc() */ FSL_EXPORT int fsl_db_open( fsl_db * const db, char const * dbFile, int openFlags ); /** Closes the given db handle and frees any resources owned by db. This is a no-op if db is NULL. If db was allocated using fsl_db_malloc() (as determined by examining db->allocStamp) then this routine also fsl_free()s it, otherwise it is assumed to either be on the stack or part of a larger struct and is not freed. If db has any pending transactions, they are rolled |
︙ | ︙ | |||
9584 9585 9586 9587 9588 9589 9590 | given code block is getting run. As a special case, if db->f is not NULL _before_ it is is fsl_db_open()ed, then this function automatically gets installed if the SQL tracing option is enabled for that fsl_cx instance before the db is opened. | | < < < < < < < < < | 9504 9505 9506 9507 9508 9509 9510 9511 9512 9513 9514 9515 9516 9517 9518 | given code block is getting run. As a special case, if db->f is not NULL _before_ it is is fsl_db_open()ed, then this function automatically gets installed if the SQL tracing option is enabled for that fsl_cx instance before the db is opened. This is a no-op if !db or db is not opened. */ FSL_EXPORT void fsl_db_sqltrace_enable( fsl_db * const db, FILE * outStream ); /** Returns the row ID of the most recent insertion, or -1 if !db, db is not connected, or 0 if no inserts have been performed. |
︙ | ︙ | |||
9625 9626 9627 9628 9629 9630 9631 | */ FSL_EXPORT char const * fsl_db_name(fsl_db const * const db); /** Returns a db name string for the given fsl_db_role value. The string is static, guaranteed to live as long as the app. It | > | < | > | 9536 9537 9538 9539 9540 9541 9542 9543 9544 9545 9546 9547 9548 9549 9550 9551 9552 9553 9554 | */ FSL_EXPORT char const * fsl_db_name(fsl_db const * const db); /** Returns a db name string for the given fsl_db_role value. The string is static, guaranteed to live as long as the app. It returns NULL (or asserts in debug builds) if passed FSL_DBROLE_NONE or some value out of range for the enum. */ FSL_EXPORT const char * fsl_db_role_label(enum fsl_dbrole_e r); /** Allocates a new fsl_db instance(). Returns NULL on allocation error. Note that fsl_db instances can often be used from the stack - allocating them dynamically is an uncommon case necessary for script bindings. |
︙ | ︙ | |||
9676 9677 9678 9679 9680 9681 9682 | FSL_EXPORT int fsl_db_detach(fsl_db * const db, const char *zLabel); /** Expects fmt to be a SELECT-style query. For each row in the query, the first column is fetched as a string and appended to the tgt list. | | | 9588 9589 9590 9591 9592 9593 9594 9595 9596 9597 9598 9599 9600 9601 9602 | FSL_EXPORT int fsl_db_detach(fsl_db * const db, const char *zLabel); /** Expects fmt to be a SELECT-style query. For each row in the query, the first column is fetched as a string and appended to the tgt list. Returns 0 on success, FSL_RC_MISUSE if !db, !tgt, or !fmt, any number of potential FSL_RC_OOM or db-related errors. Results rows with a NULL value (resulting from an SQL NULL) are added to the list as NULL entries. Each entry appended to the list is a (char *) which must be freed using fsl_free(). To easiest way to clean up |
︙ | ︙ | |||
9712 9713 9714 9715 9716 9717 9718 | fsl_list_visit_free(&li, 1); ``` Of course fsl_list_visit() may be used to traverse the list as well, as long as the visitor expects (char [const]*) list elements. */ | | | | | | | | > | > | 9624 9625 9626 9627 9628 9629 9630 9631 9632 9633 9634 9635 9636 9637 9638 9639 9640 9641 9642 9643 9644 9645 9646 9647 9648 9649 9650 9651 9652 9653 9654 9655 9656 9657 9658 9659 9660 9661 9662 9663 9664 9665 9666 9667 9668 9669 9670 | fsl_list_visit_free(&li, 1); ``` Of course fsl_list_visit() may be used to traverse the list as well, as long as the visitor expects (char [const]*) list elements. */ FSL_EXPORT int fsl_db_select_slist( fsl_db * const db, fsl_list * tgt, char const * fmt, ... ); /** The va_list counterpart of fsl_db_select_slist(). */ FSL_EXPORT int fsl_db_select_slistv( fsl_db * const db, fsl_list * tgt, char const * fmt, va_list args ); /** Returns n bytes of random lower-case hexidecimal characters using the given db as its data source, plus a terminating NUL byte. The returned memory must eventually be freed using fsl_free(). Returns NULL if !db, !n, or on a db-level error. */ FSL_EXPORT char * fsl_db_random_hex(fsl_db * db, fsl_size_t n); /** Returns the "number of database rows that were changed or inserted or deleted by the most recently completed SQL statement" (to quote the underlying APIs). Returns 0 if !db or if db is not opened. See: https://sqlite.org/c3ref/changes.html */ FSL_EXPORT int fsl_db_changes_recent(fsl_db * const db); /** Returns "the number of row changes caused by INSERT, UPDATE or DELETE statements since the database connection was opened" (to quote the underlying APIs). Returns 0 if !db or if db is not opened. See; https://sqlite.org/c3ref/total_changes.html */ FSL_EXPORT int fsl_db_changes_total(fsl_db * const db); /** Initializes the given database file. zFilename is the name of |
︙ | ︙ | |||
9871 9872 9873 9874 9875 9876 9877 | FSL_EXPORT int fsl_stmt_bind_step( fsl_stmt * st, char const * fmt, ... ); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_DB_H_INCLUDED */ | | | | 9785 9786 9787 9788 9789 9790 9791 9792 9793 9794 9795 9796 9797 9798 9799 9800 | FSL_EXPORT int fsl_stmt_bind_step( fsl_stmt * st, char const * fmt, ... ); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_DB_H_INCLUDED */ /* end of file ../include/fossil-scm/fossil-db.h */ /* start of file ../include/fossil-scm/fossil-hash.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_HASH_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_HASH_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt |
︙ | ︙ | |||
10413 10414 10415 10416 10417 10418 10419 | FSL_EXPORT const char * fsl_hash_type_name(fsl_hash_types_e h, const char *zUnknown); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_HASH_H_INCLUDED */ | | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 10327 10328 10329 10330 10331 10332 10333 10334 10335 10336 10337 10338 10339 10340 10341 10342 10343 10344 10345 10346 10347 10348 10349 10350 10351 10352 10353 10354 10355 10356 10357 10358 10359 10360 10361 10362 10363 10364 10365 10366 10367 10368 10369 10370 10371 10372 10373 10374 10375 10376 | FSL_EXPORT const char * fsl_hash_type_name(fsl_hash_types_e h, const char *zUnknown); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_HASH_H_INCLUDED */ /* end of file ../include/fossil-scm/fossil-hash.h */ /* start of file ../include/fossil-scm/fossil-repo.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_REPO_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_REPO_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /** @file fossil-repo.h fossil-repo.h declares APIs specifically dealing with repository-db-side state, as opposed to specifically checkout-side state or non-content-related APIs. */ #if defined(__cplusplus) extern "C" { #endif typedef struct fsl_card_F fsl_card_F; typedef struct fsl_card_J fsl_card_J; typedef struct fsl_card_Q fsl_card_Q; typedef struct fsl_card_T fsl_card_T; typedef struct fsl_checkin_opt fsl_checkin_opt; typedef struct fsl_deck fsl_deck; /** This function is a programmatic interpretation of this table: https://fossil-scm.org/index.html/doc/trunk/www/fileformat.wiki#summary For a given control artifact type and a card name in the form of |
︙ | ︙ | |||
10623 10624 10625 10626 10627 10628 10629 | These lists, and F-cards in generally, are typically maintained internally in the library. There's probably "no good reason" for clients to manipulate them. */ struct fsl_card_F_list { /** The list of F-cards. The first this->used elements are in-use. | | | 10497 10498 10499 10500 10501 10502 10503 10504 10505 10506 10507 10508 10509 10510 10511 | These lists, and F-cards in generally, are typically maintained internally in the library. There's probably "no good reason" for clients to manipulate them. */ struct fsl_card_F_list { /** The list of F-cards. The first this->used elements are in-use. This pointer may change any time the list is reallocated.a */ fsl_card_F * list; /** The number of entries in this->list which are in use. */ uint32_t used; /** |
︙ | ︙ | |||
11205 11206 11207 11208 11209 11210 11211 | Returns 0 on success, else an error code propagated by fsl_deck_F_set(), fsl_repo_blob_lookup(), or some other lower-level routine. This routine requires that a transaction is active and returns FSL_RC_MISUSE if none is active. For any non-trivial error's, d->f's error state will be updated with a description of the problem. | < < < < < < < < < < | | | > | | | < < < | < | | > < < < < < < < | | 11079 11080 11081 11082 11083 11084 11085 11086 11087 11088 11089 11090 11091 11092 11093 11094 11095 11096 11097 11098 11099 11100 11101 11102 11103 11104 11105 11106 11107 11108 11109 11110 11111 11112 11113 11114 11115 11116 11117 11118 11119 11120 11121 11122 11123 11124 11125 11126 11127 11128 11129 11130 11131 11132 11133 11134 11135 11136 11137 11138 11139 11140 11141 11142 | Returns 0 on success, else an error code propagated by fsl_deck_F_set(), fsl_repo_blob_lookup(), or some other lower-level routine. This routine requires that a transaction is active and returns FSL_RC_MISUSE if none is active. For any non-trivial error's, d->f's error state will be updated with a description of the problem. TODO: add a fsl_cx-level or fsl_deck-level API for marking content saved this way as private. This type of content is intended for use cases which do not have a checkout, and thus cannot be processed with fsl_checkin_commit() (which includes a flag to mark its content as private). @see fsl_deck_F_set() @see fsl_deck_F_add() @see fsl_deck_derive() */ FSL_EXPORT int fsl_deck_F_set_content( fsl_deck * d, char const * name, fsl_buffer const * src, fsl_fileperm_e perm, char const * priorName); /** UNDER CONSTRUCTION! EXPERIMENTAL! This routine rewires d such that it becomes the basis for a derived version of itself. Requires that d be a loaded from a repository, complete with a UUID and an RID, else FSL_RC_MISUSE is returned. In short, this function peforms the following: - Clears d->P - Moves d->uuid into d->P - Clears d->rid - Clears any other members which need to be (re)set by the new child/derived version. - It specifically keeps d->F intact OR creates a new one (see below). Returns 0 on success, FSL_RC_OOM on an allocation error, FSL_RC_MISUSE if d->rid<=0 (i.e. the deck has never been saved or was not loaded from the db. If d->type is not FSL_SATYPE_CHECKIN, FSL_RC_TYPE is returned. On error, d may be left in an inconsistent state and must not be used further except to pass it to fsl_deck_finalize(). The intention of this function is to simplify creation of decks which are to be used for creating checkins without requiring a checkin. To avoid certain corner cases, this function does not allow creation of delta manifests. If d has a B-card then it is a delta. This function clears its B-card and recreates the F-card list using the B-card's F-card list and any F-cards from the current delta. In other words, it creates a new baseline manifest. TODO: extend this to support other inheritable deck types, e.g. wiki, forum posts, and technotes. @see fsl_deck_F_set_content() */ FSL_EXPORT int fsl_deck_derive(fsl_deck * const d); /** |
︙ | ︙ | |||
11305 11306 11307 11308 11309 11310 11311 | The F-cards will be visited in the order they are declared in d. For loaded-from-a-repo manifests this is always lexical order (for delta manifests, consistent across the delta and baseline). For hand-created decks which have not yet been fsl_deck_unshuffle()'d, the order is unspecified. */ | | < | | 11160 11161 11162 11163 11164 11165 11166 11167 11168 11169 11170 11171 11172 11173 11174 11175 | The F-cards will be visited in the order they are declared in d. For loaded-from-a-repo manifests this is always lexical order (for delta manifests, consistent across the delta and baseline). For hand-created decks which have not yet been fsl_deck_unshuffle()'d, the order is unspecified. */ FSL_EXPORT int fsl_deck_F_foreach( fsl_deck * d, fsl_card_F_visitor_f cb, void * visitorState ); /** Fetches the next F-card entry from d. fsl_deck_F_rewind() must have be successfully executed one time before calling this, as that routine ensures that the baseline is loaded (if needed), which is needed for proper iteration over delta manifests. |
︙ | ︙ | |||
11424 11425 11426 11427 11428 11429 11430 | On any error but FSL_RC_MISUSE (basic argument validation) f's error state is updated to describe the error. @see fsl_content_get() */ FSL_EXPORT int fsl_card_F_content( fsl_cx * f, fsl_card_F const * fc, | | | 11278 11279 11280 11281 11282 11283 11284 11285 11286 11287 11288 11289 11290 11291 11292 | On any error but FSL_RC_MISUSE (basic argument validation) f's error state is updated to describe the error. @see fsl_content_get() */ FSL_EXPORT int fsl_card_F_content( fsl_cx * f, fsl_card_F const * fc, fsl_buffer * dest ); /** Sets the 'G' card on a forum-post deck to a copy of the given UUID. */ FSL_EXPORT int fsl_deck_G_set( fsl_deck * const mf, fsl_uuid_cstr uuid); /** |
︙ | ︙ | |||
11458 11459 11460 11461 11462 11463 11464 | particular if their isAppend values differ. Returns 0 on success, FSL_RC_MISUSE if !mf or !key, FSL_RC_RANGE if !*field, FSL_RC_TYPE if mf is of a type for which J cards are not legal (see fsl_card_is_legal()), FSL_RC_OOM on allocation error. */ | | | < < | | | 11312 11313 11314 11315 11316 11317 11318 11319 11320 11321 11322 11323 11324 11325 11326 11327 11328 11329 11330 11331 11332 | particular if their isAppend values differ. Returns 0 on success, FSL_RC_MISUSE if !mf or !key, FSL_RC_RANGE if !*field, FSL_RC_TYPE if mf is of a type for which J cards are not legal (see fsl_card_is_legal()), FSL_RC_OOM on allocation error. */ FSL_EXPORT int fsl_deck_J_add( fsl_deck * const mf, char isAppend, char const * key, char const * value ); /** Semantically identical fsl_deck_B_set() but sets the K-card and does not accept a NULL value. uuid must be the UUID of the ticket this change is being applied to. */ FSL_EXPORT int fsl_deck_K_set( fsl_deck * const mf, fsl_uuid_cstr uuid); /** Semantically identical fsl_deck_B_set() but sets the L-card. title must be the wiki page title text of the wiki page this change is being applied to. |
︙ | ︙ | |||
11561 11562 11563 11564 11565 11566 11567 | If uuid is not NULL and fsl_is_uuid(uuid) returns false then this function returns FSL_RC_RANGE. If uuid is NULL then it is assumed to be the UUID of the currently-being-constructed artifact in which the tag is contained (which appears as the '*' character in generated artifacts). | | | | | | 11413 11414 11415 11416 11417 11418 11419 11420 11421 11422 11423 11424 11425 11426 11427 11428 11429 11430 11431 11432 11433 11434 | If uuid is not NULL and fsl_is_uuid(uuid) returns false then this function returns FSL_RC_RANGE. If uuid is NULL then it is assumed to be the UUID of the currently-being-constructed artifact in which the tag is contained (which appears as the '*' character in generated artifacts). Returns 0 on success. Returns FSL_RC_MISUE if !mf or !name. Returns FSL_RC_TYPE (and update's mf's error state with a message) if the T card is not legal for mf (see fsl_card_is_legal()). Returns FSL_RC_RANGE if !*name, tagType is invalid, or if uuid is not NULL and fsl_is_uuid(uuid) return false. Returns FSL_RC_OOM if an allocation fails. */ FSL_EXPORT int fsl_deck_T_add( fsl_deck * const mf, fsl_tagtype_e tagType, fsl_uuid_cstr uuid, char const * name, char const * value); /** Adds the given tag instance to the given manifest. Returns 0 on success, FSL_RC_MISUSE if either argument is NULL, FSL_RC_OOM if appending the tag to the list |
︙ | ︙ | |||
11592 11593 11594 11595 11596 11597 11598 | tags to the given deck: "branch" with a value of branchName and "sym-branchName" with no value. Returns 0 on success. Returns FSL_RC_OOM on allocation error and FSL_RC_RANGE if branchName is empty or contains any characters with ASCII values <=32d. It natively assumes that any characters >=128 are part of multibyte UTF8 characters. | < < < < < < | | 11444 11445 11446 11447 11448 11449 11450 11451 11452 11453 11454 11455 11456 11457 11458 11459 | tags to the given deck: "branch" with a value of branchName and "sym-branchName" with no value. Returns 0 on success. Returns FSL_RC_OOM on allocation error and FSL_RC_RANGE if branchName is empty or contains any characters with ASCII values <=32d. It natively assumes that any characters >=128 are part of multibyte UTF8 characters. */ FSL_EXPORT int fsl_deck_branch_set( fsl_deck * d, char const * branchName ); /** Calculates the value of d's R-card based on its F-cards and updates d->R. It may also, as a side-effect, sort d->F.list lexically (a requirement of a R-card calculation). Returns 0 on success. Requires that d->f have an opened |
︙ | ︙ | |||
11624 11625 11626 11627 11628 11629 11630 | allows the client to decide on whether to use them (for more (admittedly redundant!) integrity checking) or not (much faster but "not strictly historically correct"), but defaults to having them enabled for symmetry with fossil(1). @see fsl_deck_R_calc2() */ | | | 11470 11471 11472 11473 11474 11475 11476 11477 11478 11479 11480 11481 11482 11483 11484 | allows the client to decide on whether to use them (for more (admittedly redundant!) integrity checking) or not (much faster but "not strictly historically correct"), but defaults to having them enabled for symmetry with fossil(1). @see fsl_deck_R_calc2() */ FSL_EXPORT int fsl_deck_R_calc(fsl_deck * d); /** A variant of fsl_deck_R_calc() which calculates the given deck's R-card but does not assign it to the deck, instead returning it via the 2nd argument: If *tgt is not NULL when this function is called, it is required to |
︙ | ︙ | |||
11765 11766 11767 11768 11769 11770 11771 | F-cards were used, but it was eventually made optional because (A) the memory cost and (B) it's part of a 3rd or 4th level of integrity-related checks, and is somewhat superfluous. @see fsl_deck_output() @see fsl_deck_save() */ | | < < < | | | 11611 11612 11613 11614 11615 11616 11617 11618 11619 11620 11621 11622 11623 11624 11625 11626 11627 11628 11629 11630 11631 11632 11633 11634 11635 11636 11637 11638 11639 11640 11641 11642 11643 11644 11645 11646 11647 11648 11649 11650 11651 11652 11653 11654 11655 11656 11657 11658 | F-cards were used, but it was eventually made optional because (A) the memory cost and (B) it's part of a 3rd or 4th level of integrity-related checks, and is somewhat superfluous. @see fsl_deck_output() @see fsl_deck_save() */ FSL_EXPORT int fsl_deck_unshuffle( fsl_deck * d, bool calculateRCard ); /** Renders the given control artifact's contents to the given output function and calculates any cards which cannot be calculated until the contents are complete (namely the R-card and Z-card). The given deck is "logically const" but traversal over F-cards and baselines requires non-const operations. To keep this routine from requiring an undue amount of pre-call effort on the client's part, it also takes care of calling fsl_deck_unshuffle() to ensure that all of the deck's cards are in order. (If the deck has no R card, but has F-cards, and d->f is configured to generate R-cards, then unshuffling will also calculate the R-card.) Returns 0 on success, FSL_RC_MISUSE if !d or !d->f or !out. If out() returns non-0, output stops and that code is returned. outputState is passed as the first argument to out() and out() may be called an arbitrary number of times by this routine. Returns FSL_RC_SYNTAX if fsl_deck_has_required_cards() returns false. On errors more serious than argument validation, the deck's context's (d->f) error state is updated. The exact structure of the ouput depends on the value of mf->type, and FSL_RC_TYPE is returned if this function cannot figure out what to do with the given deck's type. @see fsl_deck_unshuffle() @see fsl_deck_save() */ FSL_EXPORT int fsl_deck_output( fsl_deck * d, fsl_output_f out, void * outputState ); /** Saves the given deck into f's repository database as new control artifact content. If isPrivate is true then the content is marked as private, otherwise it is not. Note that isPrivate is a |
︙ | ︙ | |||
11932 11933 11934 11935 11936 11937 11938 | d might be partially populated on error, so regardless of success or failure, the client must eventually pass d to fsl_deck_finalize() to free its memory. Error result codes include: | | < < < < < | | < < < < < < < < | < < < < < < < < < | 11775 11776 11777 11778 11779 11780 11781 11782 11783 11784 11785 11786 11787 11788 11789 11790 11791 11792 11793 11794 11795 11796 11797 11798 11799 11800 11801 11802 | d might be partially populated on error, so regardless of success or failure, the client must eventually pass d to fsl_deck_finalize() to free its memory. Error result codes include: - FSL_RC_MISUSE if any pointer argument is NULL or d->f is NULL. - FSL_RC_SYNTAX on syntax errors. - FSL_RC_CONSISTENCY if validation of a Z-card fails. - Any number of errors coming from the allocator, database, or fsl_deck APIs used here. ACHTUNG API CHANGE: prior to 2021-10-20, this routine set d->rid (and the now-removed d->uuid) based on the hash of the input buffer if a matching record could be found in the db. That proved to be a huge performance hit and was removed. @see fsl_deck_parse2() */ FSL_EXPORT int fsl_deck_parse(fsl_deck * const d, fsl_buffer * const src); /** This variant of fsl_deck_parse() works identically to that function except for the 3rd argument. |
︙ | ︙ | |||
11990 11991 11992 11993 11994 11995 11996 | FSL_EXPORT int fsl_deck_parse2(fsl_deck * const d, fsl_buffer * const src, fsl_id_t rid); /** Quickly determines whether the content held by the given buffer "might" be a structural artifact. It performs a fast sanity check for prominent features which can be checked either in O(1) or very short O(N) time (with a fixed N). If it returns false then the | | | | 11811 11812 11813 11814 11815 11816 11817 11818 11819 11820 11821 11822 11823 11824 11825 11826 | FSL_EXPORT int fsl_deck_parse2(fsl_deck * const d, fsl_buffer * const src, fsl_id_t rid); /** Quickly determines whether the content held by the given buffer "might" be a structural artifact. It performs a fast sanity check for prominent features which can be checked either in O(1) or very short O(N) time (with a fixed N). If it returns false then the given buffer's contents are, with 100% certainty, *not* a structural artifact. If it returns true then they *might* be, but being 100% certain requires passing the contents to fsl_deck_parse() to fully parse them. */ FSL_EXPORT bool fsl_might_be_artifact(fsl_buffer const * const src); /** Loads the content from given rid and tries to parse it as a |
︙ | ︙ | |||
12118 12119 12120 12121 12122 12123 12124 | const, but certain operations on a deck are necessarily non-const operations. That includes, but may not be limited to: - Iterating over F-cards, which requires calling fsl_deck_F_rewind() before doing so. - Loading a checkin's baseline (required for F-card iteration and | | | > | < < < < < | 11939 11940 11941 11942 11943 11944 11945 11946 11947 11948 11949 11950 11951 11952 11953 11954 11955 11956 11957 11958 11959 11960 11961 11962 11963 11964 11965 11966 11967 11968 11969 11970 11971 11972 | const, but certain operations on a deck are necessarily non-const operations. That includes, but may not be limited to: - Iterating over F-cards, which requires calling fsl_deck_F_rewind() before doing so. - Loading a checkin's baseline (required for F-card iteration and performed automatically by fsl_deck_F_rewind()). Aside from such iteration-related mutable state, it is STRICTLY ILLEGAL to modify a deck's artifact-related state while it is undergoing crosslinking. It is legal to modify its error state. Potential TODO: add some client-opaque state to decks so that they can be flagged as "being crosslinked" and fail mutation operations such as card adders/setters. @see fsl_xlink_listener() */ typedef int (*fsl_deck_xlink_f)(fsl_deck * const d, void * state); /** A type for holding a callback/state pair for manifest crosslinking callbacks. */ struct fsl_xlinker { char const * name; /** Callback function. */ fsl_deck_xlink_f f; /** State for this->f's last argument. */ void * state; }; typedef struct fsl_xlinker fsl_xlinker; |
︙ | ︙ | |||
12224 12225 12226 12227 12228 12229 12230 | names they register. The library reserves the prefix "fsl/" for its own use, and will happily overwrite client-registered entries with the same names. The name string need not be stable across application sessions and maybe be a randomly-generated string. Caveat: some obscure artifact crosslinking steps do not happen unless crosslinking takes place in the context of a | | < < < < < < < | 12041 12042 12043 12044 12045 12046 12047 12048 12049 12050 12051 12052 12053 12054 12055 12056 12057 12058 12059 12060 | names they register. The library reserves the prefix "fsl/" for its own use, and will happily overwrite client-registered entries with the same names. The name string need not be stable across application sessions and maybe be a randomly-generated string. Caveat: some obscure artifact crosslinking steps do not happen unless crosslinking takes place in the context of a fsl_crosslink_begin() and fsl_crosslink_end() session. Thus, at the time client-side crosslinker callbacks are called, certain crosslinking state in the database may still be pending. It is as yet unclear how best to resolve that minor discrepancy, or whether it even needs resolving. Default (overrideable) crosslink handlers: The library internally splits crosslinking of artifacts into two parts: the main one (which clients cannot modify) handles the database-level linking of relational state implied by a given artifact. The secondary one adds an entry to the "event" table, |
︙ | ︙ | |||
12263 12264 12265 12266 12267 12268 12269 | - Technote artifacts: "fsl/technote/timeline" - Wiki artifacts: "fsl/wiki/timeline" A context registers listeners under those names when it initializes, and clients may override them at any point after that. | < < < < < < < < < < | 12073 12074 12075 12076 12077 12078 12079 12080 12081 12082 12083 12084 12085 12086 | - Technote artifacts: "fsl/technote/timeline" - Wiki artifacts: "fsl/wiki/timeline" A context registers listeners under those names when it initializes, and clients may override them at any point after that. Caveat: updating the timeline requires a bit of knowledge about the Fossil DB schema and/or conventions. Updates for certain types, e.g. attachment/control/forum post, is somewhat more involved and updating the timeline for wiki comments requires observing a "quirk of conventions" for labeling such comments, such that they will appear properly when the main fossil app renders them. That said, the only tricky parts of those updates involve generating the |
︙ | ︙ | |||
12316 12317 12318 12319 12320 12321 12322 | negative value on error (dig around the sources to decode them - this is not expected to fail unless the system is undergoing a catastrophe). @see fsl_content_blob() @see fsl_content_get() */ | | | 12116 12117 12118 12119 12120 12121 12122 12123 12124 12125 12126 12127 12128 12129 12130 | negative value on error (dig around the sources to decode them - this is not expected to fail unless the system is undergoing a catastrophe). @see fsl_content_blob() @see fsl_content_get() */ FSL_EXPORT fsl_int_t fsl_content_size( fsl_cx * f, fsl_id_t blobRid ); /** For the given blob.rid value, fetches the content field of that record and overwrites tgt's contents with it (reusing tgt's memory if it has any and if it can). The blob's contents are uncompressed if they were stored in compressed form. This extracts a raw blob and does not apply any deltas - use |
︙ | ︙ | |||
12428 12429 12430 12431 12432 12433 12434 | must not hold a pointer to it or its contents. @see fsl_wiki_load_latest() @see fsl_wiki_latest_rid() @see fsl_wiki_names_get() @see fsl_wiki_page_exists() */ | | | | | | 12228 12229 12230 12231 12232 12233 12234 12235 12236 12237 12238 12239 12240 12241 12242 12243 12244 12245 12246 12247 12248 12249 12250 12251 12252 12253 12254 12255 12256 12257 12258 12259 12260 12261 12262 12263 12264 12265 12266 12267 12268 12269 12270 12271 12272 12273 12274 12275 12276 12277 12278 12279 12280 12281 12282 12283 12284 12285 12286 12287 | must not hold a pointer to it or its contents. @see fsl_wiki_load_latest() @see fsl_wiki_latest_rid() @see fsl_wiki_names_get() @see fsl_wiki_page_exists() */ FSL_EXPORT int fsl_wiki_foreach_page( fsl_cx * f, fsl_deck_visitor_f cb, void * state ); /** Fetches the most recent RID for the given wiki page name and assigns *newId (if it is not NULL) to that value. Returns 0 on success, FSL_RC_MISUSE if !f or !pageName, FSL_RC_RANGE if !*pageName, and a host of other potential db-side errors indicating more serious problems. If no such page is found, newRid is not modified and this function returns 0 (as opposed to FSL_RC_NOT_FOUND) because that simplifies usage (so far). On error *newRid is not modified. @see fsl_wiki_load_latest() @see fsl_wiki_foreach_page() @see fsl_wiki_names_get() @see fsl_wiki_page_exists() */ FSL_EXPORT int fsl_wiki_latest_rid( fsl_cx * f, char const * pageName, fsl_id_t * newRid ); /** Loads the artifact for the most recent version of the given wiki page, populating d with its contents. Returns 0 on success. On error d might be partially populated, so it needs to be passed to fsl_deck_finalize() regardless of whether this function succeeds or fails. Returns FSL_RC_NOT_FOUND if no page with that name is found. @see fsl_wiki_latest_rid() @see fsl_wiki_names_get() @see fsl_wiki_page_exists() */ FSL_EXPORT int fsl_wiki_load_latest( fsl_cx * f, char const * pageName, fsl_deck * d ); /** Returns true (non-0) if f's repo database contains a page with the given name, else false. @see fsl_wiki_load_latest() @see fsl_wiki_latest_rid() @see fsl_wiki_names_get() @see fsl_wiki_names_get() */ FSL_EXPORT bool fsl_wiki_page_exists(fsl_cx * f, char const * pageName); /** A helper type for use with fsl_wiki_save(), intended primarily to help client-side code readability somewhat. */ enum fsl_wiki_save_mode_t { /** |
︙ | ︙ | |||
12636 12637 12638 12639 12640 12641 12642 | Represents a J card in a Ticket Control Artifact. */ struct fsl_card_J { /** If true, the new value should be appended to any existing one with the same key, else it will replace any old one. */ | | | | 12436 12437 12438 12439 12440 12441 12442 12443 12444 12445 12446 12447 12448 12449 12450 12451 12452 12453 12454 12455 12456 12457 12458 12459 12460 12461 12462 12463 12464 12465 | Represents a J card in a Ticket Control Artifact. */ struct fsl_card_J { /** If true, the new value should be appended to any existing one with the same key, else it will replace any old one. */ char append; /** For internal use only. */ unsigned char flags; /** The ticket field to update. The bytes are owned by this object. */ char * field; /** The value for the field. The bytes are owned by this object. */ char * value; }; /** Empty-initialized fsl_card_J struct. */ #define fsl_card_J_empty_m {0,0,NULL, NULL} /** Empty-initialized fsl_card_J struct. */ FSL_EXPORT const fsl_card_J fsl_card_J_empty; /** Represents a tag in a Manifest or Control Artifact. */ struct fsl_card_T { |
︙ | ︙ | |||
12830 12831 12832 12833 12834 12835 12836 | it is impossible to distinguish between the results "invalid rid" and "empty directory list" (which is a legal result). On success it returns 0 and tgt will have a number of (char *) entries appended to it equal to the number of subdirectories in the repo (possibly 0). | | < | | | | | | | | | > | | | | | | | | | | | 12630 12631 12632 12633 12634 12635 12636 12637 12638 12639 12640 12641 12642 12643 12644 12645 12646 12647 12648 12649 12650 12651 12652 12653 12654 12655 12656 12657 12658 12659 12660 12661 12662 12663 12664 12665 12666 12667 12668 12669 12670 12671 12672 12673 12674 12675 12676 12677 12678 12679 12680 12681 12682 12683 12684 12685 12686 12687 12688 12689 12690 12691 12692 12693 | it is impossible to distinguish between the results "invalid rid" and "empty directory list" (which is a legal result). On success it returns 0 and tgt will have a number of (char *) entries appended to it equal to the number of subdirectories in the repo (possibly 0). Returns non-0 on error, FSL_RC_MISUSE if !f, !tgt. On other errors error tgt might have been partially populated and the list contents should not be considered valid/complete. Ownership of the returned strings is transfered to the caller, who must eventually free each one using fsl_free(). fsl_list_visit_free() is the simplest way to free them all at once. */ FSL_EXPORT int fsl_repo_dir_names( fsl_cx * f, fsl_id_t rid, fsl_list * tgt, bool addSlash ); /** ZIPs up a copy of the contents of a specific version from f's opened repository db. sym is the symbolic name for the checkin to ZIP. filename is the name of the ZIP file to output the result to. See fsl_zip_writer for details and caveats of this library's ZIP creation. If vRootDir is not NULL and not empty then each file injected into the ZIP gets that directory prepended to its name. If progressVisitor is not NULL then it is called once just before each file is processed, passed the F-card for the file about to be zipped and the progressState parameter. If it returns non-0, ZIPping is cancelled and that error code is returned. This is intended primarily for providing feedback on the update process, but could also be used to cancel the operation between files. As of 2021-09-05 this routine automatically adds the files (manifest, manifest.uuid, manifest.tags) to the zip file, regardless of repository-level settings regarding those pseudo-files (see fsl_ckout_manifest_write()). As there are no F-cards associated with those non-files, the progressVisitor is not called for those. BUG: this function does not honor symlink content in a fossil-compatible fashion. If it encounters a symlink entry during ZIP generation, it will fail and f's error state will be updated with an explanation of this shortcoming. @see fsl_zip_writer @see fsl_card_F_visitor_f() */ FSL_EXPORT int fsl_repo_zip_sym_to_filename( fsl_cx * f, char const * sym, char const * vRootDir, char const * fileName, fsl_card_F_visitor_f progressVisitor, void * progressState); /** Callback state for use with fsl_repo_extract_f() implementations to stream a given version of a repository's file's, one file at a time, to a client. Instances are never created by client code, only by fsl_repo_extract() and its delegates, which pass them to |
︙ | ︙ | |||
13039 13040 13041 13042 13043 13044 13045 | /** Initialized-with-defaults fsl_repo_extract_opt instance, intended for intializing new non-const instances. */ FSL_EXPORT const fsl_repo_extract_opt fsl_repo_extract_opt_empty; /** | | > > > > | | | | | | | 12839 12840 12841 12842 12843 12844 12845 12846 12847 12848 12849 12850 12851 12852 12853 12854 12855 12856 12857 12858 12859 12860 12861 12862 12863 12864 12865 12866 12867 12868 12869 12870 12871 12872 12873 12874 12875 12876 12877 12878 12879 12880 12881 12882 12883 12884 12885 12886 12887 12888 12889 12890 12891 | /** Initialized-with-defaults fsl_repo_extract_opt instance, intended for intializing new non-const instances. */ FSL_EXPORT const fsl_repo_extract_opt fsl_repo_extract_opt_empty; /** Extracts the contents of a single checkin from a repository, sending the appropriate version of each file's contents to a client-specified callback. For each file in the given checkin, opt->callback() is passed a fsl_repo_extract_state instance containing enough information to, e.g., unpack the contents to a working directory, add it to a compressed archive, or send it to some other destination. Returns 0 on success, non-0 on error. It will fail if f has no opened repository db. If the callback returns any code other than 0 or FSL_RC_BREAK, looping over the list of files ends and this function returns that value. FSL_RC_BREAK causes looping to stop but 0 is returned. Files deleted by the given version are NOT reported to the callback (because getting sane semantics has proven to be tricker and more costly than it's worth). See fsl_repo_extract_f() for more details about the semantics of the callback. See fsl_repo_extract_opt for the documentation of the various options. Fossil's internal metadata format guarantees that files will passed be passed to the callback in "lexical order" (as defined by fossil's manifest format definition). i.e. the files will be passed in case-sensitive, alphabetical order. Note that upper-case letters sort before lower-case ones. Sidebar: this function makes a bitwise copy of the 2nd argument before starting its work, just in case the caller gets the crazy idea to modify it from the extraction callback. Whether or not there are valid/interesting uses for such modification remains to be seen. If any are found, this copy behavior may change. */ FSL_EXPORT int fsl_repo_extract( fsl_cx * f, fsl_repo_extract_opt const * opt ); /** Equivalent to fsl_tag_an_rid() except that it takes a symbolic artifact name in place of an artifact ID as the third argumemnt. This function passes symToTag to fsl_sym_to_rid(), and on |
︙ | ︙ | |||
13181 13182 13183 13184 13185 13186 13187 | /** Looks for the delta table record where rid==deltaRid, and returns that record's srcid via *rv. Returns 0 on success, non-0 on error. If no record is found, *rv is set to 0 and 0 is returned (as opposed to FSL_RC_NOT_FOUND) because that generally simplifies the error checking. | < < | | 12985 12986 12987 12988 12989 12990 12991 12992 12993 12994 12995 12996 12997 12998 12999 13000 13001 | /** Looks for the delta table record where rid==deltaRid, and returns that record's srcid via *rv. Returns 0 on success, non-0 on error. If no record is found, *rv is set to 0 and 0 is returned (as opposed to FSL_RC_NOT_FOUND) because that generally simplifies the error checking. */ FSL_EXPORT int fsl_delta_src_id( fsl_cx * const f, fsl_id_t deltaRid, fsl_id_t * rv ); /** Return true if the given artifact ID should is listed in f's shun table, else false. */ FSL_EXPORT int fsl_uuid_is_shunned(fsl_cx * const f, fsl_uuid_cstr zUuid); |
︙ | ︙ | |||
13220 13221 13222 13223 13224 13225 13226 | This routine is much more efficient if used to answer several queries in a row for the same manifest (the vid parameter). It is least efficient when it is passed intermixed manifest IDs, e.g. (1, 3, 1, 4, 1,...). This is a side-effect of the caching used in the computation of ancestors for a given vid. */ | | < | < | 13022 13023 13024 13025 13026 13027 13028 13029 13030 13031 13032 13033 13034 13035 13036 13037 13038 13039 13040 13041 13042 13043 13044 13045 | This routine is much more efficient if used to answer several queries in a row for the same manifest (the vid parameter). It is least efficient when it is passed intermixed manifest IDs, e.g. (1, 3, 1, 4, 1,...). This is a side-effect of the caching used in the computation of ancestors for a given vid. */ FSL_EXPORT int fsl_mtime_of_manifest_file(fsl_cx * f, fsl_id_t vid, fsl_id_t fid, fsl_time_t *pMTime); /** A convenience form of fsl_mtime_of_manifest_file() which looks up fc's RID based on its UUID. vid must be the RID of the checkin version fc originates from. See fsl_mtime_of_manifest_file() for full details - this function simply calculates the 3rd argument for that one. */ FSL_EXPORT int fsl_mtime_of_F_card(fsl_cx * f, fsl_id_t vid, fsl_card_F const * fc, fsl_time_t *pMTime); /** Ensures that the given list has capacity for at least n entries. If the capacity is currently equal to or less than n, this is a no-op unless n is 0, in which case li->list is freed and the list is zeroed out. Else li->list is expanded to hold at least n elements. Returns 0 on success, FSL_RC_OOM on allocation error. |
︙ | ︙ | |||
13285 13286 13287 13288 13289 13290 13291 | The julian time of the branch. If 0 or less, default is the current time. */ double mtime; /** If true, the branch will be marked as private. */ | | | 13085 13086 13087 13088 13089 13090 13091 13092 13093 13094 13095 13096 13097 13098 13099 | The julian time of the branch. If 0 or less, default is the current time. */ double mtime; /** If true, the branch will be marked as private. */ char isPrivate; }; typedef struct fsl_branch_opt fsl_branch_opt; #define fsl_branch_opt_empty_m { \ 0/*basisRid*/, NULL/*name*/, \ NULL/*user*/, NULL/*comment*/, \ NULL/*bgColor*/, \ 0.0/*mtime*/, 0/*isPrivate*/ \ |
︙ | ︙ | |||
13620 13621 13622 13623 13624 13625 13626 | problems, another (more serious) result code is returned, e.g. FSL_RC_OOM or FSL_RC_DB. If FSL_RC_NOT_FOUND is returned and hashOut is not NULL, *hashOut is set to the value of f's preferred hash. *ridOut is only modified if 0 is returned, in which case *ridOut will have a positive value. */ | | < | 13420 13421 13422 13423 13424 13425 13426 13427 13428 13429 13430 13431 13432 13433 13434 | problems, another (more serious) result code is returned, e.g. FSL_RC_OOM or FSL_RC_DB. If FSL_RC_NOT_FOUND is returned and hashOut is not NULL, *hashOut is set to the value of f's preferred hash. *ridOut is only modified if 0 is returned, in which case *ridOut will have a positive value. */ FSL_EXPORT int fsl_repo_blob_lookup( fsl_cx * f, fsl_buffer const * src, fsl_id_t * ridOut, fsl_uuid_str * hashOut ); /** Returns true if the specified file name ends with any reserved name, e.g.: _FOSSIL_ or .fslckout. For the sake of efficiency, zFilename must be a canonical name, |
︙ | ︙ | |||
13669 13670 13671 13672 13673 13674 13675 | This routine does not require that f have an opened repo, but if it does then this routine compares the canonicalized forms of both the repository db and the given path and fails if zPath refers to the repository db. Be aware that the relativeToCwd flag may influence that test. | | | | | > | < | | > | < | | 13468 13469 13470 13471 13472 13473 13474 13475 13476 13477 13478 13479 13480 13481 13482 13483 13484 13485 13486 13487 13488 13489 13490 13491 13492 13493 13494 13495 13496 13497 13498 13499 13500 13501 13502 13503 13504 | This routine does not require that f have an opened repo, but if it does then this routine compares the canonicalized forms of both the repository db and the given path and fails if zPath refers to the repository db. Be aware that the relativeToCwd flag may influence that test. TODO/FIXME: if f's 'manifest' config setting is set to true AND zPath refers to the top of the checkout root, treat the files (manifest, manifest.uuid, manifest.tags) as reserved. If it is a string with any of the letters "r", "u", or "t", check only the file(s) which those letters represent (see add.c:fossil_reserved_name() in fossil). Apply these only at the top of the tree - allow them in subdirectories. */ FSL_EXPORT int fsl_reserved_fn_check(fsl_cx *f, const char *zPath, fsl_int_t nFile, bool relativeToCwd); /** Recompute/rebuild the entire repo.leaf table. This is not normally needed, as leaf tracking is part of the crosslinking process, but "just in case," here it is. This can supposedly be expensive (in time) for a really large repository. Testing implies otherwise. Returns 0 on success. Error may indicate that f has no repo db opened. On error f's error state may be updated. */ FSL_EXPORT int fsl_repo_leaves_rebuild(fsl_cx * f); /** Flags for use with fsl_leaves_compute(). */ enum fsl_leaves_compute_e { /** Compute all leaves regardless of the "closed" tag. |
︙ | ︙ | |||
13737 13738 13739 13740 13741 13742 13743 | fsl_repo_leaves_rebuild()). @see fsl_leaves_computed_has() @see fsl_leaves_computed_count() @see fsl_leaves_computed_latest() @see fsl_leaves_computed_cleanup() */ | | | | | | | | | 13536 13537 13538 13539 13540 13541 13542 13543 13544 13545 13546 13547 13548 13549 13550 13551 13552 13553 13554 13555 13556 13557 13558 13559 13560 13561 13562 13563 13564 13565 13566 13567 13568 13569 13570 13571 13572 13573 13574 13575 13576 13577 13578 13579 13580 13581 13582 13583 13584 13585 13586 13587 13588 13589 13590 13591 13592 13593 13594 13595 13596 13597 13598 13599 13600 13601 13602 13603 13604 13605 13606 13607 13608 13609 13610 13611 13612 13613 13614 13615 13616 13617 13618 13619 13620 13621 13622 | fsl_repo_leaves_rebuild()). @see fsl_leaves_computed_has() @see fsl_leaves_computed_count() @see fsl_leaves_computed_latest() @see fsl_leaves_computed_cleanup() */ FSL_EXPORT int fsl_leaves_compute(fsl_cx * f, fsl_id_t vid, fsl_leaves_compute_e leafMode); /** Requires that a prior call to fsl_leaves_compute() has succeeded, else results are undefined. Returns true if the leaves list computed by fsl_leaves_compute() is not empty, else false. This is more efficient than checking against fsl_leaves_computed_count()>0. */ FSL_EXPORT bool fsl_leaves_computed_has(fsl_cx * f); /** Requires that a prior call to fsl_leaves_compute() has succeeded, else results are undefined. Returns a count of the leaves list computed by fsl_leaves_compute(), or a negative value if a db-level error is encountered. On errors other than FSL_RC_OOM, f's error state will be updated with information about the error. */ FSL_EXPORT fsl_int_t fsl_leaves_computed_count(fsl_cx * f); /** Requires that a prior call to fsl_leaves_compute() has succeeded, else results are undefined. Returns the RID of the most recent checkin from those computed by fsl_leaves_compute(), 0 if no entries are found, or a negative value if a db-level error is encountered. On errors other than FSL_RC_OOM, f's error state will be updated with information about the error. */ FSL_EXPORT fsl_id_t fsl_leaves_computed_latest(fsl_cx * f); /** Cleans up any db-side resources created by fsl_leaves_compute(). e.g. drops the temporary table created by that routine. Any errors are silenty ignored. */ FSL_EXPORT void fsl_leaves_computed_cleanup(fsl_cx * f); /** Returns true if f's current repository has the forbid-delta-manifests setting set to a truthy value. Results are undefined if f has no opened repository. Some routines behave differently if this setting is enabled. e.g. fsl_checkin_commit() will never generate a delta manifest and fsl_deck_save() will refuse to save a delta. This does not affect parsing or deltas or those which are injected into the db via lower-level means (e.g. a direct blob import or from a remote sync). Results are undefined if f has no opened repository. */ FSL_EXPORT bool fsl_repo_forbids_delta_manifests(fsl_cx * f); /** This is a variant of fsl_ckout_manifest_write() which writes data regarding the given manifest RID to the given blobs. If manifestRid is 0 or less then the current checkout is assumed and FSL_RC_NOT_A_CKOUT is returned if no checkout is opened (or FSL_RC_RANGE if an empty checkout is opened - a freshly-created repository with no checkins). For each buffer argument which is not NULL, the corresponding checkin-related data are appended to it. All such blobs will end in a terminating newline character. Returns 0 on success, any of numerious non-0 fsl_rc_e codes on error. */ FSL_EXPORT int fsl_repo_manifest_write(fsl_cx *f, fsl_id_t manifestRid, fsl_buffer * const manifest, fsl_buffer * const manifestUuid, fsl_buffer * const manifestTags ); /** |
︙ | ︙ | |||
13979 13980 13981 13982 13983 13984 13985 13986 13987 13988 13989 13990 13991 13992 | TODO: figure out and explain the difference between versionRid and originRid. */ fsl_id_t originRid; /** The maximum number of versions to search through. */ uint32_t limitVersions; /** An approximate number of milliseconds of processing time to limit the annotation to. Note that this is measured in CPU time, not "wall clock" time. This value is rough minimum approximation, | > > > > | 13778 13779 13780 13781 13782 13783 13784 13785 13786 13787 13788 13789 13790 13791 13792 13793 13794 13795 | TODO: figure out and explain the difference between versionRid and originRid. */ fsl_id_t originRid; /** The maximum number of versions to search through. Note that fossil(1) offers the ability to limit the calculation based on processing time, e.g. to 1500ms. We may or may not add that in this library. */ uint32_t limitVersions; /** An approximate number of milliseconds of processing time to limit the annotation to. Note that this is measured in CPU time, not "wall clock" time. This value is rough minimum approximation, |
︙ | ︙ | |||
14162 14163 14164 14165 14166 14167 14168 | /** Options for the rebuild process. */ struct fsl_rebuild_opt { /** Scan artifacts in a random order (generally only of use in testing | | | > | | 13965 13966 13967 13968 13969 13970 13971 13972 13973 13974 13975 13976 13977 13978 13979 13980 13981 13982 13983 13984 13985 13986 13987 13988 13989 | /** Options for the rebuild process. */ struct fsl_rebuild_opt { /** Scan artifacts in a random order (generally only of use in testing the library's code). NOT YET IMPLEMENTED. */ bool randomize; /** True if clusters should be created. NOT YET IMPLEMENTED. */ bool clustering; /** If true, the transaction started by the rebuild process will end in a rollback even on success. In that case, if a transaction is started before the rebuild is initiated, it will be left in the rolling-back state after rebuild completes. */ bool dryRun; |
︙ | ︙ | |||
14193 14194 14195 14196 14197 14198 14199 | Optional state for the callback function. */ void * callbackState; }; /** Initialized-with-defaults fsl_rebuild_opt structure, intended for const-copy initialization. */ | | > | 13997 13998 13999 14000 14001 14002 14003 14004 14005 14006 14007 14008 14009 14010 14011 14012 14013 14014 14015 14016 | Optional state for the callback function. */ void * callbackState; }; /** Initialized-with-defaults fsl_rebuild_opt structure, intended for const-copy initialization. */ #define fsl_rebuild_opt_empty_m {false,false,false} /** Initialized-with-defaults fsl_rebuild_opt structure, intended for non-const copy initialization. */ FSL_EXPORT const fsl_rebuild_opt fsl_rebuild_opt_empty; /** "Rebuilds" the current repository database. This involves _at least_ the following: - DROPPING all transient repository tables. ALL tables in the db which do not specifically belong to fossil and do not start with |
︙ | ︙ | |||
14247 14248 14249 14250 14251 14252 14253 | artifacts, so this routine does _not_ drop and rebuild the ticket-related tables. If the FSL_CX_F_SKIP_UNKNOWN_CROSSLINKS flag is _not_ set on f, this routine _will fail_ if it encounters any ticket artifacts. */ FSL_EXPORT int fsl_repo_rebuild(fsl_cx * const f, fsl_rebuild_opt const * const opt); | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 14052 14053 14054 14055 14056 14057 14058 14059 14060 14061 14062 14063 14064 14065 14066 14067 14068 14069 14070 14071 14072 14073 14074 14075 14076 14077 14078 14079 14080 14081 14082 14083 14084 14085 14086 14087 14088 14089 14090 14091 14092 14093 14094 14095 14096 14097 14098 14099 14100 | artifacts, so this routine does _not_ drop and rebuild the ticket-related tables. If the FSL_CX_F_SKIP_UNKNOWN_CROSSLINKS flag is _not_ set on f, this routine _will fail_ if it encounters any ticket artifacts. */ FSL_EXPORT int fsl_repo_rebuild(fsl_cx * const f, fsl_rebuild_opt const * const opt); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_REPO_H_INCLUDED */ /* end of file ../include/fossil-scm/fossil-repo.h */ /* start of file ../include/fossil-scm/fossil-checkout.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_CHECKOUT_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_CHECKOUT_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /** @file fossil-checkout.h fossil-checkout.h declares APIs specifically dealing with checkout-side state, as opposed to purely repository-db-side state or non-content-related APIs. */ #if defined(__cplusplus) extern "C" { #endif /** Returns version information for the current checkout. If f has an opened checkout then... If uuid is not NULL then *uuid is set to the UUID of the opened checkout, or NULL if there is no checkout. If rid is not NULL, *rid |
︙ | ︙ | |||
14806 14807 14808 14809 14810 14811 14812 | as those always "seed" the database with an initial commit artifact containing no files. */ FSL_EXPORT void fsl_ckout_version_info(fsl_cx * const f, fsl_id_t * const rid, fsl_uuid_cstr * const uuid ); /** | | | | | | 14111 14112 14113 14114 14115 14116 14117 14118 14119 14120 14121 14122 14123 14124 14125 14126 14127 14128 14129 | as those always "seed" the database with an initial commit artifact containing no files. */ FSL_EXPORT void fsl_ckout_version_info(fsl_cx * const f, fsl_id_t * const rid, fsl_uuid_cstr * const uuid ); /** Given a fsl_cx with an opened checkout, and a filename, this function canonicalizes zOrigName to a form suitable for use as an in-repo filename, _appending_ the results to pOut. If pOut is NULL, it performs its normal checking but does not write a result, other than to return 0 for success. As a special case, if zOrigName refers to the top-level checkout directory, it resolves to either "." or "./", depending on whether zOrigName contains a trailing slash. If relativeToCwd is true then the filename is canonicalized based on the current working directory (see fsl_getcwd()), |
︙ | ︙ | |||
14843 14844 14845 14846 14847 14848 14849 | This function does not validate whether or not the file actually exists, only that its name is potentially valid as a filename for use in a checkout (though other, downstream rules might prohibit that, e.g. the filename "..../...." is not valid but is not seen as invalid by this function). (Reminder to self: we could run the end result through fsl_is_simple_pathname() to catch that?) */ | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | < | | > | 14148 14149 14150 14151 14152 14153 14154 14155 14156 14157 14158 14159 14160 14161 14162 14163 14164 14165 14166 14167 14168 14169 14170 14171 14172 14173 14174 14175 14176 14177 14178 14179 14180 14181 14182 14183 14184 | This function does not validate whether or not the file actually exists, only that its name is potentially valid as a filename for use in a checkout (though other, downstream rules might prohibit that, e.g. the filename "..../...." is not valid but is not seen as invalid by this function). (Reminder to self: we could run the end result through fsl_is_simple_pathname() to catch that?) */ FSL_EXPORT int fsl_ckout_filename_check( fsl_cx * f, bool relativeToCwd, char const * zOrigName, fsl_buffer * pOut ); /** Callback type for use with fsl_ckout_manage_opt(). It should inspect the given filename using whatever criteria it likes, set *include to true or false to indicate whether the filename is okay to include the current add-file-to-repo operation, and return 0. If it returns non-0 the add-file-to-repo process will end and that error code will be reported to its caller. Such result codes must come from the FSL_RC_xxx family. It will be passed a name which is relative to the top-most checkout directory. The final argument is not used by the library, but is passed on as-is from the fsl_ckout_manage_opt::callbackState pointer which is passed to fsl_ckout_manage(). */ typedef int (*fsl_ckout_manage_f)(const char *zFilename, bool *include, void *state); /** Options for use with fsl_ckout_manage(). */ struct fsl_ckout_manage_opt { /** The file or directory name to add. If it is a directory, the add process will recurse into it. |
︙ | ︙ | |||
14997 14998 14999 15000 15001 15002 15003 15004 15005 15006 15007 15008 15009 15010 | any of those globs. - The client-provided callback says not to include the file. */ uint32_t skipped; } counts; }; /** Initialized-with-defaults fsl_ckout_manage_opt instance, intended for use in const-copy initialization. */ #define fsl_ckout_manage_opt_empty_m {\ NULL/*filename*/, true/*relativeToCwd*/, true/*checkIgnoreGlobs*/, \ NULL/*callback*/, NULL/*callbackState*/, \ | > | 14256 14257 14258 14259 14260 14261 14262 14263 14264 14265 14266 14267 14268 14269 14270 | any of those globs. - The client-provided callback says not to include the file. */ uint32_t skipped; } counts; }; typedef struct fsl_ckout_manage_opt fsl_ckout_manage_opt; /** Initialized-with-defaults fsl_ckout_manage_opt instance, intended for use in const-copy initialization. */ #define fsl_ckout_manage_opt_empty_m {\ NULL/*filename*/, true/*relativeToCwd*/, true/*checkIgnoreGlobs*/, \ NULL/*callback*/, NULL/*callbackState*/, \ |
︙ | ︙ | |||
15045 15046 15047 15048 15049 15050 15051 | ``` Returns 0 on success, non-0 on error. Files queued for addition this way can be unqueued before they are committed using fsl_ckout_unmanage(). | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | < < | | | > > > > | | 14305 14306 14307 14308 14309 14310 14311 14312 14313 14314 14315 14316 14317 14318 14319 14320 14321 14322 14323 14324 14325 14326 14327 14328 14329 14330 14331 14332 14333 14334 14335 14336 14337 14338 14339 14340 14341 14342 14343 | ``` Returns 0 on success, non-0 on error. Files queued for addition this way can be unqueued before they are committed using fsl_ckout_unmanage(). @see fsl_ckout_unmanage() @see fsl_reserved_fn_check() */ FSL_EXPORT int fsl_ckout_manage( fsl_cx * const f, fsl_ckout_manage_opt * const opt ); /** Callback type for use with fsl_ckout_unmanage(). It is called by the removal process, immediately after a file is "removed" from SCM management (a.k.a. when the file becomes "unmanaged"). If it returns non-0 the unmanage process will end and that error code will be reported to its caller. Such result codes must come from the FSL_RC_xxx family. It will be passed a name which is relative to the top-most checkout directory. The client is free to unlink the file from the filesystem if they like - the library does not do so automatically The final argument is not used by the library, but is passed on as-is from the callbackState pointer which is passed to fsl_ckout_unmanage(). */ typedef int (*fsl_ckout_unmanage_f)(const char *zFilename, void *state); /** Options for use with fsl_ckout_unmanage(). */ struct fsl_ckout_unmanage_opt { /** The file or directory name to add. If it is a directory, the add |
︙ | ︙ | |||
15167 15168 15169 15170 15171 15172 15173 15174 15175 15176 15177 15178 15179 15180 15181 | The name it is passed is relative to the checkout root. */ fsl_ckout_unmanage_f callback; /** State to be passed to this->callback. */ void * callbackState; }; /** Initialized-with-defaults fsl_ckout_unmanage_opt instance, intended for use in const-copy initialization. */ #define fsl_ckout_unmanage_opt_empty_m {\ NULL/*filename*/, NULL/*vfileIds*/,\ true/*relativeToCwd*/,true/*scanForChanges*/, \ | > > | 14380 14381 14382 14383 14384 14385 14386 14387 14388 14389 14390 14391 14392 14393 14394 14395 14396 | The name it is passed is relative to the checkout root. */ fsl_ckout_unmanage_f callback; /** State to be passed to this->callback. */ void * callbackState; }; typedef struct fsl_ckout_unmanage_opt fsl_ckout_unmanage_opt; /** Initialized-with-defaults fsl_ckout_unmanage_opt instance, intended for use in const-copy initialization. */ #define fsl_ckout_unmanage_opt_empty_m {\ NULL/*filename*/, NULL/*vfileIds*/,\ true/*relativeToCwd*/,true/*scanForChanges*/, \ |
︙ | ︙ | |||
15643 15644 15645 15646 15647 15648 15649 | opt->filename must refer to a path within the current checkout. @see fsl_checkin_enqueue() @see fsl_checkin_is_enqueued() @see fsl_checkin_discard() @see fsl_checkin_commit() */ | | | | | | | | | < < | < | | 14858 14859 14860 14861 14862 14863 14864 14865 14866 14867 14868 14869 14870 14871 14872 14873 14874 14875 14876 14877 14878 14879 14880 14881 14882 14883 14884 14885 14886 14887 14888 14889 14890 14891 14892 14893 14894 14895 14896 14897 14898 14899 14900 14901 14902 14903 14904 14905 14906 14907 14908 14909 14910 14911 14912 14913 14914 14915 14916 14917 14918 | opt->filename must refer to a path within the current checkout. @see fsl_checkin_enqueue() @see fsl_checkin_is_enqueued() @see fsl_checkin_discard() @see fsl_checkin_commit() */ FSL_EXPORT int fsl_checkin_dequeue(fsl_cx * f, fsl_checkin_queue_opt const * opt); /** Returns true (non-0) if the file named by zName is in f's current file checkin queue. If NO files are in the current selection queue then this routine assumes that ALL files are implicitely selected. As long as at least one file is enqueued (via fsl_checkin_enqueue()) then this function only returns true for files which have been explicitly enqueued. If relativeToCwd then zName is resolved based on the current directory, otherwise it assumed to be related to the checkout's root directory. This function returning true does not necessarily indicate that the file _will_ be checked in at the next commit. If the file has not been modified at commit-time then it will not be part of the commit. This function honors the fsl_cx_is_case_sensitive() setting when comparing names. Achtung: this does not resolve directory names like fsl_checkin_enqueue() and fsl_checkin_dequeue() do. It only works with file names. @see fsl_checkin_enqueue() @see fsl_checkin_dequeue() @see fsl_checkin_discard() @see fsl_checkin_commit() */ FSL_EXPORT bool fsl_checkin_is_enqueued(fsl_cx * f, char const * zName, bool relativeToCwd); /** Discards any state accumulated for a pending checking, including any files queued via fsl_checkin_enqueue() and tags added via fsl_checkin_T_add(). @see fsl_checkin_enqueue() @see fsl_checkin_dequeue() @see fsl_checkin_is_enqueued() @see fsl_checkin_commit() @see fsl_checkin_T_add() */ FSL_EXPORT void fsl_checkin_discard(fsl_cx * f); /** Parameters for fsl_checkin_commit(). Checkins are created in a multi-step process: - fsl_checkin_enqueue() queues up a file or directory for |
︙ | ︙ | |||
16180 16181 16182 16183 16184 16185 16186 16187 | Empty-initialised fsl_repo_open_ckout_opt instance. Clients should copy this value (or fsl_repo_open_ckout_opt_empty_m) to initialise fsl_repo_open_ckout_opt instances for sane default values. */ FSL_EXPORT const fsl_repo_open_ckout_opt fsl_repo_open_ckout_opt_empty; /** Opens a checkout db for use with the currently-connected repository | > > | | < | 15392 15393 15394 15395 15396 15397 15398 15399 15400 15401 15402 15403 15404 15405 15406 15407 15408 15409 15410 | Empty-initialised fsl_repo_open_ckout_opt instance. Clients should copy this value (or fsl_repo_open_ckout_opt_empty_m) to initialise fsl_repo_open_ckout_opt instances for sane default values. */ FSL_EXPORT const fsl_repo_open_ckout_opt fsl_repo_open_ckout_opt_empty; /** Work in progress... Opens a checkout db for use with the currently-connected repository or creates a new one. If opening an existing one, it gets "stolen" from any repository it might have been previously mapped to. - Requires that f have an opened repository db and no opened checkout. Returns FSL_RC_NOT_A_REPO if no repo is opened and FSL_RC_MISUSE if a checkout *is* opened. - Creates/re-uses a .fslckout DB in the dir opt->targetDir. The directory must be NULL or already exist, else FSL_RC_NOT_FOUND is |
︙ | ︙ | |||
16205 16206 16207 16208 16209 16210 16211 | Pending: - If opening an existing checkout db for a different repo then delete the STASH and UNDO entries, as they're not valid for a different repo. */ | | < | 15418 15419 15420 15421 15422 15423 15424 15425 15426 15427 15428 15429 15430 15431 15432 | Pending: - If opening an existing checkout db for a different repo then delete the STASH and UNDO entries, as they're not valid for a different repo. */ FSL_EXPORT int fsl_repo_open_ckout( fsl_cx * f, fsl_repo_open_ckout_opt const * opt ); typedef struct fsl_ckup_state fsl_ckup_state; /** A callback type for use with fsl_ckup_state. It gets called via fsl_repo_ckout() and fsl_ckout_update() to report progress of the extraction process. It gets called after one of those functions has successfully extracted a file or skipped over it because the file |
︙ | ︙ | |||
16267 16268 16269 16270 16271 16272 16273 | /** Merge was not performed because at least one of the inputs appears to be binary. The updated-to version overwrites the previous version in this case. */ FSL_CKUP_FCHANGE_UPDATED_BINARY, /** Updated with a merge by the update process. */ FSL_CKUP_FCHANGE_MERGED, | | | 15479 15480 15481 15482 15483 15484 15485 15486 15487 15488 15489 15490 15491 15492 15493 | /** Merge was not performed because at least one of the inputs appears to be binary. The updated-to version overwrites the previous version in this case. */ FSL_CKUP_FCHANGE_UPDATED_BINARY, /** Updated with a merge by the update process. */ FSL_CKUP_FCHANGE_MERGED, /** Special case of FSL_CKUP_FCHANGE_UPDATED. Merge was performed and conflicts were detected. The newly-updated file will contain conflict markers. @see fsl_buffer_contains_merge_marker() */ FSL_CKUP_FCHANGE_CONFLICT_MERGED, /** Added in the current checkout but also contained in the |
︙ | ︙ | |||
16291 16292 16293 16294 16295 16296 16297 | TODO: use confirmer here to ask user whether to overwrite. */ FSL_CKUP_FCHANGE_CONFLICT_ADDED_UNMANAGED, /** Edited locally but removed from updated-to version. Local edits will be left in the checkout tree. */ FSL_CKUP_FCHANGE_CONFLICT_RM, /** Cannot merge if one or both of the update/updating verions of a | | < < < < < < < < < | 15503 15504 15505 15506 15507 15508 15509 15510 15511 15512 15513 15514 15515 15516 15517 15518 15519 15520 15521 15522 | TODO: use confirmer here to ask user whether to overwrite. */ FSL_CKUP_FCHANGE_CONFLICT_ADDED_UNMANAGED, /** Edited locally but removed from updated-to version. Local edits will be left in the checkout tree. */ FSL_CKUP_FCHANGE_CONFLICT_RM, /** Cannot merge if one or both of the update/updating verions of a file is a symlink The updated-to version overwrites the previous version in this case. We probably need a better name for this. */ FSL_CKUP_FCHANGE_CONFLICT_SYMLINK, /** File was renamed in the updated-to version. If a file is both modified and renamed, it is flagged as renamed instead of modified. */ FSL_CKUP_FCHANGE_RENAMED, /** Locally modified. This state appears only when "updating" a checkout to the same version. */ FSL_CKUP_FCHANGE_EDITED |
︙ | ︙ | |||
16585 16586 16587 16588 16589 16590 16591 | repo, FSL_RC_NOT_A_CKOUT if no checkout is opened. If cOpt->callback is not NULL and returns a non-0 result code, extraction ends and that result is returned. If it returns non-0 at any point after basic argument validation, it rolls back all changes or sets the current transaction stack into a rollback state. | | | 15788 15789 15790 15791 15792 15793 15794 15795 15796 15797 15798 15799 15800 15801 15802 | repo, FSL_RC_NOT_A_CKOUT if no checkout is opened. If cOpt->callback is not NULL and returns a non-0 result code, extraction ends and that result is returned. If it returns non-0 at any point after basic argument validation, it rolls back all changes or sets the current transaction stack into a rollback state. @see fsl_repo_ckout_open() */ FSL_EXPORT int fsl_repo_ckout(fsl_cx * f, fsl_ckup_opt const * cOpt); /** UNDER CONSTRUCTION. |
︙ | ︙ | |||
16640 16641 16642 16643 16644 16645 16646 | FSL_EXPORT int fsl_ckout_calc_update_version(fsl_cx * f, fsl_id_t * outRid); /** Bitmask used by fsl_ckout_manifest_setting() and fsl_ckout_manifest_write(). */ enum fsl_cx_manifest_mask_e { | < < < | 15843 15844 15845 15846 15847 15848 15849 15850 15851 15852 15853 15854 15855 15856 15857 15858 | FSL_EXPORT int fsl_ckout_calc_update_version(fsl_cx * f, fsl_id_t * outRid); /** Bitmask used by fsl_ckout_manifest_setting() and fsl_ckout_manifest_write(). */ enum fsl_cx_manifest_mask_e { FSL_MANIFEST_MAIN = 0x001, FSL_MANIFEST_UUID = 0x010, FSL_MANIFEST_TAGS = 0x100 }; typedef enum fsl_cx_manifest_mask_e fsl_cx_manifest_mask_e; /** Returns a bitmask representing which manifest files, if any, will be written when opening or updating a checkout directory, as |
︙ | ︙ | |||
16730 16731 16732 16733 16734 16735 16736 | written by this routine and is also not part of the current checkout (i.e. not listed in the vfile table) will be removed from disk, but a failure while attempting to do so will be silently ignored. @see fsl_repo_manifest_write() */ | | | | | | 15930 15931 15932 15933 15934 15935 15936 15937 15938 15939 15940 15941 15942 15943 15944 15945 15946 15947 15948 15949 15950 15951 15952 15953 15954 15955 15956 15957 15958 15959 15960 15961 15962 15963 15964 15965 15966 15967 15968 | written by this routine and is also not part of the current checkout (i.e. not listed in the vfile table) will be removed from disk, but a failure while attempting to do so will be silently ignored. @see fsl_repo_manifest_write() */ FSL_EXPORT int fsl_ckout_manifest_write(fsl_cx *f, int manifest, int manifestUuid, int manifestTags, int *wroteWhat ); /** Returns true if f has an opened checkout and the given absolute path is rooted in that checkout, else false. As a special case, it returns false if the path _is_ the checkout root unless zAbsPath has a trailing slash. (The checkout root is always stored with a trailing slash because that simplifies its internal usage.) Note that this is strictly a string comparison, not a filesystem-level operation. */ FSL_EXPORT bool fsl_is_rooted_in_ckout(fsl_cx *f, char const *zAbsPath); /** Works like fsl_is_rooted_in_ckout() except that it returns 0 on success, and on error updates f with a description of the problem and returns non-0: FSL_RC_RANGE or (if updating the error state fails) FSL_RC_OOM. */ FSL_EXPORT int fsl_is_rooted_in_ckout2(fsl_cx *f, char const *zAbsPath); /** Change-type values for use with fsl_ckout_revert_f() callbacks. */ enum fsl_ckout_revert_e { /** Sentinel value. */ FSL_REVERT_NONE = 0, |
︙ | ︙ | |||
16978 16979 16980 16981 16982 16983 16984 | filenames in a more flexible form than that routine. This routine works exactly like that one except for the following differences: 1) The given filename and the relativeToCwd arguments are passed to by fsl_ckout_filename_check() to canonicalize the name and ensure that it points to someplace within f's current checkout. | < < < | < < | | | < | 16178 16179 16180 16181 16182 16183 16184 16185 16186 16187 16188 16189 16190 16191 16192 16193 16194 16195 16196 16197 16198 | filenames in a more flexible form than that routine. This routine works exactly like that one except for the following differences: 1) The given filename and the relativeToCwd arguments are passed to by fsl_ckout_filename_check() to canonicalize the name and ensure that it points to someplace within f's current checkout. 2) Because of (1), zName may not be NULL or empty. To fetch all of the vfile IDs for the current checkout, pass a zName of "." and relativeToCwd=false. Returns 0 on success, FSL_RC_MISUSE if zName is NULL or empty, FSL_RC_OOM on allocation error, FSL_RC_NOT_A_CKOUT if f has no opened checkout. */ FSL_EXPORT int fsl_ckout_vfile_ids( fsl_cx * const f, fsl_id_t vid, fsl_id_bag * const dest, char const * zName, bool relativeToCwd, bool changedOnly ); /** |
︙ | ︙ | |||
17101 17102 17103 17104 17105 17106 17107 | it should be. TODO: currently the library offers no automated recovery mechanism from a mismatch, the only remedy being to close the checkout database, destroy it, and re-create it. fossil(1) is able, in some cases, to automatically recover from this situation. */ | | | 16295 16296 16297 16298 16299 16300 16301 16302 16303 16304 16305 16306 16307 16308 16309 | it should be. TODO: currently the library offers no automated recovery mechanism from a mismatch, the only remedy being to close the checkout database, destroy it, and re-create it. fossil(1) is able, in some cases, to automatically recover from this situation. */ FSL_EXPORT int fsl_ckout_fingerprint_check(fsl_cx * f); /** Looks for the given file in f's current checkout. If relativeToCwd then the name is resolved from the current directory, otherwise it is assumed to be relative to the checkout root or an absolute path with the checkout dir as a prefix of that path. |
︙ | ︙ | |||
17130 17131 17132 17133 17134 17135 17136 | char const * zName, fsl_buffer * const dest); /** Fetches the timestamp of the given F-card's name against the filesystem and/or the most recent checkin in which it was modified (as reported by fsl_mtime_of_manifest()). vid is the checkin | | | 16324 16325 16326 16327 16328 16329 16330 16331 16332 16333 16334 16335 16336 16337 16338 | char const * zName, fsl_buffer * const dest); /** Fetches the timestamp of the given F-card's name against the filesystem and/or the most recent checkin in which it was modified (as reported by fsl_mtime_of_manifest()). vid is the checkin version to look at. If it's 0, the current checkout will be used. On success, returns 0 and: - If repoMtime is not NULL then (*repoMtime) is assigned to the result of fsl_mtime_of_manifest_file() for the given file. - If localMtime is not NULL then (*localMtime) is assigned to |
︙ | ︙ | |||
17154 17155 17156 17157 17158 17159 17160 17161 | - FSL_RC_OOM. */ FSL_EXPORT int fsl_card_F_ckout_mtime(fsl_cx * const f, fsl_id_t vid, fsl_card_F const * const fc, fsl_time_t * repoMtime, fsl_time_t * localMtime); /** | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < | < < | < < | < < < < < | < < < < < < | | < < < < < < < | > > > > < < < < | | | | | | < | | | < < < < | < < | < < < < < < < < < < < < < | > | | | | | > > > > > > | | < < < | > < < > > | | > | | < < | | < < | | < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | 16348 16349 16350 16351 16352 16353 16354 16355 16356 16357 16358 16359 16360 16361 16362 16363 16364 16365 16366 16367 16368 16369 16370 16371 16372 16373 16374 16375 16376 16377 16378 16379 16380 16381 16382 16383 16384 16385 16386 16387 16388 16389 16390 16391 16392 16393 16394 16395 16396 16397 16398 16399 16400 16401 16402 16403 16404 16405 16406 16407 16408 16409 16410 16411 16412 16413 16414 16415 16416 16417 16418 16419 16420 16421 16422 16423 16424 16425 16426 16427 16428 16429 16430 16431 16432 16433 16434 16435 16436 16437 16438 16439 16440 16441 16442 16443 16444 16445 16446 16447 16448 16449 16450 16451 16452 16453 16454 16455 16456 16457 16458 16459 16460 16461 16462 16463 16464 16465 16466 16467 16468 16469 16470 16471 16472 16473 16474 16475 16476 16477 16478 16479 16480 16481 16482 16483 16484 16485 16486 16487 16488 16489 16490 16491 16492 16493 16494 16495 16496 16497 16498 16499 16500 16501 16502 16503 16504 16505 16506 16507 16508 16509 16510 16511 16512 16513 16514 16515 16516 16517 16518 16519 16520 16521 16522 16523 16524 16525 16526 16527 16528 16529 16530 16531 16532 16533 16534 16535 16536 16537 16538 16539 16540 16541 16542 16543 16544 16545 16546 16547 16548 16549 16550 16551 16552 16553 16554 16555 16556 16557 16558 16559 16560 16561 16562 16563 | - FSL_RC_OOM. */ FSL_EXPORT int fsl_card_F_ckout_mtime(fsl_cx * const f, fsl_id_t vid, fsl_card_F const * const fc, fsl_time_t * repoMtime, fsl_time_t * localMtime); /** UNDER CONSTRUCTION! INCOMPLETE! */ struct fsl_merge_state { /** State to be passed to this->callback via the fsl_merge_state::callbackState member. */ void * callbackState; fsl_ckup_fchange_e fileChangeType; fsl_ckup_rm_state_e fileRmInfo; }; typedef struct fsl_merge_state fsl_merge_state; /** Callback type for use with fsl_merge_opt and fsl_merge(). TODO: figure out whether we can use fsl_ckout_state for this or whether we need a new type. Merge and update are quite similar, so the current thinking is that we can recycling this. */ typedef int (*fsl_merge_f)(fsl_merge_state const * const); /** Merge type enum for use with fsl_merge_opt::mergeType. */ enum fsl_merge_type_e { /** Indicates a normal merge. */ FSL_MERGE_TYPE_NORMAL, /** Indicates an "integrate" merge, which tells the next checkin operation to apply a "closed" tag to the checkin from which this merge is performed (effectively closing its branch). Certain merge-time state will force this merge type to behave like FSL_MERGE_TYPE_NORMAL: - If the being-merged-in content is marked as private. - If the being-merged-in content is not a leaf. */ FSL_MERGE_TYPE_INTEGRATE, /** Indicates a cherrypick merge, pulling in only the changes made to a specific checkin without otherwise inheriting its lineage. */ FSL_MERGE_TYPE_CHERRYPICK, /** Indicates a backout merge, a reverse cherrypick, backing out any changes which were added by this->checkinRid. */ FSL_MERGE_TYPE_BACKOUT }; typedef enum fsl_merge_type_e fsl_merge_type_e; /** UNDER CONSTRUCTION. Options for use with fsl_ckout_merge(). */ struct fsl_merge_opt { /** The version of the repostitory to merge into the current checkout. This must be the blob.rid of a checkin artifact. */ fsl_id_t mergeRid; /** The version of the most recent common ancestor. Must normally be 0. The default is calculated automatically based on this->mergeRid and this->mergeType. This corresponds to fossil(1)'s --baseline merge flag. */ fsl_id_t baselineRid; /** Specifies the merge type to perform. */ fsl_merge_type_e mergeType; /** Gets called once per merge-updated file, passed a fsl_ckup_state instance with information about the merged file and related metadata. May be NULL. */ fsl_merge_f callback; /** State to be passed to this->callback via the fsl_merge_state::callbackState member. */ void * callbackState; /** A hint to fsl_merge() about whether it needs to scan the checkout for changes. Set this to false ONLY if the calling code calls fsl_ckout_changes_scan() (or equivalent, e.g. fsl_vfile_changes_scan()) immediately before calling fsl_merge(), as that function require a non-stale changes scan in order to function properly. */ bool scanForChanges; /** If true, on merge conflict retain the temporary files used for mergin: `*-baseline`, `*-original`, and `*-merge`. By default these are removed because they're very rarely useful. */ bool keepMergeFiles; /** If true, the extraction process will "go through the motions" but will not write any files to disk. It will perform I/O such as stat()'ing to see, e.g., if it would have needed to overwrite a file. */ bool dryRun; /** This flag is not part of the public API and will be removed once the merge operation's development has settled down. */ unsigned short debug; /** TODO: - How to handle fossil's --binary GLOBPATTERN flag. Plain string or a glob list object or a stateful predicate function or... ? */ }; /** Convenience typedef. */ typedef struct fsl_merge_opt fsl_merge_opt; /** Initialized-with-defaults fsl_merge_opt structure, intended for const-copy initialization. */ #define fsl_merge_opt_empty_m \ {-1/*mergeRid*/,0/*baselineRid*/, \ FSL_MERGE_TYPE_NORMAL/*mergeType*/, \ NULL/*callback*/, NULL/*callbackState*/, \ true/*scanForChanges*/, false/*keepMergeFiles*/, \ false/*dryRun*/,0/*debug*/} /** Initialized-with-defaults fsl_merge_opt structure, intended for non-const copy initialization. */ extern const fsl_merge_opt fsl_merge_opt_empty; /** UNDER CONSTRUCTION and NOT YET IMPLEMENTED for the foreseeable future. Performs a "merge" operation on the current checkout, merging in version opt->mergeRid. If that version has already been merged, this call has no SCM-related side effects. Returns 0 on success, any number of non-0 codes on error, including, but not limited to: - FSL_RC_NOT_A_CKOUT if f has no opened checkout. - FSL_RC_OOM on allocation error. - FSL_RC_TYPE if opt->mergeRid does to refer to a checkin. - FSL_RC_PHANTOM if a file participating in the merge is a phantom. - FSL_RC_RANGE if the to-be-merged-in RID is the same as the current checkout RID or the same as the pivot/baseline of the merge. - FSL_RC_NOT_FOUND if no common ancestor can be found for use as a basis for the merge. - FSL_RC_MISUSE if the current checkout is empty (has an RID of 0). - Any number of DB- or I/O-related codes, as well as codes from underlying APIs such as fsl_vfile_changes_scan(). For most errors, f's error state will be updated with a description of the problem. Reminder: there are certain illegal combinations of merge state which may require adding new result codes for. e.g. a no-op merge. */ FSL_EXPORT int fsl_ckout_merge(fsl_cx * const f, fsl_merge_opt const * const opt); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_CHECKOUT_H_INCLUDED */ /* end of file ../include/fossil-scm/fossil-checkout.h */ /* start of file ../include/fossil-scm/fossil-confdb.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_CONFDB_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_CONFDB_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /** @file fossil-confdb.h fossil-confdb.h declares APIs dealing with fossil's various configuration option storage backends. */ #if defined(__cplusplus) |
︙ | ︙ | |||
17610 17611 17612 17613 17614 17615 17616 | were */ enum fsl_confdb_e { /** Sentinel value. Not for use with public APIs. */ FSL_CONFDB_NONE = 0, /** Signfies the global-level (per system user) configuration area. | < < < < < < | 16576 16577 16578 16579 16580 16581 16582 16583 16584 16585 16586 16587 16588 16589 | were */ enum fsl_confdb_e { /** Sentinel value. Not for use with public APIs. */ FSL_CONFDB_NONE = 0, /** Signfies the global-level (per system user) configuration area. */ FSL_CONFDB_GLOBAL = 1, /** Signfies the repository-level configuration area. */ FSL_CONFDB_REPO = 2, /** |
︙ | ︙ | |||
18053 18054 18055 18056 18057 18058 18059 | fsl_size_t * len); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_CONFDB_H_INCLUDED */ | | | | 17013 17014 17015 17016 17017 17018 17019 17020 17021 17022 17023 17024 17025 17026 17027 17028 | fsl_size_t * len); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_CONFDB_H_INCLUDED */ /* end of file ../include/fossil-scm/fossil-confdb.h */ /* start of file ../include/fossil-scm/fossil-vpath.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_VPATH_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_VPATH_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt |
︙ | ︙ | |||
18292 18293 18294 18295 18296 18297 18298 | #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_VPATH_H_INCLUDED */ | | | | 17252 17253 17254 17255 17256 17257 17258 17259 17260 17261 17262 17263 17264 17265 17266 17267 | #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_VPATH_H_INCLUDED */ /* end of file ../include/fossil-scm/fossil-vpath.h */ /* start of file ../include/fossil-scm/fossil-internal.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_INTERNAL_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_INTERNAL_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt |
︙ | ︙ | |||
18472 18473 18474 18475 18476 18477 18478 | */ fsl_uint_t nextAge; /** List of cached content, ordered by age. */ fsl__bccache_line * list; /** | | < | 17432 17433 17434 17435 17436 17437 17438 17439 17440 17441 17442 17443 17444 17445 17446 | */ fsl_uint_t nextAge; /** List of cached content, ordered by age. */ fsl__bccache_line * list; /** RIDs of all artifacts currently in the cache. */ fsl_id_bag inCache; /** RIDs of known-missing content. */ fsl_id_bag missing; /** |
︙ | ︙ | |||
18578 18579 18580 18581 18582 18583 18584 | /* The fsl_cx class is documented in main public header. */ struct fsl_cx { /** A pointer to the "main" db handle. Exactly which db IS the main db is, because we have three DBs, not generally knowble. | | | | < < < | | | | < < | < < < < < < < < < < | | | < < > | | < > | < | < > > > > > > > > > > > > > > > > > | > | | | 17537 17538 17539 17540 17541 17542 17543 17544 17545 17546 17547 17548 17549 17550 17551 17552 17553 17554 17555 17556 17557 17558 17559 17560 17561 17562 17563 17564 17565 17566 17567 17568 17569 17570 17571 17572 17573 17574 17575 17576 17577 17578 17579 17580 17581 17582 17583 17584 17585 17586 17587 17588 17589 17590 17591 17592 17593 17594 17595 17596 17597 17598 17599 17600 17601 17602 17603 17604 17605 17606 17607 17608 17609 17610 17611 17612 17613 17614 17615 17616 17617 17618 17619 17620 17621 17622 | /* The fsl_cx class is documented in main public header. */ struct fsl_cx { /** A pointer to the "main" db handle. Exactly which db IS the main db is, because we have three DBs, not generally knowble. As of this writing (20141027, updated 20211018) the following applies: dbMain always points to &this->dbMem (a temp or ":memory:" (unspecified!) db opened by fsl_cx_init()), and the repo/ckout/config DBs get ATTACHed to that one. Their separate handles (this->{repo,ckout,config}.db) are used to store the name and file path to each one (even though they have no real db handle associated with them). Internal code should rely as little as possible on the actual arrangement of internal DB handles, and should use fsl_cx_db_repo(), fsl_cx_db_ckout(), and fsl_cx_db_config() to get a handle to the specific db they want. Currently they will always return NULL or the same handle, but that design decision might change at some point, so the public API treats them as separate entities. _That said_: at this point (2021-10-18), treating them as separate handles often proves to be annoying in their usage, and newer code will sometimes use (e.g.) fsl_cx_prepare() in lieu of explicitely using fsl_db_prepare() with the ostensibly db-specific handle when it knows that the required db is indeed attached. In other words: the internals, in some places, are starting to rely on this long-established convention of having a single sqlite3 object and multiple attached databases, _and that's okay_. */ fsl_db * dbMain; /** Marker which tells us whether fsl_cx_finalize() needs to fsl_free() this instance or not. */ void const * allocStamp; /** A ":memory:" (or "") db to work around open-vs-attach-vs-main-vs-real-name problems wrt to the repo/ckout/config dbs. This db handle gets opened automatically at startup and all others which a fsl_cx manages get ATTACHed to it. Thus the other internal fsl_db objects, e.g. this->repo.db, may hold state, such as the path to the current repo db, but they do NOT hold an sqlite3 db handle. Assigning them the handle of this->dbMain would indeed simplify certain work but it would require special care to ensure that we never sqlite3_close() those out from under this->dbMain. */ fsl_db dbMem; /** Holds info directly related to a checkout database. */ struct { /** Holds the filename of the current checkout db and possibly related state. Historically (very historically) it could also be the `main` db, but that is no longer the case. */ fsl_db db; /** The directory part of an opened checkout db. This is currently only set by fsl_ckout_open_dir(). It contains a trailing slash, largely because that simplifies porting fossil(1) code and appending filenames to this directory name to create absolute paths (a frequently-needed option). Useful for doing absolute-to-relative path conversions for checking file lists. */ char * dir; /** Optimization: fsl_strlen() of dir. Guaranteed to be set to dir's length if dir is not NULL. */ fsl_size_t dirLen; /** The rid of the current checkout. May be 0 for an empty repo/checkout. Must be negative if not yet known. */ fsl_id_t rid; |
︙ | ︙ | |||
18675 18676 18677 18678 18679 18680 18681 | /** Holds info directly related to a repo database. */ struct { /** Holds the filename of the current repo db and possibly related | | > | < < | < | | 17634 17635 17636 17637 17638 17639 17640 17641 17642 17643 17644 17645 17646 17647 17648 17649 17650 17651 17652 17653 17654 17655 17656 17657 17658 17659 17660 17661 17662 17663 17664 17665 17666 17667 17668 17669 17670 17671 17672 | /** Holds info directly related to a repo database. */ struct { /** Holds the filename of the current repo db and possibly related state. Historically (very historically) it could also be the `main` db, but that is no longer the case. */ fsl_db db; /** The default user name, for operations which need one. See fsl_cx_user_set(). */ char * user; } repo; /** Holds info directly related to a global config database. */ struct { /** Holds the filename of the current global config db and possibly related state. Historically (very historically) it could also be the `main` db, but that is no longer the case. */ fsl_db db; } config; /** State for incrementally proparing a checkin operation. */ struct { /** Holds a list of "selected files" in the form of vfile.id values. */ fsl_id_bag selectedIds; |
︙ | ︙ | |||
18729 18730 18731 18732 18733 18734 18735 | /** Output channel used by fsl_output() and friends. This was added primarily so that fossil client apps can share a single output channel which the user can swap out, e.g. to direct all output to a UI widget or a file. | < < < < < < < | 17686 17687 17688 17689 17690 17691 17692 17693 17694 17695 17696 17697 17698 17699 | /** Output channel used by fsl_output() and friends. This was added primarily so that fossil client apps can share a single output channel which the user can swap out, e.g. to direct all output to a UI widget or a file. */ fsl_outputer output; /** Can be used to tie client-specific data to the context. Its finalizer is called when fsl_cx_finalize() cleans up. The library does not use this state. It is intended primarily for tying, |
︙ | ︙ | |||
18760 18761 18762 18763 18764 18765 18766 18767 18768 18769 18770 | db-driver-provided error state. It is not used by "simple" routines for which an integer code always suffices. APIs which set this should denote it with a comment like "updates the context's error state on error." */ fsl_error error; /** Reuseable scratchpads for low-level file canonicalization buffering and whatnot. Not intended for huge content: use this->fileContent for that. This list should stay relatively | > > > > > > > > > > | | | 17710 17711 17712 17713 17714 17715 17716 17717 17718 17719 17720 17721 17722 17723 17724 17725 17726 17727 17728 17729 17730 17731 17732 17733 17734 17735 17736 17737 17738 17739 17740 17741 17742 17743 17744 17745 17746 17747 17748 17749 17750 17751 17752 17753 17754 17755 17756 17757 17758 | db-driver-provided error state. It is not used by "simple" routines for which an integer code always suffices. APIs which set this should denote it with a comment like "updates the context's error state on error." */ fsl_error error; /** A place for temporarily holding file content. We use this in places where we have to loop over files and read their entire contents, so that we can reuse this buffer's memory if possible. The loop and the reading might be happening in different functions, though, and some care must be taken to avoid use in two functions concurrently. */ fsl_buffer fileContent; /** Reuseable scratchpads for low-level file canonicalization buffering and whatnot. Not intended for huge content: use this->fileContent for that. This list should stay relatively short. @see fsl__cx_scratchpad() @see fsl__cx_scratchpad_yield() */ struct { /** Strictly-internal temporary buffers we intend to reuse many times, mostly for filename canonicalization, holding hash values, and small encoding/decoding tasks. These must never be used for values which will be long-lived, nor are they intended to be used for large content, e.g. reading files, with the possible exception of holding versioned config settings, as those are typically rather small. If needed, the lengths of this->buf[] and this->used[] may be extended, but anything beyond 8, maybe 10, seems a bit extreme. They should only be increased if we find code paths which require it. As of this writing (2021-03-17), the peak concurrently used was 5. In any case fsl__cx_scratchpad() fails fatally if it needs more than it has, so we won't fail to overlook such a case. */ fsl_buffer buf[8]; /** Flags telling us which of this->buf is currenly in use. */ bool used[8]; |
︙ | ︙ | |||
18816 18817 18818 18819 18820 18821 18822 | flags to the cache member along with the rest of them. */ int flags; /** Error flag which is intended to be set via signal handlers or a UI thread to tell this context to cancel any currently | | < < > > > > > > | | | 17776 17777 17778 17779 17780 17781 17782 17783 17784 17785 17786 17787 17788 17789 17790 17791 17792 17793 17794 17795 17796 17797 17798 17799 17800 17801 17802 17803 17804 17805 17806 17807 17808 17809 17810 17811 17812 17813 17814 17815 17816 17817 17818 17819 17820 | flags to the cache member along with the rest of them. */ int flags; /** Error flag which is intended to be set via signal handlers or a UI thread to tell this context to cancel any currently long-running operation. Not all operations honor this check. */ volatile int interrupted; /** List of callbacks for deck crosslinking purposes. */ fsl_xlinker_list xlinkers; /** A place for caching generic things. */ struct { /** If true, SOME repository-level file-name comparisons/searches will work case-insensitively. */ bool caseInsensitive; /** If true, skip "dephantomization" of phantom blobs. This is a detail from fossil(1) with as-yet-undetermined utility. It's apparently only used during the remote-sync process, which this API does not (as of 2021-10) yet have. */ bool ignoreDephantomizations; /** Whether or not a running commit process should be marked as private. This flag is used for communicating this flag through multiple levels of API. */ bool markPrivate; /** True if fsl__crosslink_begin() has been called but fsl__crosslink_end() is still pending. */ |
︙ | ︙ | |||
18865 18866 18867 18868 18869 18870 18871 | /** Is used to tell the content-save internals that a "final verification" (a.k.a. verify-before-commit) is underway. */ bool inFinalVerify; | < < < < < < < | 17829 17830 17831 17832 17833 17834 17835 17836 17837 17838 17839 17840 17841 17842 | /** Is used to tell the content-save internals that a "final verification" (a.k.a. verify-before-commit) is underway. */ bool inFinalVerify; /** Cached copy of the allow-symlinks config option, because it is (hypothetically) needed on many stat() call. Negative value=="not yet determined", 0==no, positive==yes. The negative value means we need to check the repo config resp. the global config to see if this is on. |
︙ | ︙ | |||
18898 18899 18900 18901 18902 18903 18904 | /** Indicates whether or not this repo has ever seen a delta manifest. If none has ever been seen then the repository will prefer to use baseline (non-delta) manifests. Once a delta is seen in the repository, the checkin algorithm is free to choose deltas later on unless its otherwise prohibited, e.g. by the | | | < < < < < < < < < < < < < < < < < | 17855 17856 17857 17858 17859 17860 17861 17862 17863 17864 17865 17866 17867 17868 17869 17870 17871 17872 17873 17874 17875 17876 17877 17878 17879 17880 17881 17882 17883 17884 17885 17886 17887 17888 17889 17890 17891 17892 17893 17894 17895 17896 17897 17898 17899 17900 17901 | /** Indicates whether or not this repo has ever seen a delta manifest. If none has ever been seen then the repository will prefer to use baseline (non-delta) manifests. Once a delta is seen in the repository, the checkin algorithm is free to choose deltas later on unless its otherwise prohibited, e.g. by the forbid-delta-manifests config db setting. This article provides an overview to the topic delta manifests and essentially debunks their ostensible benefits: https://fossil-scm.org/home/doc/tip/www/delta-manifests.md Values: negative==undetermined, 0==no, positive==yes. This is updated when a repository is first opened and when new content is written to it. */ short seenDeltaManifest; /** Records whether this repository has an FTS search index. <0=undetermined, 0=no, >0=yes. */ short searchIndexExists; /** Cache for the "manifest" config setting, as used by fsl_ckout_manifest_setting(), with the caveat that if the setting changes after it is cached, we won't necessarily see that here! */ short manifestSetting; /** Record ID of rcvfrom entry during commits. This is likely to remain unused in libf until/unless the sync protocol is implemented. */ fsl_id_t rcvId; /** fsl_content_get() cache. */ fsl__bccache blobContent; /** Used during manifest parsing to keep track of artifacts we have |
︙ | ︙ | |||
18976 18977 18978 18979 18980 18981 18982 | /** Infrastructure for fsl_mtime_of_manifest_file(). It remembers the previous RID so that it knows when it has to invalidate/rebuild its ancestry cache. */ fsl_id_t mtimeManifest; /** | | | | | 17916 17917 17918 17919 17920 17921 17922 17923 17924 17925 17926 17927 17928 17929 17930 17931 17932 17933 17934 17935 17936 17937 17938 17939 | /** Infrastructure for fsl_mtime_of_manifest_file(). It remembers the previous RID so that it knows when it has to invalidate/rebuild its ancestry cache. */ fsl_id_t mtimeManifest; /** The "project-code" config option. We do not currently (2021-03) use this but it will be important if/when the sync protocol is implemented or we want to create hashes, e.g. for user passwords, which depend in part on the project code. */ char * projectCode; /** Internal optimization to avoid duplicate stat() calls across two functions in some cases. */ fsl_fstat fstat; /** Parsed-deck cache. */ fsl__mcache mcache; |
︙ | ︙ | |||
19019 19020 19021 19022 19023 19024 19025 | */ fsl_list binary; /** Holds the "crnl-glob" globs. */ fsl_list crnl; } globs; | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 17959 17960 17961 17962 17963 17964 17965 17966 17967 17968 17969 17970 17971 17972 | */ fsl_list binary; /** Holds the "crnl-glob" globs. */ fsl_list crnl; } globs; } cache; /** Ticket-related information. */ struct { /** |
︙ | ︙ | |||
19098 19099 19100 19101 19102 19103 19104 | */ bool hasChng; /** Gets set to true (at some point) if the client has the ticketchng.rid db field. */ bool hasChngRid; | < < < < < < < < < < < > > > < < < < < < < < < < < | < | | < < | 18003 18004 18005 18006 18007 18008 18009 18010 18011 18012 18013 18014 18015 18016 18017 18018 18019 18020 18021 18022 18023 18024 18025 18026 18027 18028 18029 18030 18031 18032 18033 18034 18035 18036 18037 18038 18039 18040 18041 18042 18043 18044 18045 18046 18047 18048 18049 18050 18051 18052 18053 18054 18055 18056 18057 18058 18059 18060 18061 18062 18063 18064 18065 18066 18067 18068 18069 18070 18071 18072 18073 18074 18075 18076 18077 18078 18079 18080 18081 18082 18083 18084 18085 18086 18087 18088 18089 18090 18091 18092 18093 18094 18095 | */ bool hasChng; /** Gets set to true (at some point) if the client has the ticketchng.rid db field. */ bool hasChngRid; } ticket; /* Note: no state related to server/user/etc. That is higher-level stuff. We might need to allow the user to set a default user name to avoid that he has to explicitly set it on all of the various Control Artifact-generation bits which need it. */ }; /** @internal Initialized-with-defaults fsl_cx struct. */ #define fsl_cx_empty_m { \ NULL /*dbMain*/, \ NULL/*allocStamp*/, \ fsl_db_empty_m /* dbMem */, \ {/*ckout*/ \ fsl_db_empty_m /*db*/, \ NULL /*dir*/, 0/*dirLen*/, \ -1/*rid*/, NULL/*uuid*/, 0/*mtime*/ \ }, \ {/*repo*/ fsl_db_empty_m /*db*/, \ 0/*user*/ \ }, \ {/*config*/ fsl_db_empty_m /*db*/ }, \ {/*ckin*/ \ fsl_id_bag_empty_m/*selectedIds*/, \ fsl_deck_empty_m/*mf*/ \ }, \ fsl_confirmer_empty_m/*confirmer*/, \ fsl_outputer_FILE_m /*output*/, \ fsl_state_empty_m /*clientState*/, \ fsl_error_empty_m /*error*/, \ fsl_buffer_empty_m /*fileContent*/, \ {/*scratchpads*/ \ {fsl_buffer_empty_m,fsl_buffer_empty_m, \ fsl_buffer_empty_m,fsl_buffer_empty_m, \ fsl_buffer_empty_m,fsl_buffer_empty_m}, \ {false,false,false,false,false,false}, \ 0/*next*/ \ }, \ fsl_cx_config_empty_m /*cxConfig*/, \ FSL_CX_F_DEFAULTS/*flags*/, \ 0/*interrupted*/, \ fsl_xlinker_list_empty_m/*xlinkers*/, \ {/*cache*/ \ false/*caseInsensitive*/, \ false/*ignoreDephantomizations*/, \ false/*markPrivate*/, \ false/*isCrosslinking*/, \ false/*xlinkClustersOnly*/, \ false/*inFinalVerify*/, \ -1/*allowSymlinks*/, \ -1/*seenDeltaManifest*/, \ -1/*searchIndexExists*/, \ -1/*manifestSetting*/,\ 0/*rcvId*/, \ fsl__bccache_empty_m/*blobContent*/, \ fsl_id_bag_empty_m/*mfSeen*/, \ fsl_id_bag_empty_m/*leafCheck*/, \ fsl_id_bag_empty_m/*toVerify*/, \ 0/*mtimeManifest*/, \ NULL/*projectCode*/, \ fsl_fstat_empty_m/*fstat*/, \ fsl__mcache_empty_m/*mcache*/, \ {/*globs*/ \ fsl_list_empty_m/*ignore*/, \ fsl_list_empty_m/*binary*/, \ fsl_list_empty_m/*crnl*/ \ } \ }/*cache*/, \ {/*ticket*/ \ fsl_list_empty_m/*customFields*/, \ 0/*hasTicket*/, \ 0/*hasCTime*/, \ 0/*hasChng*/, \ 0/*hasCngRid*/ \ } \ } /** @internal Initialized-with-defaults fsl_cx instance. */ extern const fsl_cx fsl_cx_empty; |
︙ | ︙ | |||
19404 19405 19406 19407 19408 19409 19410 | left untouched. Returns 0 if a delta is successfully made or none needs to be made, non-0 on error. @see fsl__content_undeltify() */ | | | | | 18287 18288 18289 18290 18291 18292 18293 18294 18295 18296 18297 18298 18299 18300 18301 18302 18303 18304 18305 18306 18307 18308 18309 18310 18311 18312 18313 18314 18315 18316 18317 18318 18319 | left untouched. Returns 0 if a delta is successfully made or none needs to be made, non-0 on error. @see fsl__content_undeltify() */ int fsl__content_deltify(fsl_cx * f, fsl_id_t rid, fsl_id_t srcid, bool force); /** @internal Creates a new phantom blob with the given UUID and return its artifact ID via *newId. Returns 0 on success, FSL_RC_MISUSE if !f or !uuid, FSL_RC_RANGE if fsl_is_uuid(uuid) returns false, FSL_RC_NOT_A_REPO if f has no repository opened, FSL_RC_ACCESS if the given uuid has been shunned, and about 20 other potential error codes from the underlying db calls. If isPrivate is true _or_ f has been flagged as being in "private mode" then the new content is flagged as private. newId may be NULL, but if it is then the caller will have to find the record id himself by using the UUID (see fsl_uuid_to_rid()). */ int fsl__content_new( fsl_cx * f, fsl_uuid_cstr uuid, bool isPrivate, fsl_id_t * newId ); /** @internal Check to see if checkin "rid" is a leaf and either add it to the LEAF table if it is, or remove it if it is not. Returns 0 on success, FSL_RC_MISUSE if !f or f has no repo db |
︙ | ︙ | |||
19937 19938 19939 19940 19941 19942 19943 | operation. It degrades to O(N) if out-of-lexical-order searches are performed. */ fsl_card_F * fsl__deck_F_seek(fsl_deck * const d, const char *zName); /** @internal | < < < < < < < < < < < < < | | | 18820 18821 18822 18823 18824 18825 18826 18827 18828 18829 18830 18831 18832 18833 18834 18835 | operation. It degrades to O(N) if out-of-lexical-order searches are performed. */ fsl_card_F * fsl__deck_F_seek(fsl_deck * const d, const char *zName); /** @internal Part of the fsl_cx::fileContent optimization. This sets f->fileContent.used to 0 and if its capacity is over a certain (unspecified, unconfigurable) size then it is trimmed to that size. */ void fsl__cx_content_buffer_yield(fsl_cx * const f); /** @internal |
︙ | ︙ | |||
19978 19979 19980 19981 19982 19983 19984 | to the db. */ int fsl__search_doc_touch(fsl_cx * const f, fsl_satype_e saType, fsl_id_t rid, const char * docName); /** @internal | > > > > > > > > > > > > > > > > > > | | > | | < < < < < | > | | 18848 18849 18850 18851 18852 18853 18854 18855 18856 18857 18858 18859 18860 18861 18862 18863 18864 18865 18866 18867 18868 18869 18870 18871 18872 18873 18874 18875 18876 18877 18878 18879 18880 18881 18882 18883 18884 18885 18886 18887 18888 18889 18890 18891 18892 18893 18894 18895 18896 18897 18898 18899 18900 18901 18902 18903 18904 18905 18906 18907 18908 18909 18910 | to the db. */ int fsl__search_doc_touch(fsl_cx * const f, fsl_satype_e saType, fsl_id_t rid, const char * docName); /** @internal Performs the same job as fsl_diff_text() but produces the results in the low-level form of an array of "copy/delete/insert triples." This is primarily intended for internal use in other library-internal algorithms, not for client code. Note all FSL_DIFF_xxx flags apply to this form. Returns 0 on success, any number of non-0 codes on error. On success *outRaw will contain the resulting array, which must eventually be fsl_free()'d by the caller. On error *outRaw is not modified. @deprecated Use fsl_diff_v2_raw() instead. */ int fsl__diff_text_raw(fsl_buffer const *p1, fsl_buffer const *p2, int diffFlags, int ** outRaw); /** @internal If the given file name is a reserved filename (case-insensitive) on Windows platforms, a pointer to the reserved part of the name, else NULL is returned. zPath must be a canonical path with forward-slash directory separators. nameLen is the length of zPath. If negative, fsl_strlen() is used to determine its length. */ bool fsl__is_reserved_fn_windows(const char *zPath, fsl_int_t nameLen); /** @internal Clears any pending merge state from the checkout db's vmerge table. Returns 0 on success. */ int fsl__ckout_clear_merge_state( fsl_cx *f ); /** @internal Installs or reinstalls the checkout database schema into f's open checkout db. Returns 0 on success, FSL_RC_NOT_A_CKOUT if f has no opened checkout, or an code if a lower-level operation fails. If dropIfExists is true then all affected tables are dropped beforehand if they exist. "It's the only way to be sure." If dropIfExists is false and the schema appears to already exists (without actually validating its validity), 0 is returned. */ int fsl_ckout_install_schema(fsl_cx * const f, bool dropIfExists); /** @internal Attempts to remove empty directories from under a checkout, starting with tgtDir and working upwards until it either cannot remove one or it reaches the top of the checkout dir. |
︙ | ︙ | |||
20033 20034 20035 20036 20037 20038 20039 | Results are undefined if tgtDir is not an absolute path rooted in f's current checkout. There are any number of valid reasons removal of a directory might fail, and this routine stops at the first one which does. */ | | < | | | 18918 18919 18920 18921 18922 18923 18924 18925 18926 18927 18928 18929 18930 18931 18932 18933 18934 18935 18936 18937 18938 18939 18940 18941 18942 18943 18944 18945 18946 18947 18948 18949 18950 18951 | Results are undefined if tgtDir is not an absolute path rooted in f's current checkout. There are any number of valid reasons removal of a directory might fail, and this routine stops at the first one which does. */ unsigned int fsl_ckout_rm_empty_dirs(fsl_cx * const f, fsl_buffer * const tgtDir); /** @internal This is intended to be passed the name of a file which was just deleted and "might" have left behind an empty directory. The name _must_ an absolute path based in f's current checkout. This routine uses fsl_file_dirpart() to strip path components from the string and remove directories until either removing one fails or the top of the checkout is reach. Since removal of a directory can fail for any given reason, this routine ignores such errors. It returns 0 on success, FSL_RC_OOM if allocation of the working buffer for the filename hackery fails, and FSL_RC_MISUSE if zFilename is not rooted in the checkout (in which case it may assert(), so don't do that). @see fsl_is_rooted_in_ckout() @see fsl_rm_empty_dirs() */ int fsl_ckout_rm_empty_dirs_for_file(fsl_cx * const f, char const *zAbsPath); /** @internal If f->cache.seenDeltaManifest<=0 then this routine sets it to 1 and sets the 'seen-delta-manifest' repository config setting to 1, else this has no side effects. Returns 0 on success, non-0 if there is an error while writing to the repository config. |
︙ | ︙ | |||
20192 20193 20194 20195 20196 20197 20198 | 'allow-symlinks' repo-level config setting is true. That said: the addition of symlinks support into fossil was, IMHO, a poor decision for $REASONS. That might (might) be reflected long-term in this API by only supporting them in the way fossil does for platforms which do not support symlinks. */ int fsl__ckout_symlink_create(fsl_cx * const f, char const *zTgtFile, | | | 19076 19077 19078 19079 19080 19081 19082 19083 19084 19085 19086 19087 19088 19089 19090 | 'allow-symlinks' repo-level config setting is true. That said: the addition of symlinks support into fossil was, IMHO, a poor decision for $REASONS. That might (might) be reflected long-term in this API by only supporting them in the way fossil does for platforms which do not support symlinks. */ int fsl__ckout_symlink_create(fsl_cx * const f, char const *zTgtFile, char const * zLinkFile); /** Compute all file name changes that occur going from check-in iFrom to check-in iTo. Requires an opened repository. If revOK is true, the algorithm is free to move backwards in the |
︙ | ︙ | |||
20294 20295 20296 20297 20298 20299 20300 | beyond the file size change, is performed. - FSL__LOCALMOD_NOFOUND = file was not found in the local checkout. Noting that: - Combined values of (FSL__LOCALMOD_PERM | FSL__LOCALMOD_CONTENT) are | | | 19178 19179 19180 19181 19182 19183 19184 19185 19186 19187 19188 19189 19190 19191 19192 | beyond the file size change, is performed. - FSL__LOCALMOD_NOFOUND = file was not found in the local checkout. Noting that: - Combined values of (FSL__LOCALMOD_PERM | FSL__LOCALMOD_CONTENT) are possible, but FSL__LOCALMOD_NOFOUND will never be combined with one of the other values. If stat() fails for any reason other than file-not-found (e.g. permissions), an error is triggered. Returns 0 on success. On error, returns non-0 and f's error state will be updated and isModified... isNotModified. Errors include, |
︙ | ︙ | |||
20429 20430 20431 20432 20433 20434 20435 | @see fsl_ckout_fingerprint_check() */ int fsl__repo_fingerprint_search(fsl_cx * const f, fsl_id_t rcvid, char ** zOut); /** | | | < < < < | | | | | | > | | | < < < | | < < | | < < | > > | 19313 19314 19315 19316 19317 19318 19319 19320 19321 19322 19323 19324 19325 19326 19327 19328 19329 19330 19331 19332 19333 19334 19335 19336 19337 19338 19339 19340 19341 19342 19343 19344 19345 19346 19347 19348 19349 19350 19351 19352 19353 19354 19355 19356 19357 19358 19359 19360 19361 19362 | @see fsl_ckout_fingerprint_check() */ int fsl__repo_fingerprint_search(fsl_cx * const f, fsl_id_t rcvid, char ** zOut); /** A context for running a raw diff. The aEdit[] array describes the raw diff. Each triple of integers in aEdit[] means: (1) COPY: Number of lines aFrom and aTo have in common (2) DELETE: Number of lines found only in aFrom (3) INSERT: Number of lines found only in aTo The triples repeat until all lines of both aFrom and aTo are accounted for. */ struct fsl__diff_cx { /*TODO unsigned*/ int *aEdit; /* Array of copy/delete/insert triples */ /*TODO unsigned*/ int nEdit; /* Number of integers (3x num of triples) in aEdit[] */ /*TODO unsigned*/ int nEditAlloc; /* Space allocated for aEdit[] */ fsl_dline *aFrom; /* File on left side of the diff */ /*TODO unsigned*/ int nFrom; /* Number of lines in aFrom[] */ fsl_dline *aTo; /* File on right side of the diff */ /*TODO unsigned*/ int nTo; /* Number of lines in aTo[] */ int (*cmpLine)(const fsl_dline * const, const fsl_dline *const); /* Function to be used for comparing */ }; /** Convenience typeef. */ typedef struct fsl__diff_cx fsl__diff_cx; /** Initialized-with-defaults fsl__diff_cx structure, intended for const-copy initialization. */ #define fsl__diff_cx_empty_m {\ NULL,0,0,NULL,0,NULL,0,fsl_dline_cmp \ } /** Initialized-with-defaults fsl__diff_cx structure, intended for non-const copy initialization. */ extern const fsl__diff_cx fsl__diff_cx_empty; /** @internal Compute the differences between two files already loaded into the fsl__diff_cx structure. A divide and conquer technique is used. We look for a large |
︙ | ︙ | |||
20494 20495 20496 20497 20498 20499 20500 | Any common text at the beginning and end of the two files is removed before starting the divide-and-conquer algorithm. Returns 0 on succes, FSL_RC_OOM on an allocation error. */ int fsl__diff_all(fsl__diff_cx * const p); | | > | > | | < < > | 19370 19371 19372 19373 19374 19375 19376 19377 19378 19379 19380 19381 19382 19383 19384 19385 19386 19387 19388 19389 19390 19391 19392 19393 19394 19395 19396 19397 19398 19399 19400 19401 19402 19403 19404 19405 19406 | Any common text at the beginning and end of the two files is removed before starting the divide-and-conquer algorithm. Returns 0 on succes, FSL_RC_OOM on an allocation error. */ int fsl__diff_all(fsl__diff_cx * const p); /** @internal */ void fsl__diff_optimize(fsl__diff_cx * const p); /** @internal */ void fsl__diff_cx_clean(fsl__diff_cx * const cx); /** @internal Undocumented. For internal debugging only. */ void fsl__dump_triples(fsl__diff_cx const * const p, char const * zFile, int ln ); /** @internal Removes from the BLOB table all artifacts that are in the SHUN table. Returns 0 on success. Requires (asserts) that a repo is opened. */ int fsl__shunned_remove(fsl_cx * const f); /** @internal This is a fossil-specific internal detail not needed by the more generic parts of the fsl_db API. It loops through all "cached" prepared statements for which stmt->role has been assigned a value |
︙ | ︙ | |||
20537 20538 20539 20540 20541 20542 20543 | As a special case, if role==0 then ALL cached statements are closed, with the caveat that the process will still fail if any statement is currently flagged as active. */ int fsl__db_cached_clear_role(fsl_db * const db, int role); | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | 19414 19415 19416 19417 19418 19419 19420 19421 19422 19423 19424 19425 19426 19427 19428 19429 19430 19431 19432 19433 19434 19435 19436 19437 19438 19439 19440 19441 19442 19443 19444 19445 | As a special case, if role==0 then ALL cached statements are closed, with the caveat that the process will still fail if any statement is currently flagged as active. */ int fsl__db_cached_clear_role(fsl_db * const db, int role); /** @internal Maximum length of a line in a text file, in bytes. (2**15 = 32k) */ #define FSL__LINE_LENGTH_MASK_SZ 15 /** @internal */ #define FSL__LINE_LENGTH_MASK ((1<<FSL__LINE_LENGTH_MASK_SZ)-1) #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_INTERNAL_H_INCLUDED */ /* end of file ../include/fossil-scm/fossil-internal.h */ /* start of file ../include/fossil-scm/fossil-auth.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_AUTH_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_AUTH_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt |
︙ | ︙ | |||
20722 20723 20724 20725 20726 20727 20728 | returns a copy of zPw) if the project code is not set, under the assumption that this is "the first xfer request of a clone." Whether or not that will apply at this level to libfossil remains to be seen. TODO? Does fossil still use SHA1 for this? */ | | | | | | | | | 19479 19480 19481 19482 19483 19484 19485 19486 19487 19488 19489 19490 19491 19492 19493 19494 19495 19496 19497 19498 19499 19500 19501 19502 19503 19504 19505 19506 19507 19508 19509 19510 19511 19512 19513 19514 19515 19516 19517 19518 19519 19520 19521 19522 19523 19524 19525 19526 19527 19528 19529 19530 19531 19532 19533 19534 19535 19536 19537 19538 19539 19540 19541 19542 19543 19544 19545 19546 19547 19548 19549 19550 19551 19552 19553 19554 19555 19556 19557 19558 19559 | returns a copy of zPw) if the project code is not set, under the assumption that this is "the first xfer request of a clone." Whether or not that will apply at this level to libfossil remains to be seen. TODO? Does fossil still use SHA1 for this? */ FSL_EXPORT char * fsl_sha1_shared_secret( fsl_cx * f, char const * zLoginName, char const * zPw ); /** Fetches the login group name (if any) for the given context's current repositorty db. If f has no opened repo, 0 is returned. If the repo belongs to a login group, its name is returned in the form of a NUL-terminated string. The returned value (which may be 0) is owned by the caller, who must eventually fsl_free() it. The value (unlike in fossil(1)) is not cached because it may change via modification of the login group. */ FSL_EXPORT char * fsl_repo_login_group_name(fsl_cx * f); /** Fetches the login cookie name associated with the current repository db, or 0 if no repository is opened. The returned (NUL-terminated) string is owned by the caller, who must eventually fsl_free() it. The value is not cached in f because it may change during the lifetime of a repo (if a login group is set or removed). The login cookie name is a string in the form "fossil-XXX", where XXX is the first 16 hex digits of either the repo's 'login-group-code' or 'project-code' config values (in that order). */ FSL_EXPORT char * fsl_repo_login_cookie_name(fsl_cx * f); /** Searches for a user ID (from the repo.user.uid DB field) for a given username and password. The password may be either its hashed form or non-hashed form (if it is not exactly 40 bytes long, that is!). On success, 0 is returned and *pId holds the ID of the user found (if any). *pId will be set to 0 if no match for the name/password was found, or positive if a match was found. If any of the arguments are NULL, FSL_RC_MISUSE is returned. f must have an opened repo, else FSL_RC_NOT_A_REPO is returned. */ FSL_EXPORT int fsl_repo_login_search_uid(fsl_cx * f, char const * zUsername, char const * zPasswd, fsl_id_t * pId); /** Clears all login state for the given user ID. If the ID is <=0 then ALL logins are cleared. Has no effect on the built-in pseudo-users. Returns non-0 on error, and not finding a matching user ID is not considered an error. f must have an opened repo, or FSL_RC_NOT_A_REPO is returned. TODO: there are currently no APIs for _setting_ the state this function clears! */ FSL_EXPORT int fsl_repo_login_clear( fsl_cx * f, fsl_id_t userId ); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_AUTH_H_INCLUDED */ /* end of file ../include/fossil-scm/fossil-auth.h */ /* start of file ../include/fossil-scm/fossil-forum.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_FORUM_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_FORUM_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt |
︙ | ︙ | |||
20828 20829 20830 20831 20832 20833 20834 | #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_FORUM_H_INCLUDED */ | | | | 19585 19586 19587 19588 19589 19590 19591 19592 19593 19594 19595 19596 19597 19598 19599 19600 | #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_FORUM_H_INCLUDED */ /* end of file ../include/fossil-scm/fossil-forum.h */ /* start of file ../include/fossil-scm/fossil-pages.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_PAGES_H_INCLUDED) #define ORG_FOSSIL_SCM_PAGES_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt |
︙ | ︙ | |||
21335 21336 21337 21338 21339 21340 21341 | ``` */ /** @page page_code_conventions Code Conventions Project and Code Conventions... | | | 20092 20093 20094 20095 20096 20097 20098 20099 20100 20101 20102 20103 20104 20105 20106 | ``` */ /** @page page_code_conventions Code Conventions Project and Code Conventions... Foreward: all of this more or less evolved organically or was inherited from fossil(1) (where it evolved organically, or was inherited from sqilte (where it evol...)), and is written up here more or less as a formality. Historically i've not been a fan of coding conventions, but as someone else put it to me, "the code should look like it comes from a single source," and the purpose of this section is to help orient those looking to hack in the sources. Note that most of what is said below becomes obvious |
︙ | ︙ | |||
21377 21378 21379 21380 21381 21382 21383 | - Public API members have a fsl_ or FSL_ prefix (fossil_ seems too long). For private/static members, anything goes. Optional or "add-on" APIs (e.g. ::fcli) may use other prefixes, but are encouraged use an "f-word" (as it were), simply out of deference to long-standing software naming conventions. | < < < < < < < < | < | | | | | | < | | > | | | | | | 20134 20135 20136 20137 20138 20139 20140 20141 20142 20143 20144 20145 20146 20147 20148 20149 20150 20151 20152 20153 20154 20155 20156 20157 20158 20159 20160 20161 20162 20163 20164 20165 20166 20167 20168 20169 20170 20171 20172 20173 20174 20175 20176 20177 20178 20179 20180 20181 20182 20183 20184 20185 20186 20187 20188 20189 20190 20191 20192 20193 20194 20195 20196 20197 20198 20199 20200 20201 20202 20203 20204 20205 20206 20207 20208 20209 20210 20211 20212 | - Public API members have a fsl_ or FSL_ prefix (fossil_ seems too long). For private/static members, anything goes. Optional or "add-on" APIs (e.g. ::fcli) may use other prefixes, but are encouraged use an "f-word" (as it were), simply out of deference to long-standing software naming conventions. - Public-API structs and functions use lower_underscore_style(). Static/internal APIs may use different styles. It's not uncommon to see UpperCamelCase for file-scope structs. - Overall style, especially scope blocks and indentation, should follow Fossil's. We are _not at all_ picky about whether or not there is a space after/before parens in if( foo ), and similar small details, just the overall code pattern. - Structs and enums all get the optional typedef so that they do not need to be qualified with 'struct' resp. 'enum' when used. Because of how doxygen tracks those, the typedef should be separate from the struct declaration, rather than combinding those. - Function typedefs are named fsl_XXX_f. Implementations of such typedefs/interfaces are typically named fsl_XXX_f_SUFFIX(), where SUFFIX describes the implementation's specialization. e.g. fsl_output_f() is a callback typedef/interface and fsl_output_f_FILE() is a concrete implementation for FILE handles. - Enums tend to be named fsl_XXX_e. - Functions follow the naming pattern prefix_NOUN_VERB(), rather than the more C-conventional prefix_VERB_NOUN(), e.g. fsl_foo_get() and fsl_foo_set() rather than fsl_get_foo() and fsl_get_foo(). The primary reasons are (A) sortability for document processors and (B) they more naturally match with OO API conventions, e.g. noun.verb(). A few cases knowingly violate this convention for the sake of readability or sorting of several related functions (e.g. fsl_db_get_TYPE() instead of fsl_db_TYPE_get()). - Structs intended to be creatable on the stack are accompanied by a const instance named fsl_STRUCT_NAME_empty, and possibly by a macro named fsl_STRUCT_NAME_empty_m, both of which are "default-initialized" instances of that struct. This is superiour to using memset() for struct initialization because we can define (and document) arbitrary default values and all clients who copy-construct them are unaffected by many types of changes to the struct's signature (though they may need a recompile). The intention of the fsl_STRUCT_NAME_empty_m macro is to provide a struct-embeddable form for use in other structs or copy-initialization of const structs, and the _m macro is always used to initialize its const struct counterpart. e.g. the library guarantees that fsl_cx_empty_m (a macro representing an empty fsl_cx instance) holds the same default values as fsl_cx_empty (a const fsl_cx value). - Returning int vs fsl_int_t vs fsl_size_t: int is used as a conventional result code. fsl_int_t is often used as a signed length-style result code (e.g. printf() semantics). Unsigned ranges use fsl_size_t. Ints are (also) used as a "triplean" (3 potential values, e.g. <0, 0, >0). fsl_int_t also guarantees that it will be 64-bit if available, so can be used for places where large values are needed but a negative value is legal (or handy), e.g. fsl_strndup()'s second argument. The use of the fsl_xxx_t typedefs, rather than (unsigned) int, is primarily for readability/documentation, e.g. so that readers can know immediately that the function uses a given argument or return value following certain API-wide semantics. It also allows us to better define platform-portable printf/scanf-style format modifiers for them (analog to C99's PRIi32 and friends), which often come in handy. - Signed vs. unsigned types for size/length arguments: use the fsl_int_t (signed) argument type when the client may legally pass in a negative value as a hint that the API should use fsl_strlen() (or similar) to determine a byte array's length. Use fsl_size_t when no automatic length determination is possible (or desired), to "force" the client to pass the proper length. Internally |
︙ | ︙ | |||
21577 21578 21579 21580 21581 21582 21583 | executable bit and only does anything useful on platforms which support symlinks. */ #endif /* ORG_FOSSIL_SCM_PAGES_H_INCLUDED */ | | | > > > > > > < | 20325 20326 20327 20328 20329 20330 20331 20332 20333 20334 20335 20336 20337 20338 20339 20340 20341 20342 20343 20344 20345 20346 20347 20348 20349 20350 20351 20352 20353 20354 20355 20356 20357 20358 20359 20360 20361 20362 20363 20364 20365 20366 20367 | executable bit and only does anything useful on platforms which support symlinks. */ #endif /* ORG_FOSSIL_SCM_PAGES_H_INCLUDED */ /* end of file ../include/fossil-scm/fossil-pages.h */ /* start of file ../include/fossil-scm/fossil-cli.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(_ORG_FOSSIL_SCM_FCLI_H_INCLUDED_) #define _ORG_FOSSIL_SCM_FCLI_H_INCLUDED_ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). ***************************************************************************** This file provides a basis for basic libfossil-using apps. It attempts to provide basic services required by a wide variety of fossil-using apps, with the intent of simplifying their creation. */ /* Force assert() to always work... */ #if defined(NDEBUG) #undef NDEBUG #define DEBUG 1 #endif #include <assert.h> /* for the benefit of test apps */ #include <stdlib.h> /* EXIT_SUCCESS and friends */ /** @page page_fcli fcli (formerly FossilApp) ::fcli (formerly FossilApp) provides a small framework for bootstrapping simple libfossil applications which only need a single fsl_cx instance managing a single checkout and/or repository. It is primarily intended for use with CLI apps |
︙ | ︙ | |||
22023 22024 22025 22026 22027 22028 22029 | If not NULL then fcli_setup() will attempt to open the checkout for the given dir, including its associated repo db. By default this is "." (the current directory). Applications can set this to NULL _before_ calling fcli_setup() in order to disable the automatic attemp to open a checkout under the current directory. Doing so is | | | 20776 20777 20778 20779 20780 20781 20782 20783 20784 20785 20786 20787 20788 20789 20790 | If not NULL then fcli_setup() will attempt to open the checkout for the given dir, including its associated repo db. By default this is "." (the current directory). Applications can set this to NULL _before_ calling fcli_setup() in order to disable the automatic attemp to open a checkout under the current directory. Doing so is equivalent to using the --no-checkout|-C flags. The global --checkout-dir flag will trump that setting, though. */ char const * checkoutDir; /** A verbosity level counter. Starts at 0 (no verbosity) and goes up for higher verbosity levels. Currently levels 1 and 2 are |
︙ | ︙ | |||
22046 22047 22048 22049 22050 22051 22052 | */ struct { /** repo db name string from -R/--repo CLI flag. */ const char * repoDbArg; /** | | | 20799 20800 20801 20802 20803 20804 20805 20806 20807 20808 20809 20810 20811 20812 20813 | */ struct { /** repo db name string from -R/--repo CLI flag. */ const char * repoDbArg; /** User name from the -U/--user CLI flag. */ const char * userArg; /** Incremented if fcli_setup() detects -? or --help in the argument list, or if the first non-flag argument is "help". */ short helpRequested; |
︙ | ︙ | |||
22102 22103 22104 22105 22106 22107 22108 22109 22110 22111 22112 22113 22114 22115 22116 22117 22118 22119 22120 22121 22122 22123 22124 22125 | fcli_cx() returns the API's fsl_cx instance. It will be non-NULL (but might not have an opened checkout/repository) if fsl_setup() succeeds. */ FSL_EXPORT fcli_t fcli; /** Initializes fcli's state and CLI flags processing. MUST BE CALLED BEFORE fsl_malloc() and friends are used, as this swaps out the allocator with one which aborts on OOM. (But see fcli_pre_setup() for a workaround for that.) Should be called early on in main(), passed the arguments passed to main(). Returns 0 on success. This sets up the ::fcli instance and opens any checkout found in/above the current dir by default. To disable the automatic search for a checkout, assign `fcli.clientFlags.checkoutDir` to `NULL` before calling this. If the 3rd argument is not NULL, this sets `fcli.cliFlags` to its value. If the 4th argument is not NULL, this sets `fcli.appHelp` to that value. | > > > > > > > > > > | | < | < | | | < | | 20855 20856 20857 20858 20859 20860 20861 20862 20863 20864 20865 20866 20867 20868 20869 20870 20871 20872 20873 20874 20875 20876 20877 20878 20879 20880 20881 20882 20883 20884 20885 20886 20887 20888 20889 20890 20891 20892 20893 20894 20895 20896 20897 20898 20899 20900 20901 20902 20903 20904 20905 20906 | fcli_cx() returns the API's fsl_cx instance. It will be non-NULL (but might not have an opened checkout/repository) if fsl_setup() succeeds. */ FSL_EXPORT fcli_t fcli; /** Equivalent to `fcli_setup_v2(argc,argv,NULL,NULL)`. @see fcli_pre_setup() @see fcli_setup_v2() @see fcli_end_of_main() @deprecated Its signature will change to fcli_setup_v2()'s at some point. */ FSL_EXPORT int fcli_setup(int argc, char const * const * argv ); /** Initializes fcli's state and CLI flags processing. MUST BE CALLED BEFORE fsl_malloc() and friends are used, as this swaps out the allocator with one which aborts on OOM. (But see fcli_pre_setup() for a workaround for that.) Should be called early on in main(), passed the arguments passed to main(). Returns 0 on success. This sets up the ::fcli instance and opens any checkout found in/above the current dir by default. To disable the automatic search for a checkout, assign `fcli.clientFlags.checkoutDir` to `NULL` before calling this. If the 3rd argument is not NULL, this sets `fcli.cliFlags` to its value. If the 4th argument is not NULL, this sets `fcli.appHelp` to that value. If argument processing finds either of the (--help, -?) flags, or the first non-flag argument is "help", it sets fcli.transient.helpRequested to a true value, calls fcli_help(), and returns FCLI_RC_HELP, in which case the application should exit/return from main with code 0 immediately. This function behaves significantly differently if fcli.cliFlags has been set before it is called. In that case, it parses the CLI flags using that type's rules and sets up fcli_help() to use those flags for generating the help. It parses the global flags first, then the app-specific flags. Returns 0 on success. Results other than FCLI_RC_HELP should be treated as fatal to the app, and fcli.f's error state _might_ contain info about the error. If this function returns non-0, the convention is that the app immediately returns the result of fcli_end_of_main(THE_RESULT_CODE) from main(). That function will treat FCLI_RC_HELP as a non-error and will report any error state |
︙ | ︙ | |||
22470 22471 22472 22473 22474 22475 22476 | complex values like multi-dimensional arrays. "fax" is short for "free at exit." Results are undefined if the same address or overlapping addresses are queued more than once. Once an entry is in this queue, there is no way to remove it. | < < < < < < | | 21230 21231 21232 21233 21234 21235 21236 21237 21238 21239 21240 21241 21242 21243 21244 21245 | complex values like multi-dimensional arrays. "fax" is short for "free at exit." Results are undefined if the same address or overlapping addresses are queued more than once. Once an entry is in this queue, there is no way to remove it. */ FSL_EXPORT void fcli_fax(void * mem); /** Requires an array of fcli_cliflag objects terminated with an instance with NULL values for the (flagShort, flagLong) members (fcli_cliflag_empty_m is an easy way to get that). If fcli.cliFlags is set before fcli_setup() is called, this routine |
︙ | ︙ | |||
22623 22624 22625 22626 22627 22628 22629 | Returns 0 on success. If there are no more CLI arguments when it is called then it returns FSL_RC_MISUSE and updates the fcli error state with a description of the problem. It may return any number of non-0 codes from the underlying operations. Sidebar: fsl_filename_to_vfile_ids() requires that directory names | | | | | < | 21377 21378 21379 21380 21381 21382 21383 21384 21385 21386 21387 21388 21389 21390 21391 21392 21393 21394 21395 21396 21397 | Returns 0 on success. If there are no more CLI arguments when it is called then it returns FSL_RC_MISUSE and updates the fcli error state with a description of the problem. It may return any number of non-0 codes from the underlying operations. Sidebar: fsl_filename_to_vfile_ids() requires that directory names passed to it have no trailing slashes, and routine strips trailing slashes from its arguments before passing them on to that routine, so they may be entered with slashes without ill effect. @see fsl_filename_to_vfile_ids() */ FSL_EXPORT int fcli_args_to_vfile_ids(fsl_id_bag *tgt, fsl_id_t vid, bool relativeToCwd, bool changedFilesOnly); /** Performs a "fingerprint check" on the current checkout/repo combination, as per fsl_ckout_fingerprint_check(). If the check fails and reportImmediately is true then an error report is |
︙ | ︙ | |||
22673 22674 22675 22676 22677 22678 22679 | */ FCLI_DIFF_COLORS_RG, FCLI_DIFF_COLORS_DEFAULT = FCLI_DIFF_COLORS_RG }; typedef enum fcli_diff_colors_e fcli_diff_colors_e; /** | | | | 21426 21427 21428 21429 21430 21431 21432 21433 21434 21435 21436 21437 21438 21439 21440 21441 21442 21443 | */ FCLI_DIFF_COLORS_RG, FCLI_DIFF_COLORS_DEFAULT = FCLI_DIFF_COLORS_RG }; typedef enum fcli_diff_colors_e fcli_diff_colors_e; /** Populates the given fsl_diff_opt::ansiColors state with values dependend on the second argument. */ FSL_EXPORT void fcli_diff_colors(fsl_diff_opt * const tgt, fcli_diff_colors_e theme); /** @internal This function is intented for use in development of libfossil. It dumps the current state of cached SQL statements to fcli_printf(). |
︙ | ︙ | |||
22708 22709 22710 22711 22712 22713 22714 | #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* _ORG_FOSSIL_SCM_FCLI_H_INCLUDED_ */ | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 21461 21462 21463 21464 21465 21466 21467 21468 | #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* _ORG_FOSSIL_SCM_FCLI_H_INCLUDED_ */ /* end of file ../include/fossil-scm/fossil-cli.h */ |
Added signify/fnc-05-release.pub.
> > | 1 2 | untrusted comment: fnc 0.5 public key RWQTvScFdMzcwQlljPIt0yPn6wpR+T1kR1w0/3HMegAaYyO32FMuzMcM |
Deleted signify/fnc-07-release.pub.
|
| < < |
Changes to src/fnc.1.
1 | .\" | | | 1 2 3 4 5 6 7 8 9 | .\" .\" Copyright (c) 2021 Mark Jamsek <mark@jamsek.com> .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above .\" copyright notice and this permission notice appear in all copies. .\" .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
︙ | ︙ | |||
23 24 25 26 27 28 29 | .Nm .Op Ar command .Op Fl h | -help .Nm .Op Fl h | -help .Op Fl v | -version .Nm | < < < < < < < < < < < > > > > > | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | .Nm .Op Ar command .Op Fl h | -help .Nm .Op Fl h | -help .Op Fl v | -version .Nm .Cm timeline .Op Fl Cz .Op Fl b Ar branch .Op Fl c Ar commit .Op Fl f Ar glob .Op Fl n Ar number .Op Fl T Ar tag .Op Fl t Ar type .Op Fl u Ar user .Op Ar path .Nm .Cm diff .Op Fl Ciw .Op Fl x Ar number .Op Ar artifact1 Op Ar artifact2 .Op Ar path ... .Nm .Cm tree .Op Fl C .Op Fl c Ar commit .Op Ar path .Nm .Cm blame .Op Fl C .Op Fl c Ar commit Op Fl r .Op Fl n Ar number .Ar path .Nm .Cm branch .Op Fl Ccopr .Op Fl a Ar date | Fl b Ar date .Op Fl s Ar order .Op Ar glob .Nm .Cm config .Op Fl hu .Op Fl -ls .Op Ar setting Op Ar value .Nm .Op Ar path .Sh DESCRIPTION .Nm is an interactive read-only browser for .Xr fossil 1 repositories, and supports multiple views to display repository data: |
︙ | ︙ | |||
104 105 106 107 108 109 110 | version that last modified the line. .It Branch view Display navigable list of all repository branches. .El .Pp .Nm provides both global and command-specific options and in-app key | | > < < < < < < < < | 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 | version that last modified the line. .It Branch view Display navigable list of all repository branches. .El .Pp .Nm provides both global and command-specific options and in-app key bindings. Global options are specified absent a command name, and are as follows: .Bl -tag -width 6v .It Fl h , -help Display program help and usage information then exit. .It Fl v , -version Display program version then exit. .El .Pp Note that any global options preceding a command name will be interpreted as the command-specific variant if such an option exists. .Pp |
︙ | ︙ | |||
147 148 149 150 151 152 153 | .El .Pp Commands available to .Nm are as follows: .Bl -tag -width 4v .Tg conf | | | | < < < < < < < < < < < < < < < | < < | | | < < < < < | 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 | .El .Pp Commands available to .Nm are as follows: .Bl -tag -width 4v .Tg conf .It Cm config Oo Fl h | -help Oc Oo Fl -ls Oc \ Oo Ar setting Op Ar value | Fl -unset Oc .Dl Pq aliases: Cm conf , Cm cfg, settings, set Retrieve the current, or set a new, .Ar value for .Ar setting in the local repository. When specified, .Ar value will become the new value for .Ar setting , otherwise .Nm will display the current value of .Ar setting . With no arguments, .Cm fnc config will display a list of all configurable settings. Alternatively, see .Sx ENVIRONMENT for a detailed list of available settings used in the display or processing of data. When no value is found for a given setting in the local repository, environment variables will be searched. If still not found, default values will be used. Options for .Cm fnc config are as follows: .Bl -tag -width Ds .It Fl h , -help Display config command help and usage information then exit. .It Fl -ls List all currently defined settings. .It Fl u , -unset Clear the specified .Ar setting. .El .Tg log .It Cm timeline Oo Fl C | -no-colour Oc Oo Fl T | -tag Ar tag Oc \ Oo Fl b | -branch Ar branch Oc Oo Fl c | -commit Ar commit Oc \ Oo Fl f | -filter Ar glob Oc Oo Fl h | -help Oc Oo Fl n | -limit Ar n Oc \ Oo Fl t | -type Ar type Oc Oo Fl u | -username Ar user Oc Oo Fl z | -utc Oc \ Op Ar path .Dl Pq aliases: Cm log , Cm tl , Cm time , Cm ti Display commit history of a repository. If .Ar path is specified, only commits that modified the file(s) at this path will populate the timeline. The .Ar path may be absolute, relative to the current working directory, or relative to the repository root. This command must be executed from within or below the top level directory of the repository; that is, .Nm assumes a local checkout is open in or above the current working directory. .Pp If no command is explicitly specified, this command will be executed by default. .Pp Options for .Cm fnc timeline are as follows: .Bl -tag -width Ds .It Fl b , -branch Ar branch Display commits that are members of the specified .Ar branch . The expected argument is the symbolic name of a branch. By default, .Nm will display all commits irrespective of the branch on which they reside. .It Fl C , -no-colour Disable colourised timeline, which is enabled by default on supported terminals. If this option is not used, colour can be toggled with the .Sy c |
︙ | ︙ | |||
258 259 260 261 262 263 264 | will open the timeline to the latest leaf on the repository tree. For a complete list of valid arguments this option accepts, see .Lk https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki \ "Fossil's Check-in Names". .It Fl f , -filter Ar glob Filter timeline by commits containing .Ar glob | | > | | < > > | < < < < < < < < < < < < < < < < < < < < < < < < < | | 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 | will open the timeline to the latest leaf on the repository tree. For a complete list of valid arguments this option accepts, see .Lk https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki \ "Fossil's Check-in Names". .It Fl f , -filter Ar glob Filter timeline by commits containing .Ar glob in any of the commit comment, user, or branch fields. Pattern matching depends on the .Xr sqlite3 1 .B LIKE operator, which only folds case for the ASCII character set. Filtering can also be performed in-session with the .Sy F timeline view key binding as documented below. .It Fl h , -help Display timeline command help and usage information then exit. .It Fl n , -limit Ar n Limit timeline to the latest .Ar n commits. By default, .Nm will load the entire history of the repository's local checkout. Negative values are a no-op. .It Fl T , -tag Ar tag Only display commits with T cards containing .Ar tag . By default, .Nm will indiscriminately display all commits irrespective of which T cards are attached to the commit manifest. .It Fl t , -type Ar type Only display .Ar type commits. Valid |
︙ | ︙ | |||
335 336 337 338 339 340 341 | .Nm .Cm timeline .Cm -t e -t t Ns ). .It Fl u , -username Ar user Only display commits authored by .Ar user . | < < < < | | < < < < | 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 | .Nm .Cm timeline .Cm -t e -t t Ns ). .It Fl u , -username Ar user Only display commits authored by .Ar user . .It Fl z , -utc Use Coordinated Universal Time (UTC) rather than local time when displaying commit dates and timestamps. .El .Pp Key bindings for .Cm fnc timeline are as follows: .Bl -tag -width Ds .It Cm Arrow-down, j, >, \&. Move selection cursor down the timeline. .It Cm Arrow-up, k, <, \&, Move selection cursor up the timeline. .It Cm C-f, Page-down Move selection cursor one page down the timeline. .It Cm C-b, Page-up Move selection cursor one page up the timeline. .It Cm G, End Move selection cursor to the last commit on the timeline (i.e., oldest commit in the repository). .It Cm gg, Home Move selection cursor to the first commit on the timeline (i.e., newest commit in the repository). .It Cm Enter, Space |
︙ | ︙ | |||
400 401 402 403 404 405 406 | the timeline is consumed. .It Cm N Find the previous commit that matches the current search term. The search will continue until either a match is found or the latest commit on the timeline is consumed. .El .Tg di | | | | 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 | the timeline is consumed. .It Cm N Find the previous commit that matches the current search term. The search will continue until either a match is found or the latest commit on the timeline is consumed. .El .Tg di .It Cm diff Oo Fl C | -no-colour Oc Oo Fl h | -help Oc Oo Fl i | -invert \ Oc Oo Fl w | -whitespace Oc Oo Fl x | -context Ar n Oc \ Oo Ar artifact1 Oo Ar artifact2 Oc Oc Op Ar path ... .Dl Pq alias: Cm di Display the differences between two repository artifacts, or between the local changes on disk and a given commit. If neither .Ar artifact1 nor .Ar artifact2 |
︙ | ︙ | |||
432 433 434 435 436 437 438 | .Ar artifact1 and .Ar artifact2 must be of the same type, which is expected to be either a symbolic check-in name, tag, (unique abbreviated prefix of) a commit or blob artifact UUID SHA1 or SHA3 hash, or an ISO 8601 formatted date. Both artifact arguments must be supplied when diffing blobs; any following non-option arguments are invalid | | < < < < < < < < < < < < < < < < < < < < < < < < | | < < < < < < < < < < < < < < < < < < < < | | < < < < < < < < < < | | < < | | 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 | .Ar artifact1 and .Ar artifact2 must be of the same type, which is expected to be either a symbolic check-in name, tag, (unique abbreviated prefix of) a commit or blob artifact UUID SHA1 or SHA3 hash, or an ISO 8601 formatted date. Both artifact arguments must be supplied when diffing blobs; any following non-option arguments are invalid and will be ignored. .Pp Options for .Cm fnc diff are as follows: .Bl -tag -width Ds .It Fl C , -no-colour Disable coloured diff output, which is enabled by default on supported terminals. If this option is not used, colour can be toggled with the .Sy c diff view key binding as documented below. User-defined colours are also supported, see .Sx ENVIRONMENT for details. .It Fl h , -help Display diff command help and usage information then exit. .It Fl i , -invert Invert the difference between artifacts when displaying the diff. .It Fl w , -whitespace Ignore whitespace-only changes when displaying the diff. .It Fl x , -context Ar n Set .Ar n context lines to be shown in the diff. By default, 5 context lines are shown. Negative values are a no-op. .El .Pp Key bindings for .Cm fnc diff are as follows: .Bl -tag -width Ds .It Cm Arrow-down, j Scroll down one line of diff output. .It Cm Arrow-up, k Scroll up one line of diff output. .It Cm C-f, Page-down, Space Scroll down one page of diff output. .It Cm C-b, Page-up Scroll up one page of diff output. .It Cm G, End Scroll to the end of the view (i.e., last line of diff output). .It Cm gg, Home Scroll to the top of the view (i.e., first line of diff output). .It Cm C-k, K, <, \&, Move up the .Cm timeline to the previous (i.e., newer) commit and display its diff. (Only available if the diff was accessed from the timeline.) .It Cm C-j, J, >, \&. Move down the .Cm timeline to the next (i.e., older) commit and display its diff. (Only available if the diff was accessed from the timeline.) .It Cm \&-, \&_ Decrease the number of context lines shown in diff output. .It Cm \&=, \&+ Increase the number of context lines shown in diff output. .It Cm b Open and populate branch view with all repository branches. .It Cm c Toggle coloured diff output. On supported terminals, .Nm will default to displaying changes and diff metadata in colour. .It Cm i Toggle inversion of diff output. .It Cm v Toggle verbosity of diff output. By default, .Nm will display the entire content of newly added or deleted files. .It Cm w Toggle whether whitespace-only changes are ignored when comparing lines in the diff. .It Cm / Prompt to enter a search term to begin searching the diff output for lines matching the pattern provided. The search term is an extended regular expression, which is documented in .Xr re_format 7 . .It Cm n Find the next line that matches the current search term. .It Cm N Find the previous line that matches the current search term. .El .Tg dir .It Cm tree Oo Fl C | -no-colour Oc Oo Fl c | -commit Ar commit Oc \ Oo Fl h | -help Oc Op Ar path .Dl Pq aliases: Cm dir , Cm tr Display navigable, hierarchical tree of a repository. If a .Ar path is specified, display tree nodes of this path. The .Ar path may be absolute, relative to the current working directory, or relative to the repository root. With no options passed, the tree will reflect the state of the latest commit on trunk. This command must be executed from within or below the top level directory of the repository; that is, .Nm assumes a local checkout is open in or above the current working directory. .Pp Tree nodes are lexicographically ordered and may be postfixed with an identifier corresponding to the mode of the file object on disk as returned by .Xr lstat 2 : .Bl -column -offset Ds YXZ description |
︙ | ︙ | |||
621 622 623 624 625 626 627 | to the latest commit on the given branch, or (a unique abbreviated prefix of) a valid commit UUID SHA1 or SHA3 hash. For a complete list of valid arguments this option accepts, see .Lk https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki \ "Fossil's Check-in Names". .It Fl h , -help Display tree command help and usage information then exit. | < < < < < < < < < < < < < < < < < < < < | | | | < < < < > > | | < < | | 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 | to the latest commit on the given branch, or (a unique abbreviated prefix of) a valid commit UUID SHA1 or SHA3 hash. For a complete list of valid arguments this option accepts, see .Lk https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki \ "Fossil's Check-in Names". .It Fl h , -help Display tree command help and usage information then exit. .El .Pp Key bindings for .Cm fnc tree are as follows: .Bl -tag -width Ds .It Cm Enter, Arrow-right, l Enter the currently selected directory, or open a .Cm blame view of the currently selected file. .It Cm Backspace, Arrow-left, h Move up a level to the parent directory. This is a no-op when in the root tree. .It Cm Arrow-down, j Move selection cursor one node down the tree. .It Cm Arrow-up, k Move selection cursor one node up the tree. .It Cm Page-down, C-f Move selection cursor one page down the tree. .It Cm Page-up, C-b Move selection cursor one page up the tree. .It Cm Home, gg Move selection cursor to the first node in the tree. .It Cm End, G Move selection cursor to the last node in the tree. .It Cm b Open and populate branch view with all repository branches. .It Cm c Toggle coloured output. On supported terminals, .Nm will default to displaying the tree in colour. .It Cm t Open .Cm timeline view for the currently selected tree node. This will display the timeline of all commits that involve the versioned file(s) corresponding to the selected node. .It Cm i Show SHA hash UUID for all file nodes displayed in the tree. .It Cm / Prompt to enter a search term to begin searching the tree for nodes matching the entered pattern. The search term is an extended regular expression, as documented in .Xr re_format 7 , and is matched against the path of each tree node. .It Cm n Find the next tree node that matches the current search pattern. .It Cm N Find the previous tree node that matches the current search pattern. .El .Tg praise .It Cm blame Oo Fl C | -no-colour Oc \ Oo Fl c | -commit Ar commit Oo Fl r | -reverse Oc Oc Oo Fl h | -help Oc \ Oo Fl n | -limit Ar n Oc Ar path .Dl Pq aliases: Cm praise , Cm annotate , Cm bl , Cm pr , Cm an Show commit attribution history for each line of the file at the specified .Ar path , which may be absolute, relative to the current working directory, or relative to the repository root. This command must be executed from within or below the top level directory of the repository; that is, .Nm assumes a local checkout is open in or above the current working directory. .Pp Options for .Cm fnc blame are as follows: .Bl -tag -width Ds |
︙ | ︙ | |||
747 748 749 750 751 752 753 | .Nm will traverse either as many commits as specified, or as possible in the specified time limit. By default, .Nm will traverse the entire historical record of the file, which can be expensive for large files that span many commits. Use this option for a faster, more targeted annotation. | < < < < < < < < < < < < < < < < < < < < < < < < < < | < > | < | < < < < < < < < < < < > > > > > > > < < < < < < < | | | | | | | | | < < | > > | | | 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 | .Nm will traverse either as many commits as specified, or as possible in the specified time limit. By default, .Nm will traverse the entire historical record of the file, which can be expensive for large files that span many commits. Use this option for a faster, more targeted annotation. .It Fl r , -reverse Reverse annotate the file starting from a historical commit and move forward in time. That is, rather than show the most recent change to each line, show the first time each line was modified by a subsequent commit after the specified .Ar commit . (Requires \fB\-c\fP|\fB\-\-commit\fP.) .El .Pp Key bindings for .Cm fnc blame are as follows: .Bl -tag -width Ds .It Cm Arrow-down, j Move selection cursor down one line. .It Cm Arrow-up, k Move selection cursor up one line. .It Cm Page-down, C-f Move selection cursor down one page. .It Cm Page-up, C-b Move selection cursor up one page. .It Cm Home, gg Move selection cursor to the first line in the file. .It Cm End, G Move selection cursor to the last line in the file. .It Cm Enter Display the .Cm diff of the commit corresponding to the currently selected line. .It Cm b Blame the version of the file corresponding to the commit in the currently selected line. .It Cm p Blame the version of the file corresponding to the parent of the commit in the currently selected line. .It Cm B, Backspace Reload the previous blamed version of the file. .It Cm T Open and populate branch view with all repository branches. .It Cm c Toggle coloured output. On supported terminals, .Nm will default to displaying the blamed file in colour. .It Cm / Prompt to enter a search term to begin searching the file for tokens matching the entered pattern. The search term is an extended regular expression, as documented in .Xr re_format 7 . .It Cm n Find the next token that matches the current search pattern. .It Cm N Find the previous token that matches the current search pattern. .El .Tg tag .It Cm branch Oo Fl C | -no-colour Oc Oo Fl -after Ar date | \ Fl -before Ar date Oc Oo Fl h | -help Oc Oo Fl -open | Fl -closed Oc \ Oo Fl p | -no-private Oc Oo Fl r | -reverse Oc \ Oo Fl s | -sort Ar order Oc Op Ar glob .Dl Pq aliases: Cm tag , Cm br Display navigable list of repository branches. If .Ar glob , is specified, only display branches matching the pattern provided. Pattern matching comparisons depend on the .Xr sqlite3 1 .B LIKE operator, which only folds case for the ASCII character set. This command must be executed from within or below the top level directory of the repository; that is, .Nm assumes a local checkout is open in or above the current working directory. .Pp Branches are lexicographically ordered by default, and are prefixed with an identifier corresponding to the branch state (i.e., open/closed). The current and private branches are additionally annotated with a postfixed identifier: |
︙ | ︙ | |||
876 877 878 879 880 881 882 | .Pp Options for .Cm fnc branch are as follows: .Bl -tag -width Ds .It Fl a , -after Ar date Display only those branches with activity after the specified | | < < < < < < < < < | < < < < < < < < < < < < < < < < < | 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 | .Pp Options for .Cm fnc branch are as follows: .Bl -tag -width Ds .It Fl a , -after Ar date Display only those branches with activity after the specified .Ar date . .It Fl b , -before Ar date Display only those branches with activity before the specified .Ar date . .It Fl C , -no-colour Disable coloured output, which is enabled by default on supported terminals. If this option is not used, colour can be toggled with the .Sy c branch view key binding as documented below. User-defined colours are also supported, see .Sx ENVIRONMENT for details. .It Fl c , -close Display only closed branches. .It Fl h , -help Display branch command help and usage information then exit. .It Fl o , -open Display only opened branches. .It Fl p , -no-private Do not show private branches, which are included in the list of displayed branches by default. .It Fl r , -reverse Reverse the order in which branches are displayed. .It Fl s , -sort Ar order Sort branches by .Ar order . Valid .Ar order |
︙ | ︙ | |||
947 948 949 950 951 952 953 | .Cm fnc branch are as follows: .Bl -tag -width Ds .It Cm Arrow-down, j Move selection cursor down one branch. .It Cm Arrow-up, k Move selection cursor up one branch. | < < < < | | | | < < < < < < | 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 | .Cm fnc branch are as follows: .Bl -tag -width Ds .It Cm Arrow-down, j Move selection cursor down one branch. .It Cm Arrow-up, k Move selection cursor up one branch. .It Cm Page-down, C-f Move selection cursor down one page. .It Cm Page-up, C-b Move selection cursor up one page. .It Cm Home, gg Move selection cursor to the first branch in the list. .It Cm End, G Move selection cursor to the last branch in the list. .It Cm Enter, Space Display the .Cm timeline of the currently selected branch. .It Cm c Toggle coloured output. On supported terminals, .Nm will default to displaying the branch list in colour. .It Cm d Toggle display of the date on which the branch last received changes. .It Cm i Toggle display of the SHA{1,3} hash that identifies branch, which is the hash of the commit on the tip of said branch. .It Cm t Open the .Cm tree view of the currently selected branch. .It Cm R, C-l Reload the view with all repository branches, irrespective of which options were used in this |
︙ | ︙ | |||
999 1000 1001 1002 1003 1004 1005 | .It Cm n Find the next branch that matches the current search pattern. .It Cm N Find the previous branch that matches the current search pattern. .El .El .Sh ENVIRONMENT | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < | | | 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 | .It Cm n Find the next branch that matches the current search pattern. .It Cm N Find the previous branch that matches the current search pattern. .El .El .Sh ENVIRONMENT .Nm displays coloured output by default in supported terminals. Each colour object identified below can be defined by either exporting environment variables .Po e.g., .Cm export FNC_COLOUR_COMMIT=red .Pc , or with .Nm Cm config as documented above. At startup, .Nm will search for user-defined colours in the following order: .Bl -column " environment variables " description -offset Ds .It 1. repository settings Ta Pa repo.fossil .It 3. environment variables Ta Sy shell .El .Pp If none are found, the default colour scheme will be displayed. This enables setting per-project colours to visually distinguish the current repository being viewed, and globally changing the colour scheme for all repositories with no local settings configured. Colours supported in .Nm are: .Bl -column "black" "yellow" "magenta" "default" -offset indent-two .It Qq black Ta Qq green Ta Qq blue Ta Qq cyan .It Qq red Ta Qq yellow Ta Qq magenta Ta Qq default .El .Pp Where .Qq default is the current foreground (i.e., text) colour in the terminal. User-definable colour objects displayed in various .Nm |
︙ | ︙ | |||
1095 1096 1097 1098 1099 1100 1101 | .Qq magenta . .It Ev FNC_COLOUR_DIFF_PLUS Added lines displayed in the diff view. If not defined, the default value is .Qq cyan . .It Ev FNC_COLOUR_DIFF_CHUNK Chunk header lines .Po e.g., | | | 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 | .Qq magenta . .It Ev FNC_COLOUR_DIFF_PLUS Added lines displayed in the diff view. If not defined, the default value is .Qq cyan . .It Ev FNC_COLOUR_DIFF_CHUNK Chunk header lines .Po e.g., .Ql @@ -732,34 +747,40 @@ .Pc displayed in the diff view. If not defined, the default value is .Qq yellow . .It Ev FNC_COLOUR_DIFF_META Metadata displayed in the diff view. If not defined, the default value is .Qq green . .It Ev FNC_COLOUR_DIFF_TAGS |
︙ | ︙ | |||
1132 1133 1134 1135 1136 1137 1138 | .It Ev FNC_COLOUR_BRANCH_CURRENT The branch corresponding to the current checkout displayed in the branch view. If not defined, the default value is .Qq green . .It Ev FNC_COLOUR_BRANCH_PRIVATE Private branches displayed in the branch view. If not defined, the default value is | < < < < < < < < < < < < | 871 872 873 874 875 876 877 878 879 880 881 882 883 884 | .It Ev FNC_COLOUR_BRANCH_CURRENT The branch corresponding to the current checkout displayed in the branch view. If not defined, the default value is .Qq green . .It Ev FNC_COLOUR_BRANCH_PRIVATE Private branches displayed in the branch view. If not defined, the default value is .Qq yellow . .El .Pp To clear environment variables, issue .Cm unset Ar ENVIRONMENT_VARIABLE in the shell. .Sh EXIT STATUS |
︙ | ︙ |
Changes to src/fnc.c.
1 | /* | | | 1 2 3 4 5 6 7 8 9 | /* * Copyright (c) 2021 Mark Jamsek <mark@jamsek.com> * Copyright (c) 2013-2021 Stephan Beal <https://wanderinghorse.net> * Copyright (c) 2020 Stefan Sperling <stsp@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * |
︙ | ︙ | |||
31 32 33 34 35 36 37 | # endif # if !defined(_DEFAULT_SOURCE) # define _DEFAULT_SOURCE /* Needed for strsep() on glibc >= 2.19. */ # endif #endif | < < < | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | # endif # if !defined(_DEFAULT_SOURCE) # define _DEFAULT_SOURCE /* Needed for strsep() on glibc >= 2.19. */ # endif #endif #include <sys/queue.h> #include <sys/ioctl.h> #include <sys/stat.h> #ifdef _WIN32 #include <windows.h> |
︙ | ︙ | |||
70 71 72 73 74 75 76 | #include "libfossil.h" #include "settings.h" #define FNC_VERSION VERSION /* cf. Makefile */ /* Utility macros. */ | | | < < | | < < < | | | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 | #include "libfossil.h" #include "settings.h" #define FNC_VERSION VERSION /* cf. Makefile */ /* Utility macros. */ #define MIN(a, b) (((a) < (b)) ? (a) : (b)) #define MAX(a, b) (((a) > (b)) ? (a) : (b)) #if !defined(CTRL) #define CTRL(key) ((key) & 037) /* CTRL+<key> input. */ #endif #define nitems(a) (sizeof((a)) / sizeof((a)[0])) #define STRINGIFYOUT(s) #s #define STRINGIFY(s) STRINGIFYOUT(s) #define CONCATOUT(a, b) a ## b #define CONCAT(a, b) CONCATOUT(a, b) #define FILE_POSITION __FILE__ ":" STRINGIFY(__LINE__) #define FLAG_SET(f, b) ((f) |= (b)) #define FLAG_CHK(f, b) ((f) & (b)) #define FLAG_TOG(f, b) ((f) ^= (b)) #define FLAG_CLR(f, b) ((f) &= ~(b)) /* Application macros. */ #define PRINT_VERSION STRINGIFY(FNC_VERSION) #define DIFF_DEF_CTXT 5 /* Default diff context lines. */ #define DIFF_MAX_CTXT 64 /* Max diff context lines. */ #define SPIN_INTERVAL 200 /* Status line progress indicator. */ #define SPINNER "\\|/-\0" #define NULL_DEVICE "/dev/null" #define NULL_DEVICELEN (sizeof(NULL_DEVICE) - 1) #define KEY_ESCAPE 27 #if DEBUG #define RC(r, fmt, ...) fcli_err_set(r, "%s::%s " fmt, \ __func__, FILE_POSITION, __VA_ARGS__) #else #define RC(r, fmt, ...) fcli_err_set(r, fmt, __VA_ARGS__) #endif /* DEBUG */ /* Portability macros. */ #ifndef __OpenBSD__ #ifndef HAVE_STRTONUM # define strtonum(s, min, max, o) strtol(s, (char **)o, 10) # endif /* HAVE_STRTONUM */ #endif #if !defined(__dead) #define __dead #endif #ifndef TAILQ_FOREACH_SAFE /* Rewrite of OpenBSD 6.9 sys/queue.h for Linux builds. */ #define TAILQ_FOREACH_SAFE(var, head, field, tmp) \ for ((var) = ((head)->tqh_first); \ (var) != (NULL) && ((tmp) = TAILQ_NEXT(var, field), 1); \ |
︙ | ︙ | |||
180 181 182 183 184 185 186 | /* Timeline options. */ struct artifact_types { const char **values; short nitems; } filter_types; /* Only load commits of <type>. */ union { const char *zlimit; | | | 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 | /* Timeline options. */ struct artifact_types { const char **values; short nitems; } filter_types; /* Only load commits of <type>. */ union { const char *zlimit; int limit; } nrecords; /* Number of commits to load. */ const char *filter_tag; /* Only load commits with <tag>. */ const char *filter_branch; /* Only load commits from <branch>. */ const char *filter_user; /* Only load commits from <user>. */ const char *filter_type; /* Placeholder for repeatable types. */ const char *glob; /* Only load commits containing glob */ bool utc; /* Display UTC sans user local time. */ |
︙ | ︙ | |||
212 213 214 215 216 217 218 | bool lsconf; /* List all defined settings. */ bool unset; /* Unset the specified setting. */ /* Command line flags and help. */ fcli_help_info fnc_help; /* Global help. */ fcli_cliflag cliflags_global[3]; /* Global options. */ fcli_command cmd_args[7]; /* App commands. */ | | | | | | | | 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 | bool lsconf; /* List all defined settings. */ bool unset; /* Unset the specified setting. */ /* Command line flags and help. */ fcli_help_info fnc_help; /* Global help. */ fcli_cliflag cliflags_global[3]; /* Global options. */ fcli_command cmd_args[7]; /* App commands. */ fcli_cliflag cliflags_timeline[12]; /* Timeline options. */ fcli_cliflag cliflags_diff[7]; /* Diff options. */ fcli_cliflag cliflags_tree[4]; /* Tree options. */ fcli_cliflag cliflags_blame[6]; /* Blame options. */ fcli_cliflag cliflags_branch[10]; /* Branch options. */ fcli_cliflag cliflags_config[4]; /* Config options. */ } fnc_init = { NULL, /* cmdarg copy of argv[1] to aid usage/error report. */ NULL, /* sym(bolic name) of commit to open defaults to tip. */ NULL, /* path for tree to open or timeline to find commits. */ 0, /* err fnc error state. */ false, /* hflag if --help is requested. */ false, /* vflag if --version is requested. */ |
︙ | ︙ | |||
284 285 286 287 288 289 290 | {"config", "conf\0cfg\0settings\0set\0", "Configure or view currently available settings.", cmd_config, usage_config, fnc_init.cliflags_config}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel. */ }, { /* cliflags_timeline timeline command related options. */ | < < > > > > < < < < < | 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 | {"config", "conf\0cfg\0settings\0set\0", "Configure or view currently available settings.", cmd_config, usage_config, fnc_init.cliflags_config}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel. */ }, { /* cliflags_timeline timeline command related options. */ FCLI_FLAG_BOOL("C", "no-colour", &fnc_init.nocolour, "Disable colourised timeline, which is enabled by default on\n " "supported terminals. Colour can also be toggled with the 'c' " "\n key binding in timeline view when this option is not used."), FCLI_FLAG("T", "tag", "<tag>", &fnc_init.filter_tag, "Only display commits with T cards containing <tag>."), FCLI_FLAG("b", "branch", "<branch>", &fnc_init.filter_branch, "Only display commits that reside on the given <branch>."), FCLI_FLAG("c", "commit", "<commit>", &fnc_init.sym, "Open the timeline from <commit>. Common symbols are:\n" "\tSHA{1,3} hash\n" "\tSHA{1,3} unique prefix\n" "\tbranch\n" "\ttag:TAG\n" "\troot:BRANCH\n" "\tISO8601 date\n" "\tISO8601 timestamp\n" "\t{tip,current,prev,next}\n " "For a complete list of symbols see Fossil's Check-in Names:\n " "https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki"), FCLI_FLAG_CSTR("f", "filter", "<glob>", &fnc_init.glob, "Populate the timeline with commits containing <glob> in the commit" "\n comment, user, or branch field."), FCLI_FLAG_BOOL("h", "help", NULL, "Display timeline command help and usage."), FCLI_FLAG("n", "limit", "<n>", &fnc_init.nrecords.zlimit, "Limit display to <n> latest commits; defaults to entire history " "of\n current checkout. Negative values are a no-op."), FCLI_FLAG_X("t", "type", "<type>", &fnc_init.filter_type, fcli_flag_type_arg_cb, "Only display <type> commits. Valid types are:\n" "\tci - check-in\n" "\tw - wiki\n" "\tt - ticket\n" "\te - technote\n" |
︙ | ︙ | |||
346 347 348 349 350 351 352 | FCLI_FLAG_BOOL("i", "invert", &fnc_init.invert, "Invert difference between artifacts. Inversion can also be " "toggled\n with the 'i' key binding in diff view."), FCLI_FLAG_BOOL("q", "quiet", &fnc_init.quiet, "Disable verbose diff output; that is, do not output complete" " content\n of newly added or deleted files. Verbosity can also" " be toggled with\n the 'v' key binding in diff view."), | < < < | 335 336 337 338 339 340 341 342 343 344 345 346 347 348 | FCLI_FLAG_BOOL("i", "invert", &fnc_init.invert, "Invert difference between artifacts. Inversion can also be " "toggled\n with the 'i' key binding in diff view."), FCLI_FLAG_BOOL("q", "quiet", &fnc_init.quiet, "Disable verbose diff output; that is, do not output complete" " content\n of newly added or deleted files. Verbosity can also" " be toggled with\n the 'v' key binding in diff view."), FCLI_FLAG_BOOL("w", "whitespace", &fnc_init.ws, "Ignore whitespace-only changes when displaying diff. This option " "can\n also be toggled with the 'w' key binding in diff view."), FCLI_FLAG("x", "context", "<n>", &fnc_init.context, "Show <n> context lines when displaying diff; <n> is capped at 64." "\n Negative values are a no-op."), fcli_cliflag_empty_m |
︙ | ︙ | |||
378 379 380 381 382 383 384 | "\tISO8601 date\n" "\tISO8601 timestamp\n" "\t{tip,current,prev,next}\n " "For a complete list of symbols see Fossil's Check-in Names:\n " "https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki"), FCLI_FLAG_BOOL("h", "help", NULL, "Display tree command help and usage."), | < < < | 364 365 366 367 368 369 370 371 372 373 374 375 376 377 | "\tISO8601 date\n" "\tISO8601 timestamp\n" "\t{tip,current,prev,next}\n " "For a complete list of symbols see Fossil's Check-in Names:\n " "https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki"), FCLI_FLAG_BOOL("h", "help", NULL, "Display tree command help and usage."), fcli_cliflag_empty_m }, /* End cliflags_tree. */ { /* cliflags_blame blame command related options. */ FCLI_FLAG_BOOL("C", "no-colour", &fnc_init.nocolour, "Disable coloured output, which is enabled by default on supported" "\n terminals. Colour can also be toggled with the 'c' key " |
︙ | ︙ | |||
408 409 410 411 412 413 414 | FCLI_FLAG_BOOL("h", "help", NULL, "Display blame command help and usage."), FCLI_FLAG("n", "limit", "<n>", &fnc_init.nrecords.zlimit, "Limit depth of blame history to <n> commits or seconds. Denote the" "\n latter by postfixing 's' (e.g., 30s). Useful for large files" " with\n extensive history. Persists for the duration of the " "session."), | < < < | 391 392 393 394 395 396 397 398 399 400 401 402 403 404 | FCLI_FLAG_BOOL("h", "help", NULL, "Display blame command help and usage."), FCLI_FLAG("n", "limit", "<n>", &fnc_init.nrecords.zlimit, "Limit depth of blame history to <n> commits or seconds. Denote the" "\n latter by postfixing 's' (e.g., 30s). Useful for large files" " with\n extensive history. Persists for the duration of the " "session."), FCLI_FLAG_BOOL("r", "reverse", &fnc_init.reverse, "Reverse annotate the file starting from a historical commit. " "Rather\n than show the most recent change of each line, show " "the first time\n each line was modified after the specified " "commit. Requires -c|--commit."), fcli_cliflag_empty_m }, /* End cliflags_blame. */ |
︙ | ︙ | |||
443 444 445 446 447 448 449 | "Display branch command help and usage."), FCLI_FLAG_BOOL("o", "open", &fnc_init.open, "Show open branches only. Open and closed branches are listed by " "\n default."), FCLI_FLAG_BOOL("p", "no-private", &fnc_init.noprivate, "Do not show private branches, which are otherwise included in the" "\n list of displayed branches by default."), | < < < < < < < | 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 | "Display branch command help and usage."), FCLI_FLAG_BOOL("o", "open", &fnc_init.open, "Show open branches only. Open and closed branches are listed by " "\n default."), FCLI_FLAG_BOOL("p", "no-private", &fnc_init.noprivate, "Do not show private branches, which are otherwise included in the" "\n list of displayed branches by default."), FCLI_FLAG_BOOL("r", "reverse", &fnc_init.reverse, "Reverse the order in which branches are displayed."), FCLI_FLAG("s", "sort", "<order>", &fnc_init.sort, "Sort branches by <order>. Available options are:\n" "\tmru - most recently used\n" "\tstate - open/closed state\n " "Branches are sorted in lexicographical order by default."), fcli_cliflag_empty_m }, /* End cliflags_blame. */ { /* cliflags_config config command related options. */ FCLI_FLAG_BOOL("h", "help", NULL, "Display config command help and usage."), FCLI_FLAG_BOOL(NULL, "ls", &fnc_init.lsconf, "Display a list of all currently defined settings."), FCLI_FLAG_BOOL("u", "unset", &fnc_init.unset, "Unset (i.e., remove) the specified repository setting."), fcli_cliflag_empty_m }, /* End cliflags_tree. */ }; enum date_string { ISO8601_DATE_ONLY = 10, ISO8601_TIMESTAMP = 20 }; enum fnc_view_id { FNC_VIEW_TIMELINE, FNC_VIEW_DIFF, FNC_VIEW_TREE, |
︙ | ︙ | |||
498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 | enum fnc_search_state { SEARCH_WAITING, SEARCH_CONTINUE, SEARCH_COMPLETE, SEARCH_NO_MATCH, SEARCH_FOR_END }; enum fnc_diff_type { FNC_DIFF_CKOUT, FNC_DIFF_COMMIT, FNC_DIFF_BLOB, FNC_DIFF_WIKI }; | > > > > > > > > > > > > > > > > > > > > > < < < < < < < < < | 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 | enum fnc_search_state { SEARCH_WAITING, SEARCH_CONTINUE, SEARCH_COMPLETE, SEARCH_NO_MATCH, SEARCH_FOR_END }; /* * User-definable setting that must map to SETTINGS in "settings.h". */ enum fnc_colour_obj { FNC_COLOUR_COMMIT = 1, FNC_COLOUR_USER, FNC_COLOUR_DATE, FNC_COLOUR_DIFF_META, FNC_COLOUR_DIFF_MINUS, FNC_COLOUR_DIFF_PLUS, FNC_COLOUR_DIFF_CHUNK, FNC_COLOUR_DIFF_TAGS, FNC_COLOUR_TREE_LINK, FNC_COLOUR_TREE_DIR, FNC_COLOUR_TREE_EXEC, FNC_COLOUR_BRANCH_OPEN, FNC_COLOUR_BRANCH_CLOSED, FNC_COLOUR_BRANCH_CURRENT, FNC_COLOUR_BRANCH_PRIVATE }; enum fnc_diff_type { FNC_DIFF_CKOUT, FNC_DIFF_COMMIT, FNC_DIFF_BLOB, FNC_DIFF_WIKI }; struct fnc_colour { STAILQ_ENTRY(fnc_colour) entries; regex_t regex; uint8_t scheme; }; STAILQ_HEAD(fnc_colours, fnc_colour); |
︙ | ︙ | |||
633 634 635 636 637 638 639 | int ncommits_needed; /* * XXX Is there a more elegant solution to retrieving return codes from * thread functions while pinging between, but before we join, threads? */ int rc; bool endjmp; | | | < | < < < < < < < < < < < < | < < < < < | 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 | int ncommits_needed; /* * XXX Is there a more elegant solution to retrieving return codes from * thread functions while pinging between, but before we join, threads? */ int rc; bool endjmp; bool timeline_end; bool needs_reset; sig_atomic_t *quit; pthread_cond_t commit_consumer; pthread_cond_t commit_producer; }; struct fnc_tl_view_state { struct fnc_tl_thread_cx thread_cx; struct commit_queue commits; struct commit_entry *first_commit_onscreen; struct commit_entry *last_commit_onscreen; struct commit_entry *selected_commit; struct commit_entry *matched_commit; struct commit_entry *search_commit; struct fnc_colours colours; const char *curr_ckout_uuid; char *path; /* Match commits involving path. */ int selected_idx; sig_atomic_t quit; pthread_t thread_id; bool colour; }; struct fnc_pathlist_entry { TAILQ_ENTRY(fnc_pathlist_entry) entry; const char *path; size_t pathlen; void *data; /* XXX May want to save id, mode, etc. */ }; TAILQ_HEAD(fnc_pathlist_head, fnc_pathlist_entry); struct fnc_diff_view_state { struct fnc_view *timeline_view; struct fnc_commit_artifact *selected_commit; struct fnc_pathlist_head *paths; fsl_buffer buf; struct fnc_colours colours; FILE *f; fsl_uuid_str id1; fsl_uuid_str id2; int first_line_onscreen; int last_line_onscreen; int diff_flags; int context; int sbs; int matched_line; int current_line; size_t ncols; size_t nlines; off_t *line_offsets; bool eof; bool colour; bool showmeta; }; TAILQ_HEAD(fnc_parent_trees, fnc_parent_tree); struct fnc_tree_view_state { /* Parent trees of the- */ struct fnc_parent_trees parents; /* -current subtree. */ struct fnc_repository_tree *repo; /* The repository tree. */ struct fnc_tree_object *root; /* Top level repo tree. */ struct fnc_tree_object *tree; /* Currently displayed tree */ struct fnc_tree_entry *first_entry_onscreen; struct fnc_tree_entry *last_entry_onscreen; struct fnc_tree_entry *selected_entry; struct fnc_tree_entry *matched_entry; struct fnc_colours colours; char *tree_label; /* Headline string. */ fsl_uuid_str commit_id; fsl_id_t rid; int ndisplayed; int selected_idx; bool colour; bool show_id; }; struct fnc_blame_line { fsl_uuid_str id; bool annotated; }; struct fnc_blame_cb_cx { struct fnc_view *view; struct fnc_blame_line *lines; fsl_uuid_str commit_id; fsl_uuid_str root_commit; int nlines; bool *quit; }; typedef int (*fnc_cancel_cb)(void *); struct fnc_blame_thread_cx { struct fnc_blame_cb_cx *cb_cx; |
︙ | ︙ | |||
784 785 786 787 788 789 790 | fsl_uuid_str commit_id; char *path; int first_line_onscreen; int last_line_onscreen; int selected_line; int matched_line; int spin_idx; | < < < | 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 | fsl_uuid_str commit_id; char *path; int first_line_onscreen; int last_line_onscreen; int selected_line; int matched_line; int spin_idx; bool done; bool blame_complete; bool eof; bool colour; }; struct fnc_branch { char *name; char *date; fsl_uuid_str id; bool private; |
︙ | ︙ | |||
836 837 838 839 840 841 842 | int selected; int when; bool colour; bool show_date; bool show_id; }; | < < < < < < < < < < < < < < < < | | | | | | < | < < < < < < < < < < < < < < < | > | | | > | > | < | < < | < | | | > | | | < < | | < < < < | | | | < < | | > > > | > | < < | | < < < | < < < < < < < < < | > | > < < | | | | 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 | int selected; int when; bool colour; bool show_date; bool show_id; }; TAILQ_HEAD(view_tailhead, fnc_view); struct fnc_view { TAILQ_ENTRY(fnc_view) entries; WINDOW *window; PANEL *panel; struct fnc_view *parent; struct fnc_view *child; union { struct fnc_diff_view_state diff; struct fnc_tl_view_state timeline; struct fnc_tree_view_state tree; struct fnc_blame_view_state blame; struct fnc_branch_view_state branch; } state; enum fnc_view_id vid; enum fnc_search_state search_status; enum fnc_search_mvmnt searching; int nlines; int ncols; int start_ln; int start_col; int lines; /* Duplicate curses LINES macro. */ int cols; /* Duplicate curses COLS macro. */ bool focus_child; bool active; /* Only 1 parent or child at a time. */ bool egress; bool started_search; regex_t regex; regmatch_t regmatch; int (*show)(struct fnc_view *); int (*input)(struct fnc_view **, struct fnc_view *, int); int (*close)(struct fnc_view *); int (*search_init)(struct fnc_view *); int (*search_next)(struct fnc_view *); }; static volatile sig_atomic_t rec_sigwinch; static volatile sig_atomic_t rec_sigpipe; static volatile sig_atomic_t rec_sigcont; static void fnc_show_version(void); static int init_curses(void); static struct fnc_view *view_open(int, int, int, int, enum fnc_view_id); static int open_timeline_view(struct fnc_view *, fsl_id_t, const char *, const char *); static int view_loop(struct fnc_view *); static int show_timeline_view(struct fnc_view *); static void *tl_producer_thread(void *); static int block_main_thread_signals(void); static int build_commits(struct fnc_tl_thread_cx *); static int commit_builder(struct fnc_commit_artifact **, fsl_id_t, fsl_stmt *); static int signal_tl_thread(struct fnc_view *, int); static int draw_commits(struct fnc_view *); static void parse_emailaddr_username(char **); static int formatln(wchar_t **, int *, const char *, int, int); static int multibyte_to_wchar(const char *, wchar_t **, size_t *); static int write_commit_line(struct fnc_view *, struct fnc_commit_artifact *, int); static int view_input(struct fnc_view **, int *, struct fnc_view *, struct view_tailhead *); static int help(struct fnc_view *); static int padpopup(struct fnc_view *, int, int, FILE *, const char *); static void centerprint(WINDOW *, int, int, int, const char *, chtype); static int tl_input_handler(struct fnc_view **, struct fnc_view *, int); static int timeline_scroll_down(struct fnc_view *, int); static void timeline_scroll_up(struct fnc_tl_view_state *, int); static void select_commit(struct fnc_tl_view_state *); static int view_is_parent(struct fnc_view *); static int make_splitscreen(struct fnc_view *); static int make_fullscreen(struct fnc_view *); static int view_split_start_col(int); static int view_search_start(struct fnc_view *); static int tl_search_init(struct fnc_view *); static int tl_search_next(struct fnc_view *); static bool find_commit_match(struct fnc_commit_artifact *, regex_t *); static int init_diff_commit(struct fnc_view **, int, struct fnc_commit_artifact *, struct fnc_view *); static int open_diff_view(struct fnc_view *, struct fnc_commit_artifact *, int, bool, bool, bool, struct fnc_view *, bool, struct fnc_pathlist_head *); static void show_diff_status(struct fnc_view *); static int create_diff(struct fnc_diff_view_state *); static int create_changeset(struct fnc_commit_artifact *); static int write_commit_meta(struct fnc_diff_view_state *); static int wrapline(char *, fsl_size_t ncols_avail, struct fnc_diff_view_state *, off_t *); static int add_line_offset(off_t **, size_t *, off_t); static int diff_commit(fsl_buffer *, struct fnc_commit_artifact *, int, int, int, struct fnc_pathlist_head *); static int diff_checkout(fsl_buffer *, fsl_id_t, int, int, int, struct fnc_pathlist_head *); static int write_diff_meta(fsl_buffer *, const char *, fsl_uuid_str, const char *, fsl_uuid_str, int, enum fsl_ckout_change_e); static int diff_file(fsl_buffer *, fsl_buffer *, const char *, fsl_uuid_str, const char *, enum fsl_ckout_change_e, int, int, bool); static int diff_non_checkin(fsl_buffer *, struct fnc_commit_artifact *, int, int, int); static int diff_file_artifact(fsl_buffer *, fsl_id_t, const fsl_card_F *, fsl_id_t, const fsl_card_F *, fsl_ckout_change_e, int, int, int, enum fnc_diff_type); static int show_diff(struct fnc_view *); static int write_diff(struct fnc_view *, char *); static int match_line(const char *, regex_t *, size_t, regmatch_t *); static int write_matched_line(int *, const char *, int, int, WINDOW *, regmatch_t *); static void draw_vborder(struct fnc_view *); static int diff_input_handler(struct fnc_view **, struct fnc_view *, int); static int set_selected_commit(struct fnc_diff_view_state *, struct commit_entry *); static int diff_search_init(struct fnc_view *); static int diff_search_next(struct fnc_view *); static int view_close(struct fnc_view *); static int map_repo_path(char **); static bool path_is_child(const char *, const char *, size_t); static int path_skip_common_ancestor(char **, const char *, size_t, const char *, size_t); static bool fnc_path_is_root_dir(const char *); /* static bool fnc_path_is_cwd(const char *); */ static int fnc_pathlist_insert(struct fnc_pathlist_entry **, struct fnc_pathlist_head *, const char *, void *); static int fnc_path_cmp(const char *, const char *, size_t, size_t); static void fnc_pathlist_free(struct fnc_pathlist_head *); static int browse_commit_tree(struct fnc_view **, int, struct commit_entry *, const char *); static int open_tree_view(struct fnc_view *, const char *, fsl_id_t); static int walk_tree_path(struct fnc_tree_view_state *, struct fnc_repository_tree *, struct fnc_tree_object **, const char *); static int create_repository_tree(struct fnc_repository_tree **, fsl_uuid_str *, fsl_id_t); static int tree_builder(struct fnc_repository_tree *, struct fnc_tree_object **, const char *); /* static void delete_tree_node(struct fnc_tree_entry **, */ /* struct fnc_tree_entry *); */ static int link_tree_node(struct fnc_repository_tree *, const char *, const char *, fsl_time_t); static int show_tree_view(struct fnc_view *); static int tree_input_handler(struct fnc_view **, struct fnc_view *, int); static int blame_tree_entry(struct fnc_view **, int, struct fnc_tree_entry *, struct fnc_parent_trees *, fsl_uuid_str); static int tree_search_init(struct fnc_view *); static int tree_search_next(struct fnc_view *); static int tree_entry_path(char **, struct fnc_parent_trees *, struct fnc_tree_entry *); static int draw_tree(struct fnc_view *, const char *); static int timeline_tree_entry(struct fnc_view **, int, struct fnc_tree_view_state *); static void tree_scroll_up(struct fnc_tree_view_state *, int); static void tree_scroll_down(struct fnc_tree_view_state *, int); static int visit_subtree(struct fnc_tree_view_state *, struct fnc_tree_object *); static int tree_entry_get_symlink_target(char **, struct fnc_tree_entry *); static int match_tree_entry(struct fnc_tree_entry *, regex_t *); static void fnc_object_tree_close(struct fnc_tree_object *); static void fnc_close_repository_tree(struct fnc_repository_tree *); static int open_blame_view(struct fnc_view *, char *, fsl_uuid_str, fsl_id_t, int); static int run_blame(struct fnc_view *); static int fnc_dump_buffer_to_file(off_t *, int *, off_t **, FILE *, fsl_buffer *); static int show_blame_view(struct fnc_view *); static void *blame_thread(void *); static int blame_cb(void *, fsl_annotate_opt const * const, fsl_annotate_step const * const); static int draw_blame(struct fnc_view *); static int blame_input_handler(struct fnc_view **, struct fnc_view *, int); static int blame_search_init(struct fnc_view *); static int blame_search_next(struct fnc_view *); static fsl_uuid_cstr get_selected_commit_id(struct fnc_blame_line *, int, int, int); static int fnc_commit_qid_alloc(struct fnc_commit_qid **, fsl_uuid_cstr); static int close_blame_view(struct fnc_view *); static int stop_blame(struct fnc_blame *); static int cancel_blame(void *); static void fnc_commit_qid_free(struct fnc_commit_qid *); static int fnc_load_branches(struct fnc_branch_view_state *); static int create_tmp_branchlist_table(void); static int alloc_branch(struct fnc_branch **, const char *, double, bool, bool, bool); static int fnc_branchlist_insert(struct fnc_branchlist_entry **, struct fnc_branchlist_head *, struct fnc_branch *); static int open_branch_view(struct fnc_view *, int, const char *, double, int); static int show_branch_view(struct fnc_view *); static int branch_input_handler(struct fnc_view **, struct fnc_view *, int); static int tl_branch_entry(struct fnc_view **, int, struct fnc_branchlist_entry *); static int browse_branch_tree(struct fnc_view **, int, struct fnc_branchlist_entry *); static void branch_scroll_up(struct fnc_branch_view_state *, int); static void branch_scroll_down(struct fnc_branch_view_state *, int); static int branch_search_next(struct fnc_view *); static int branch_search_init(struct fnc_view *); static int match_branchlist_entry(struct fnc_branchlist_entry *, regex_t *); static int close_branch_view(struct fnc_view *); static void fnc_free_branches(struct fnc_branchlist_head *); static void fnc_branch_close(struct fnc_branch *); static void view_set_child(struct fnc_view *, struct fnc_view *); static int view_close_child(struct fnc_view *); static int close_tree_view(struct fnc_view *); static int close_timeline_view(struct fnc_view *); static int close_diff_view(struct fnc_view *); static int view_resize(struct fnc_view *); static int screen_is_split(struct fnc_view *); static bool screen_is_shared(struct fnc_view *); static void fnc_resizeterm(void); static int join_tl_thread(struct fnc_tl_view_state *); static void fnc_free_commits(struct commit_queue *); static void fnc_commit_artifact_close(struct fnc_commit_artifact*); static int fsl_file_artifact_free(void *, void *); static void sigwinch_handler(int); static void sigpipe_handler(int); static void sigcont_handler(int); static int strtonumcheck(int *, const char *, const int, const int); static int fnc_date_to_mtime(double *, const char *, int); static char *fnc_strsep (char **, const char *); static int set_colours(struct fnc_colours *, enum fnc_view_id); static int set_colour_scheme(struct fnc_colours *, const int (*)[2], const char **, int); static int init_colour(enum fnc_colour_obj); static char *fnc_conf_get(enum fnc_colour_obj, bool); static int default_colour(enum fnc_colour_obj); static int fnc_conf_set(enum fnc_colour_obj, const char *, bool); static void free_colours(struct fnc_colours *); static bool fnc_home(struct fnc_view *); static int fnc_conf_ls_settings(bool); static int fnc_conf_str2enum(const char *); static const char *fnc_conf_enum2str(int); static struct fnc_colour *get_colour(struct fnc_colours *, int); static struct fnc_colour *match_colour(struct fnc_colours *, const char *); static struct fnc_tree_entry *get_tree_entry(struct fnc_tree_object *, int); static struct fnc_tree_entry *find_tree_entry(struct fnc_tree_object *, const char *, size_t); |
︙ | ︙ | |||
1159 1160 1161 1162 1163 1164 1165 | if (!setlocale(LC_CTYPE, "")) fsl_fprintf(stderr, "[!] Warning: Can't set locale.\n"); fnc_init.cmdarg = argv[1]; /* Which cmd to show usage if needed. */ #if DEBUG fcli.clientFlags.verbose = 2; /* Verbose error reporting. */ #endif | | | > < < < < < < < < < < < < | 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 | if (!setlocale(LC_CTYPE, "")) fsl_fprintf(stderr, "[!] Warning: Can't set locale.\n"); fnc_init.cmdarg = argv[1]; /* Which cmd to show usage if needed. */ #if DEBUG fcli.clientFlags.verbose = 2; /* Verbose error reporting. */ #endif fcli.cliFlags = fnc_init.cliflags_global; fcli.appHelp = &fnc_init.fnc_help; rc = fcli_setup(argc, argv); if (rc) goto end; if (fnc_init.vflag) { fnc_show_version(); goto end; } else if (fnc_init.hflag) usage(); /* NOT REACHED */ rc = fcli_fingerprint_check(true); if (rc) goto end; if (argc == 1) cmd = &fnc_init.cmd_args[FNC_VIEW_TIMELINE]; else { |
︙ | ︙ | |||
1275 1276 1277 1278 1279 1280 1281 | fnc_init.sym); } if (fnc_init.glob) glob = fsl_strdup(fnc_init.glob); if (fnc_init.path) path = fsl_strdup(fnc_init.path); | | | < < < | | < < | > < | | < < < < < < < < < < < < < < < | 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 | fnc_init.sym); } if (fnc_init.glob) glob = fsl_strdup(fnc_init.glob); if (fnc_init.path) path = fsl_strdup(fnc_init.path); else rc = map_repo_path(&path); if (!rc) rc = init_curses(); if (rc) goto end; v = view_open(0, 0, 0, 0, FNC_VIEW_TIMELINE); if (v == NULL) { rc = RC(FSL_RC_ERROR, "%s", "view_open"); goto end; } rc = open_timeline_view(v, rid, path, glob); if (!rc) rc = view_loop(v); end: fsl_free(glob); fsl_free(path); return rc; } /* * Look for an in-repository path in **argv. If found, canonicalise it as an * absolute path relative to the repository root (e.g., /ckoutdir/found/path), * and assign to a dynamically allocated string in *requested_path, which the |
︙ | ︙ | |||
1561 1562 1563 1564 1565 1566 1567 | { initscr(); cbreak(); noecho(); nonl(); intrflush(stdscr, FALSE); keypad(stdscr, TRUE); | < < < < < < < | | 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 | { initscr(); cbreak(); noecho(); nonl(); intrflush(stdscr, FALSE); keypad(stdscr, TRUE); curs_set(0); set_escdelay(0); /* ESC should return immediately. */ #ifndef __linux__ typeahead(-1); /* Don't disrupt screen update operations. */ #endif if (!fnc_init.nocolour && has_colors()) { start_color(); use_default_colors(); } if (sigaction(SIGPIPE, &(struct sigaction){{sigpipe_handler}}, NULL) == -1) return RC(fsl_errno_to_rc(errno, FSL_RC_ERROR), "%s", "sigaction(SIGPIPE)"); if (sigaction(SIGWINCH, &(struct sigaction){{sigwinch_handler}}, NULL) == -1) return RC(fsl_errno_to_rc(errno, FSL_RC_ERROR), "%s", "sigaction(SIGWINCH)"); if (sigaction(SIGCONT, &(struct sigaction){{sigcont_handler}}, NULL) == -1) return RC(fsl_errno_to_rc(errno, FSL_RC_ERROR), "%s", "sigaction(SIGCONT)"); return 0; } static struct fnc_view * view_open(int nlines, int ncols, int start_ln, int start_col, enum fnc_view_id vid) { struct fnc_view *view = calloc(1, sizeof(*view)); |
︙ | ︙ | |||
1635 1636 1637 1638 1639 1640 1641 | const char *glob) { struct fnc_tl_view_state *s = &view->state.timeline; fsl_cx *const f = fcli_cx(); fsl_db *db = fsl_cx_db_repo(f); fsl_buffer sql = fsl_buffer_empty; char *startdate = NULL; | < | > > | 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 | const char *glob) { struct fnc_tl_view_state *s = &view->state.timeline; fsl_cx *const f = fcli_cx(); fsl_db *db = fsl_cx_db_repo(f); fsl_buffer sql = fsl_buffer_empty; char *startdate = NULL; fsl_id_t idtag = 0; int idx, rc = 0; f->clientState.state = &s->thread_cx; if (path != s->path) { fsl_free(s->path); s->path = fsl_strdup(path); if (s->path == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_strdup"); } |
︙ | ︙ | |||
1735 1736 1737 1738 1739 1740 1741 | for (idx = 0; idx < fnc_init.filter_types.nitems; ++idx) fsl_buffer_appendf(&sql, " eventtype=%Q%s", fnc_init.filter_types.values[idx], (idx + 1) < fnc_init.filter_types.nitems ? " OR " : ")"); } if (fnc_init.filter_branch) { | < < < < | < > | | < < | | < < < < < | | | | | | < < | | | < < < < | | < > | < | < < < | < > | | | > | | 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 | for (idx = 0; idx < fnc_init.filter_types.nitems; ++idx) fsl_buffer_appendf(&sql, " eventtype=%Q%s", fnc_init.filter_types.values[idx], (idx + 1) < fnc_init.filter_types.nitems ? " OR " : ")"); } if (fnc_init.filter_branch) { idtag = fsl_db_g_id(db, 0, "SELECT tagid FROM tag WHERE tagname='sym-%q'", fnc_init.filter_branch); if (idtag > 0) fsl_buffer_appendf(&sql, " AND EXISTS(SELECT 1 FROM tagxref" " WHERE tagid=%"FSL_ID_T_PFMT " AND tagtype > 0 AND rid=blob.rid)", idtag); else { rc = RC(FSL_RC_NOT_FOUND, "Invalid branch name [%s]", fnc_init.filter_branch); goto end; } } if (fnc_init.filter_tag) { idtag = fsl_db_g_id(db, 0, "SELECT tagid FROM tag WHERE tagname GLOB 'sym-%q'", fnc_init.filter_tag); if (idtag == 0) idtag = fsl_db_g_id(db, 0, "SELECT tagid FROM tag WHERE tagname='%q'", fnc_init.filter_tag); if (idtag > 0) fsl_buffer_appendf(&sql, " AND EXISTS(SELECT 1 FROM tagxref" " WHERE tagid=%"FSL_ID_T_PFMT " AND tagtype > 0 AND rid=blob.rid)", idtag); else { rc = RC(FSL_RC_NOT_FOUND, "Invalid tag [%s]", fnc_init.filter_tag); goto end; } } if (fnc_init.filter_user) if ((rc = fsl_buffer_appendf(&sql, " AND coalesce(euser, user) GLOB lower('*%q*')", fnc_init.filter_user))) goto end; if (glob) { /* Filter commits on comment, user, and branch name. */ char *like = fsl_mprintf("%%%%%s%%%%", glob); idtag = fsl_db_g_id(db, 0, "SELECT tagid FROM tag WHERE tagname LIKE 'sym-%q'", like); rc = fsl_buffer_appendf(&sql, " AND (coalesce(ecomment, comment) LIKE %Q " " OR coalesce(euser, user) LIKE %Q%c", like, like, idtag ? ' ' : ')'); if (!rc && idtag > 0) rc = fsl_buffer_appendf(&sql, " OR EXISTS(SELECT 1 FROM tagxref" " WHERE tagid=%"FSL_ID_T_PFMT " AND tagtype > 0 AND rid=blob.rid))", idtag); fsl_free(like); if (rc) goto end; } if (startdate) { fsl_buffer_appendf(&sql, " AND event.mtime <= %s", startdate); fsl_free(startdate); } /* * If path is not root ("/"), a versioned path in the repository has * been requested, only retrieve commits involving path. */ if (path[1]) { fsl_buffer_appendf(&sql, " AND EXISTS(SELECT 1 FROM mlink" " WHERE mlink.mid = event.objid" " AND mlink.fnid IN "); if (fsl_cx_is_case_sensitive(f)) { fsl_buffer_appendf(&sql, "(SELECT fnid FROM filename" " WHERE name = %Q OR name GLOB '%q/*')", path + 1, path + 1); /* Skip prepended slash. */ } else { fsl_buffer_appendf(&sql, "(SELECT fnid FROM filename" |
︙ | ︙ | |||
1853 1854 1855 1856 1857 1858 1859 | if (fnc_init.nrecords.limit > 0) fsl_buffer_appendf(&sql, " LIMIT %d", fnc_init.nrecords.limit); view->show = show_timeline_view; view->input = tl_input_handler; view->close = close_timeline_view; | | | | 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 | if (fnc_init.nrecords.limit > 0) fsl_buffer_appendf(&sql, " LIMIT %d", fnc_init.nrecords.limit); view->show = show_timeline_view; view->input = tl_input_handler; view->close = close_timeline_view; view->search_init = tl_search_init; view->search_next = tl_search_next; s->thread_cx.q = fsl_stmt_malloc(); rc = fsl_db_prepare(db, s->thread_cx.q, "%b", &sql); if (rc) { rc = RC(rc, "%s", "fsl_db_prepare"); goto end; } |
︙ | ︙ | |||
1881 1882 1883 1884 1885 1886 1887 | s->colour = !fnc_init.nocolour && has_colors(); s->thread_cx.rc = 0; s->thread_cx.db = db; s->thread_cx.spin_idx = 0; s->thread_cx.ncommits_needed = view->nlines - 1; s->thread_cx.commits = &s->commits; | | | < < < | < < | 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 | s->colour = !fnc_init.nocolour && has_colors(); s->thread_cx.rc = 0; s->thread_cx.db = db; s->thread_cx.spin_idx = 0; s->thread_cx.ncommits_needed = view->nlines - 1; s->thread_cx.commits = &s->commits; s->thread_cx.timeline_end = false; s->thread_cx.quit = &s->quit; s->thread_cx.first_commit_onscreen = &s->first_commit_onscreen; s->thread_cx.selected_commit = &s->selected_commit; s->thread_cx.searching = &view->searching; s->thread_cx.search_status = &view->search_status; s->thread_cx.regex = &view->regex; s->thread_cx.path = s->path; s->thread_cx.needs_reset = false; if (s->colour) { STAILQ_INIT(&s->colours); rc = set_colours(&s->colours, FNC_VIEW_TIMELINE); } end: fsl_buffer_clear(&sql); if (rc) { view_close(view); if (db->error.code) rc = fsl_cx_uplift_db_error(f, db); } return rc; } static int |
︙ | ︙ | |||
1944 1945 1946 1947 1948 1949 1950 | prev = TAILQ_PREV(view, view_tailhead, entries); else if (view->parent) prev = view->parent; if (view->parent) { view->parent->child = NULL; view->parent->focus_child = false; | < < < < < | 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 | prev = TAILQ_PREV(view, view_tailhead, entries); else if (view->parent) prev = view->parent; if (view->parent) { view->parent->child = NULL; view->parent->focus_child = false; } else TAILQ_REMOVE(&views, view, entries); rc = view_close(view); if (rc) goto end; |
︙ | ︙ | |||
2013 2014 2015 2016 2017 2018 2019 2020 2021 | goto end; } rc = view->show(view); if (rc) goto end; if (view->child) { rc = view->child->show(view->child); if (rc) goto end; | > > > < > | > > > > | 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 | goto end; } rc = view->show(view); if (rc) goto end; if (view->child) { rc = view->child->show(view->child); #ifdef __linux__ wnoutrefresh(view->child->window); #endif if (rc) goto end; } #ifdef __linux__ wnoutrefresh(view->window); #else update_panels(); #endif doupdate(); } } end: while (!TAILQ_EMPTY(&views)) { view = TAILQ_FIRST(&views); TAILQ_REMOVE(&views, view, entries); view_close(view); |
︙ | ︙ | |||
2119 2120 2121 2122 2123 2124 2125 | } if ((rc = pthread_mutex_unlock(&fnc_mutex))) rc = RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_unlock"); } | | | | 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 | } if ((rc = pthread_mutex_unlock(&fnc_mutex))) rc = RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_unlock"); } cx->timeline_end = true; return (void *)(intptr_t)rc; } static int block_main_thread_signals(void) { sigset_t set; if (sigemptyset(&set) == -1) return RC(fsl_errno_to_rc(errno, FSL_RC_MISUSE), "%s", "sigemptyset"); /* Bespoke signal handlers for SIGWINCH and SIGCONT. */ if (sigaddset(&set, SIGWINCH) == -1) |
︙ | ︙ | |||
2149 2150 2151 2152 2153 2154 2155 | return RC(fsl_errno_to_rc(errno, FSL_RC_MISUSE), "%s", "sigaddset"); if (pthread_sigmask(SIG_BLOCK, &set, NULL)) return RC(fsl_errno_to_rc(errno, FSL_RC_MISUSE), "%s", "pthread_sigmask"); | | | > | | | | | | 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 | return RC(fsl_errno_to_rc(errno, FSL_RC_MISUSE), "%s", "sigaddset"); if (pthread_sigmask(SIG_BLOCK, &set, NULL)) return RC(fsl_errno_to_rc(errno, FSL_RC_MISUSE), "%s", "pthread_sigmask"); return 0; } static int build_commits(struct fnc_tl_thread_cx *cx) { int rc = 0; if (cx->needs_reset) { /* * XXX If a {tree,branch} view has been opened with the '{t,b}' * key binding, there may be cached statements that necessitate * the commit builder statement being reset otherwise one of the * SQLite3 APIs down the fsl_stmt_step() call stack fails. This * is irrespective of whether fsl_db_prepare_cached() was used. */ fsl_size_t loaded = cx->commits->ncommits + 1; cx->needs_reset = false; rc = fsl_stmt_reset(cx->q); if (rc) return RC(rc, "%s", "fsl_stmt_reset"); while (loaded--) if ((rc = fsl_stmt_step(cx->q)) != FSL_RC_STEP_ROW) return RC(rc, "%s", "fsl_stmt_step"); } |
︙ | ︙ | |||
2355 2356 2357 2358 2359 2360 2361 | static int signal_tl_thread(struct fnc_view *view, int wait) { struct fnc_tl_thread_cx *cx = &view->state.timeline.thread_cx; int rc = 0; while (cx->ncommits_needed > 0) { | | | 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 | static int signal_tl_thread(struct fnc_view *view, int wait) { struct fnc_tl_thread_cx *cx = &view->state.timeline.thread_cx; int rc = 0; while (cx->ncommits_needed > 0) { if (cx->timeline_end) break; /* Wake timeline thread. */ if ((rc = pthread_cond_signal(&cx->commit_consumer))) return RC(fsl_errno_to_rc(rc, FSL_RC_MISUSE), "%s", "pthread_cond_signal"); |
︙ | ︙ | |||
2401 2402 2403 2404 2405 2406 2407 | struct commit_entry *entry = s->selected_commit; struct fnc_colour *c = NULL; const char *search_str = NULL; char *headln = NULL, *idxstr = NULL; char *branch = NULL, *type = NULL; char *uuid = NULL; wchar_t *wcstr; | < | | 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 | struct commit_entry *entry = s->selected_commit; struct fnc_colour *c = NULL; const char *search_str = NULL; char *headln = NULL, *idxstr = NULL; char *branch = NULL, *type = NULL; char *uuid = NULL; wchar_t *wcstr; int ncommits = 0, rc = 0, wstrlen = 0; int ncols_needed, max_usrlen = -1; if (s->selected_commit && !(view->searching != SEARCH_DONE && view->search_status == SEARCH_WAITING)) { uuid = fsl_strdup(s->selected_commit->commit->uuid); branch = fsl_strdup(s->selected_commit->commit->branch); type = fsl_strdup(s->selected_commit->commit->type); } if (s->thread_cx.ncommits_needed > 0) { if ((idxstr = fsl_mprintf(" [%d/%d] %s", entry ? entry->idx + 1 : 0, s->commits.ncommits, (view->searching && !view->search_status) ? "searching..." : "loading...")) == NULL) { rc = RC(FSL_RC_RANGE, "%s", "fsl_mprintf"); goto end; } |
︙ | ︙ | |||
2472 2473 2474 2475 2476 2477 2478 | == NULL) { rc = RC(FSL_RC_RANGE, "%s", "fsl_mprintf"); headln = NULL; goto end; } if (SPINNER[++tcx->spin_idx] == '\0') tcx->spin_idx = 0; | | | | | < > > > | | < | | | 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 | == NULL) { rc = RC(FSL_RC_RANGE, "%s", "fsl_mprintf"); headln = NULL; goto end; } if (SPINNER[++tcx->spin_idx] == '\0') tcx->spin_idx = 0; rc = formatln(&wcstr, &wstrlen, headln, view->ncols, 0); if (rc) goto end; werase(view->window); if (screen_is_shared(view)) wattron(view->window, A_REVERSE); if (s->colour) c = get_colour(&s->colours, FNC_COLOUR_COMMIT); if (c) wattr_on(view->window, COLOR_PAIR(c->scheme), NULL); waddwstr(view->window, wcstr); while (wstrlen < view->ncols) { waddch(view->window, ' '); ++wstrlen; } if (c) wattr_off(view->window, COLOR_PAIR(c->scheme), NULL); if (screen_is_shared(view)) wattroff(view->window, A_REVERSE); fsl_free(wcstr); if (view->nlines <= 1) goto end; /* Parse commits to be written on screen for the longest username. */ entry = s->first_commit_onscreen; while (entry) { wchar_t *usr_wcstr; char *user; int usrlen; if (ncommits >= view->nlines - 1) break; user = fsl_strdup(entry->commit->user); if (user == NULL) { rc = RC(FSL_RC_ERROR, "%s", "fsl_strdup"); goto end; } if (strpbrk(user, "<@>") != NULL) parse_emailaddr_username(&user); rc = formatln(&usr_wcstr, &usrlen, user, view->ncols, 0); if (max_usrlen < usrlen) max_usrlen = usrlen; fsl_free(usr_wcstr); fsl_free(user); ++ncommits; entry = TAILQ_NEXT(entry, entries); } ncommits = 0; entry = s->first_commit_onscreen; s->last_commit_onscreen = s->first_commit_onscreen; while (entry) { if (ncommits >= view->nlines - 1) break; if (ncommits == s->selected_idx) wattr_on(view->window, A_REVERSE, NULL); rc = write_commit_line(view, entry->commit, max_usrlen); if (ncommits == s->selected_idx) wattr_off(view->window, A_REVERSE, NULL); ++ncommits; s->last_commit_onscreen = entry; entry = TAILQ_NEXT(entry, entries); } draw_vborder(view); end: free(branch); free(type); free(uuid); free(idxstr); free(headln); |
︙ | ︙ | |||
2564 2565 2566 2567 2568 2569 2570 | usr[strcspn(usr, "@>")] = '\0'; *username = usr; } static int formatln(wchar_t **ptr, int *wstrlen, const char *mbstr, int column_limit, | | < | | < < < < < < < < | | 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 | usr[strcspn(usr, "@>")] = '\0'; *username = usr; } static int formatln(wchar_t **ptr, int *wstrlen, const char *mbstr, int column_limit, int start_column) { wchar_t *wline = NULL; size_t i, wlen; int rc = 0, cols = 0; *ptr = NULL; *wstrlen = 0; rc = multibyte_to_wchar(mbstr, &wline, &wlen); if (rc) return rc; if (wlen > 0 && wline[wlen - 1] == L'\n') { wline[wlen - 1] = L'\0'; wlen--; } |
︙ | ︙ | |||
2612 2613 2614 2615 2616 2617 2618 | if (cols + width > column_limit) break; cols += width; i++; } else if (width == -1) { if (wline[i] == L'\t') { width = TABSIZE - | | | 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 | if (cols + width > column_limit) break; cols += width; i++; } else if (width == -1) { if (wline[i] == L'\t') { width = TABSIZE - ((cols + column_limit) % TABSIZE); } else { width = 1; wline[i] = L'.'; } if (cols + width > column_limit) break; cols += width; |
︙ | ︙ | |||
2637 2638 2639 2640 2641 2642 2643 | if (rc) free(wline); else *ptr = wline; return rc; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 | if (rc) free(wline); else *ptr = wline; return rc; } static int multibyte_to_wchar(const char *src, wchar_t **dst, size_t *dstlen) { int rc = 0; /* * mbstowcs POSIX extension specifies that the number of wchar that |
︙ | ︙ | |||
2773 2774 2775 2776 2777 2778 2779 | */ user = fsl_strdup(commit->user); if (user == NULL) goto end; if (strpbrk(user, "<@>") != NULL) parse_emailaddr_username(&user); rc = formatln(&usr_wcstr, &usrlen, user, view->ncols - col_pos, | | | 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 | */ user = fsl_strdup(commit->user); if (user == NULL) goto end; if (strpbrk(user, "<@>") != NULL) parse_emailaddr_username(&user); rc = formatln(&usr_wcstr, &usrlen, user, view->ncols - col_pos, col_pos); if (rc) goto end; if (s->colour) c = get_colour(&s->colours, FNC_COLOUR_USER); if (c) wattr_on(view->window, COLOR_PAIR(c->scheme), NULL); waddwstr(view->window, usr_wcstr); |
︙ | ︙ | |||
2800 2801 2802 2803 2804 2805 2806 | return RC(FSL_RC_ERROR, "%s", "fsl_strdup"); while (*comment == '\n') ++comment; eol = strchr(comment, '\n'); if (eol) *eol = '\0'; ncols_avail = view->ncols - col_pos; | | < | 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 | return RC(FSL_RC_ERROR, "%s", "fsl_strdup"); while (*comment == '\n') ++comment; eol = strchr(comment, '\n'); if (eol) *eol = '\0'; ncols_avail = view->ncols - col_pos; rc = formatln(&wcomment, &commentlen, comment, ncols_avail, col_pos); if (rc) goto end; waddwstr(view->window, wcomment); col_pos += commentlen; while (col_pos < view->ncols) { waddch(view->window, ' '); ++col_pos; |
︙ | ︙ | |||
2842 2843 2844 2845 2846 2847 2848 | if ((rc = pthread_mutex_unlock(&fnc_mutex))) return RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_unlock"); sched_yield(); if ((rc = pthread_mutex_lock(&fnc_mutex))) return RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_lock"); | | | < | < | < | > > > > > > > > < < < < < < > > > > > > > > > > > > > > > > | > > > | > > > | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 | if ((rc = pthread_mutex_unlock(&fnc_mutex))) return RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_unlock"); sched_yield(); if ((rc = pthread_mutex_lock(&fnc_mutex))) return RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_lock"); rc = view->search_next(view); return rc; } nodelay(stdscr, FALSE); /* Allow thread to make progress while waiting for input. */ if ((rc = pthread_mutex_unlock(&fnc_mutex))) return RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_unlock"); ch = wgetch(view->window); if ((rc = pthread_mutex_lock(&fnc_mutex))) return RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_lock"); if (rec_sigwinch || rec_sigcont) { fnc_resizeterm(); rec_sigwinch = 0; rec_sigcont = 0; TAILQ_FOREACH(v, views, entries) { if ((rc = view_resize(v))) return rc; if ((rc = v->input(new, v, KEY_RESIZE))) return rc; if (v->child) { if ((rc = view_resize(v->child))) return rc; rc = v->child->input(new, v->child, KEY_RESIZE); if (rc) return rc; } } } switch (ch) { case '\t': if (view->child) { view->active = false; view->child->active = true; view->focus_child = true; } else if (view->parent) { view->active = false; view->parent->active = true; view->parent->focus_child = false; } break; case KEY_F(1): case 'H': case '?': help(view); break; case 'q': rc = view->input(new, view, ch); view->egress = true; break; case 'f': if (view_is_parent(view)) { if (view->child == NULL) break; if (screen_is_split(view->child)) { view->active = false; view->child->active = true; rc = make_fullscreen(view->child); } else rc = make_splitscreen(view->child); if (rc) break; rc = view->child->input(new, view->child, KEY_RESIZE); } else { if (screen_is_split(view)) { view->parent->active = false; view->active = true; rc = make_fullscreen(view); } else rc = make_splitscreen(view); if (rc) break; rc = view->input(new, view, KEY_RESIZE); } break; case '/': if (view->search_init) view_search_start(view); else rc = view->input(new, view, ch); break; case 'N': case 'n': if (view->started_search && view->search_next) { view->searching = (ch == 'n' ? SEARCH_FORWARD : SEARCH_REVERSE); view->search_status = SEARCH_WAITING; rc = view->search_next(view); } else rc = view->input(new, view, ch); break; case KEY_RESIZE: break; case ERR: break; case 'Q': *done = 1; break; default: rc = view->input(new, view, ch); break; } return rc; } static int help(struct fnc_view *view) { FILE *help = NULL; char *title = NULL; static const char *keys[][2] = { {""}, {""}, /* Global */ {" H,?,F1 ", " ❬H❭❬?❭❬F1❭ "}, {" k,<Up> ", " ❬↑❭❬k❭ "}, {" j,<Down> ", " ❬↓❭❬j❭ "}, {" C-b,PgUp ", " ❬C-b❭❬PgUp❭ "}, {" C-f,PgDn ", " ❬C-f❭❬PgDn❭ "}, {" gg,Home ", " ❬gg❭❬Home❭ "}, {" G,End ", " ❬G❭❬End❭ "}, {" Tab ", " ❬TAB❭ "}, {" c ", " ❬c❭ "}, {" f ", " ❬f❭ "}, {" / ", " ❬/❭ "}, {" n ", " ❬n❭ "}, |
︙ | ︙ | |||
3033 3034 3035 3036 3037 3038 3039 | {" Enter,Space ", " ❬Enter❭❬Space❭ "}, {" b ", " ❬b❭ "}, {" F ", " ❬F❭ "}, {" t ", " ❬t❭ "}, {""}, {""}, /* Diff */ {" Space ", " ❬Space❭ "}, | < < < < < < < < < < < < < < < < < < < | | < < | 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 | {" Enter,Space ", " ❬Enter❭❬Space❭ "}, {" b ", " ❬b❭ "}, {" F ", " ❬F❭ "}, {" t ", " ❬t❭ "}, {""}, {""}, /* Diff */ {" Space ", " ❬Space❭ "}, {" b ", " ❬b❭ "}, {" i ", " ❬i❭ "}, {" v ", " ❬v❭ "}, {" w ", " ❬w❭ "}, {" -,_ ", " ❬-❭❬_❭ "}, {" +,= ", " ❬+❭❬=❭ "}, {" C-k,K,<,, ", " ❬C-k❭❬K❭❬<❭❬,❭ "}, {" C-j,J,>,. ", " ❬C-j❭❬J❭❬>❭❬.❭ "}, {""}, {""}, /* Tree */ {" l,Enter,<Right> ", " ❬→❭❬l❭❬Enter❭ "}, {" h,<BS>,<Left> ", " ❬←❭❬h❭❬⌫❭ "}, {" b ", " ❬b❭ "}, {" i ", " ❬i❭ "}, {" t ", " ❬t❭ "}, {""}, {""}, /* Blame */ {" Space ", " ❬Space❭ "}, {" Enter ", " ❬Enter❭ "}, {" b ", " ❬b❭ "}, {" p ", " ❬p❭ "}, {" B ", " ❬B❭ "}, {" T ", " ❬T❭ "}, {""}, {""}, /* Branch */ {" Enter,Space ", " ❬Enter❭❬Space❭ "}, {" d ", " ❬d❭ "}, {" i ", " ❬i❭ "}, {" t ", " ❬t❭ "}, {" R,<C-l> ", " ❬R❭❬C-l❭ "}, {""}, {""}, {0} }; static const char *desc[] = { "", "Global", "Open in-app help", "Move selection cursor or page up one line", "Move selection cursor or page down one line", "Scroll up one page", "Scroll down one page", "Jump to first line or start of the view", "Jump to last line or end of the view", "Switch focus between open views", "Toggle coloured output", "Toggle fullscreen", "Open prompt to enter search term (not available in this view)", "Find next line or token matching the current search term", |
︙ | ︙ | |||
3117 3118 3119 3120 3121 3122 3123 | "Open diff view of the selected commit", "Open and populate branch view with all repository branches", "Open prompt to enter term with which to filter new timeline view", "Display a tree reflecting the state of the selected commit", "", "Diff", "Scroll down one page of diff output", | < < < < < < < < < < < < < < < < < < < | 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 | "Open diff view of the selected commit", "Open and populate branch view with all repository branches", "Open prompt to enter term with which to filter new timeline view", "Display a tree reflecting the state of the selected commit", "", "Diff", "Scroll down one page of diff output", "Open and populate branch view with all repository branches", "Toggle inversion of diff output", "Toggle verbosity of diff output", "Toggle ignore whitespace-only changes in diff", "Decrease the number of context lines", "Increase the number of context lines", "Display diff of next (newer) commit in the timeline", "Display diff of previous (older) commit in the timeline", "", "Tree", "Move into the selected directory", "Return to the parent directory", "Open and populate branch view with all repository branches", "Toggle display of file artifact SHA hash ID", "Display timeline of all commits modifying the selected entry", "", "Blame", "Scroll down one page", "Display the diff of the commit corresponding to the selected line", "Blame the version of the file found in the selected line's commit", "Blame the version of the file found in the selected line's parent " "commit", "Reload the previous blamed version of the file", "Open and populate branch view with all repository branches", "", "Branch", "Display the timeline of the currently selected branch", "Toggle display of the date when the branch last received changes", "Toggle display of the SHA hash that identifies the branch", "Open a tree view of the currently selected branch", "Reload view with all repository branches and no filters applied", "", " See fnc(1) for complete list of options and key bindings." }; int cs, ln, width = 0, rc = 0; |
︙ | ︙ | |||
3260 3261 3262 3263 3264 3265 3266 | case 'j': if (cury < end) ++cury; break; case KEY_PPAGE: case CTRL('b'): if (cury > 0) { | | | | 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 | case 'j': if (cury < end) ++cury; break; case KEY_PPAGE: case CTRL('b'): if (cury > 0) { cury -= wy / 2; if (cury < 0) cury = 0; } break; case KEY_NPAGE: case CTRL('f'): case ' ': if (cury < end) { cury += wy / 2; if (cury > end) cury = end; } break; case 'g': if (!fnc_home(view)) break; |
︙ | ︙ | |||
3337 3338 3339 3340 3341 3342 3343 | refresh(); } static int tl_input_handler(struct fnc_view **new_view, struct fnc_view *view, int ch) { struct fnc_tl_view_state *s = &view->state.timeline; | > > | < > > > > > | | | | < > > > | > > > > > > > | | > > | | < > > > > > > > | > | > > > > | > > > > > > > > > > > > > > > > > > > > | > > > | > > > > > > > > > > > > > > > > > > > | > > > > | > > > > > | < > > > | > > > > | > > > > | < > > | > > > > > > > > > > > > > > | > | > | > > > > > > > > > > > > > > > > > > > > > > > | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | > | | < < | 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 | refresh(); } static int tl_input_handler(struct fnc_view **new_view, struct fnc_view *view, int ch) { struct fnc_tl_view_state *s = &view->state.timeline; struct fnc_view *branch_view = NULL, *diff_view = NULL; struct fnc_view *tree_view = NULL; int rc = 0, start_col = 0; switch (ch) { case KEY_DOWN: case 'j': case '.': case '>': if (s->first_commit_onscreen == NULL) break; if (s->selected_idx < MIN(view->nlines - 2, s->commits.ncommits - 1)) ++s->selected_idx; else if ((rc = timeline_scroll_down(view, 1))) break; select_commit(s); break; case KEY_NPAGE: case CTRL('f'): { struct commit_entry *first; if ((first = s->first_commit_onscreen) == NULL) break; if ((rc = timeline_scroll_down(view, view->nlines - 1))) break; if (first == s->first_commit_onscreen && s->selected_idx < MIN(view->nlines - 2, s->commits.ncommits - 1)) /* At bottom of timeline. */ s->selected_idx = MIN(view->nlines - 2, s->commits.ncommits - 1); select_commit(s); break; } case KEY_END: case 'G': view->search_status = SEARCH_FOR_END; view_search_start(view); break; case 'k': case KEY_UP: case '<': case ',': if (s->first_commit_onscreen == NULL) break; if (s->selected_idx > 0) --s->selected_idx; else timeline_scroll_up(s, 1); select_commit(s); break; case KEY_PPAGE: case CTRL('b'): if (s->first_commit_onscreen == NULL) break; if (TAILQ_FIRST(&s->commits.head) == s->first_commit_onscreen) s->selected_idx = 0; else timeline_scroll_up(s, view->nlines - 1); select_commit(s); break; case 'g': if (!fnc_home(view)) break; /* FALL THROUGH */ case KEY_HOME: if (s->first_commit_onscreen == NULL) break; s->selected_idx = 0; timeline_scroll_up(s, s->commits.ncommits); select_commit(s); break; case KEY_RESIZE: if (s->selected_idx > view->nlines - 2) s->selected_idx = view->nlines - 2; if (s->selected_idx > s->commits.ncommits - 1) s->selected_idx = s->commits.ncommits - 1; select_commit(s); if (s->commits.ncommits < view->nlines - 1 && !s->thread_cx.timeline_end) { s->thread_cx.ncommits_needed += (view->nlines - 1) - s->commits.ncommits; rc = signal_tl_thread(view, 1); } break; case KEY_ENTER: case ' ': case '\r': if (s->selected_commit == NULL) break; if (view_is_parent(view)) start_col = view_split_start_col(view->start_col); if ((rc = init_diff_commit(&diff_view, start_col, s->selected_commit->commit, view))) break; view->active = false; diff_view->active = true; if (view_is_parent(view)) { if (view->child != NULL) { rc = view_close(view->child); view->child = NULL; } if (rc) return rc; view->child = diff_view; diff_view->parent = view; view->focus_child = true; } else *new_view = diff_view; break; case 'b': if (view_is_parent(view)) start_col = view_split_start_col(view->start_col); branch_view = view_open(view->nlines, view->ncols, view->start_ln, start_col, FNC_VIEW_BRANCH); if (branch_view == NULL) return RC(FSL_RC_ERROR, "%s", "view_open"); rc = open_branch_view(branch_view, BRANCH_LS_OPEN_CLOSED, NULL, 0, 0); if (rc) { view_close(branch_view); return rc; } s->thread_cx.needs_reset = true; view->active = false; branch_view->active = true; if (view_is_parent(view)) { rc = view_close_child(view); if (rc) return rc; view_set_child(view, branch_view); view->focus_child = true; } else *new_view = branch_view; break; case 'c': s->colour = !s->colour; break; case 'F': { struct fnc_view *new; char glob[BUFSIZ]; int retval; mvwaddstr(view->window, view->start_ln + view->nlines - 1, 0, "/"); wclrtoeol(view->window); nocbreak(); echo(); retval = wgetnstr(view->window, glob, sizeof(glob)); cbreak(); noecho(); if (retval == ERR) return rc; if (view_is_parent(view)) start_col = view_split_start_col(view->start_col); new = view_open(view->nlines, view->ncols, view->start_ln, start_col, FNC_VIEW_TIMELINE); if (new == NULL) return RC(FSL_RC_ERROR, "%s", "view_open"); rc = open_timeline_view(new, 0, "/", glob); if (rc) { if (rc != FSL_RC_BREAK) return rc; wattr_on(view->window, A_BOLD, NULL); mvwaddstr(view->window, view->start_ln + view->nlines - 1, 0, "-- no matching commits --"); wclrtoeol(view->window); wattr_off(view->window, A_BOLD, NULL); fcli_err_reset(); rc = 0; update_panels(); doupdate(); sleep(1); break; } view->active = false; new->active = true; if (view_is_parent(view)) { rc = view_close_child(view); if (rc) return rc; view_set_child(view, new); view->focus_child = true; } else *new_view = new; break; } case 't': if (s->selected_commit == NULL) break; if (!fsl_rid_is_a_checkin(fcli_cx(), s->selected_commit->commit->rid)) { wattr_on(view->window, A_BOLD, NULL); mvwaddstr(view->window, view->start_ln + view->nlines - 1, 0, "-- tree requires check-in artifact --"); wclrtoeol(view->window); wattr_off(view->window, A_BOLD, NULL); fcli_err_reset(); rc = 0; update_panels(); doupdate(); sleep(1); break; } if (view_is_parent(view)) start_col = view_split_start_col(view->start_col); rc = browse_commit_tree(&tree_view, start_col, s->selected_commit, s->path); if (rc) break; s->thread_cx.needs_reset = true; view->active = false; tree_view->active = true; if (view_is_parent(view)) { rc = view_close_child(view); if (rc) return rc; view_set_child(view, tree_view); view->focus_child = true; } else *new_view = tree_view; break; case 'q': s->quit = 1; break; default: break; } return rc; } static int timeline_scroll_down(struct fnc_view *view, int maxscroll) { struct fnc_tl_view_state *s = &view->state.timeline; struct commit_entry *pentry; int rc = 0, nscrolled = 0, ncommits_needed; if (s->last_commit_onscreen == NULL) return 0; ncommits_needed = s->last_commit_onscreen->idx + 1 + maxscroll; if (s->commits.ncommits < ncommits_needed && !s->thread_cx.timeline_end) { /* Signal timeline thread for n commits needed. */ s->thread_cx.ncommits_needed += maxscroll; rc = signal_tl_thread(view, 1); if (rc) return rc; } do { pentry = TAILQ_NEXT(s->last_commit_onscreen, entries); if (pentry == NULL) break; s->last_commit_onscreen = pentry; pentry = TAILQ_NEXT(s->first_commit_onscreen, entries); if (pentry == NULL) break; s->first_commit_onscreen = pentry; } while (++nscrolled < maxscroll); return rc; } static void timeline_scroll_up(struct fnc_tl_view_state *s, int maxscroll) { struct commit_entry *entry; |
︙ | ︙ | |||
3776 3777 3778 3779 3780 3781 3782 | ++ncommits; } } static int make_splitscreen(struct fnc_view *view) { | | | < | < | < | < < < < | < | < | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < > > | | | > > | > > > > > | | | > > > | | | | > | 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 | ++ncommits; } } static int make_splitscreen(struct fnc_view *view) { int rc = 0; view->start_ln = 0; view->start_col = view_split_start_col(0); view->nlines = LINES; view->ncols = COLS - view->start_col; view->lines = LINES; view->cols = COLS; if ((rc = view_resize(view))) return rc; if (mvwin(view->window, view->start_ln, view->start_col) == ERR) return RC(FSL_RC_ERROR, "%s", "mvwin"); return rc; } static int make_fullscreen(struct fnc_view *view) { int rc = 0; view->start_col = 0; view->start_ln = 0; view->nlines = LINES; view->ncols = COLS; view->lines = LINES; view->cols = COLS; if ((rc = view_resize(view))) return rc; if (mvwin(view->window, view->start_ln, view->start_col) == ERR) return RC(FSL_RC_ERROR, "%s", "mvwin"); return rc; } /* * Only open a new view in a splitscreen if the console is >= 120 columns wide. * Otherwise, open in the current view. If splitting the screen, make the new * panel the largest of 80 columns or half the current column width. */ static int view_split_start_col(int start_col) { if (start_col > 0 || COLS < 120) return 0; return (COLS - MAX(COLS / 2, 80)); } static int view_search_start(struct fnc_view *view) { char pattern[BUFSIZ]; int retval; int rc = 0; if (view->started_search) { regfree(&view->regex); view->searching = SEARCH_DONE; memset(&view->regmatch, 0, sizeof(view->regmatch)); } view->started_search = false; if (view->nlines < 1) return rc; if (view->search_status == SEARCH_FOR_END) { view->search_init(view); view->started_search = true; view->searching = SEARCH_FORWARD; view->search_status = SEARCH_WAITING; view->state.timeline.thread_cx.endjmp = true; rc = view->search_next(view); return rc; } mvwaddstr(view->window, view->start_ln + view->nlines - 1, 0, "/"); wclrtoeol(view->window); nocbreak(); echo(); retval = wgetnstr(view->window, pattern, sizeof(pattern)); cbreak(); noecho(); if (retval == ERR) return rc; if (regcomp(&view->regex, pattern, REG_EXTENDED | REG_NEWLINE) == 0) { if ((rc = view->search_init(view))) { regfree(&view->regex); return rc; } view->started_search = true; view->searching = SEARCH_FORWARD; view->search_status = SEARCH_WAITING; rc = view->search_next(view); } return rc; } static int tl_search_init(struct fnc_view *view) { struct fnc_tl_view_state *s = &view->state.timeline; s->matched_commit = NULL; s->search_commit = NULL; return 0; } static int tl_search_next(struct fnc_view *view) { struct fnc_tl_view_state *s = &view->state.timeline; struct commit_entry *entry; |
︙ | ︙ | |||
3966 3967 3968 3969 3970 3971 3972 | entry = TAILQ_FIRST(&s->commits.head); else entry = TAILQ_LAST(&s->commits.head, commit_tailhead); } while (1) { if (entry == NULL) { | | | | | 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 | entry = TAILQ_FIRST(&s->commits.head); else entry = TAILQ_LAST(&s->commits.head, commit_tailhead); } while (1) { if (entry == NULL) { if (s->thread_cx.timeline_end && s->thread_cx.endjmp) { s->matched_commit = TAILQ_LAST(&s->commits.head, commit_tailhead); view->search_status = SEARCH_COMPLETE; s->thread_cx.endjmp = false; break; } if (s->thread_cx.timeline_end || view->searching == SEARCH_REVERSE) { view->search_status = (s->matched_commit == NULL ? SEARCH_NO_MATCH : SEARCH_COMPLETE); s->search_commit = NULL; cbreak(); return rc; } /* |
︙ | ︙ | |||
4042 4043 4044 4045 4046 4047 4048 | return false; } static int view_close(struct fnc_view *view) { | | | | 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 | return false; } static int view_close(struct fnc_view *view) { int rc = 0; if (view->child) { view_close(view->child); view->child = NULL; } if (view->close) rc = view->close(view); if (view->panel) del_panel(view->panel); if (view->window) delwin(view->window); free(view); return rc; } static int close_timeline_view(struct fnc_view *view) { |
︙ | ︙ | |||
4175 4176 4177 4178 4179 4180 4181 | fsl_free(ffa->fc); fsl_free(ffa); return 0; } static int | | | | | | < < < < < < < < < | | | | | 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 | fsl_free(ffa->fc); fsl_free(ffa); return 0; } static int init_diff_commit(struct fnc_view **new_view, int start_col, struct fnc_commit_artifact *commit, struct fnc_view *timeline_view) { struct fnc_view *diff_view; int rc = 0; diff_view = view_open(0, 0, 0, start_col, FNC_VIEW_DIFF); if (diff_view == NULL) return RC(FSL_RC_ERROR, "%s", "view_open"); rc = open_diff_view(diff_view, commit, DIFF_DEF_CTXT, fnc_init.ws, fnc_init.invert, !fnc_init.quiet, timeline_view, true, NULL); if (!rc) *new_view = diff_view; return rc; } static int open_diff_view(struct fnc_view *view, struct fnc_commit_artifact *commit, int context, bool ignore_ws, bool invert, bool verbosity, struct fnc_view *timeline_view, bool showmeta, struct fnc_pathlist_head *paths) { struct fnc_diff_view_state *s = &view->state.diff; int rc = 0; s->paths = paths; s->selected_commit = commit; s->first_line_onscreen = 1; s->last_line_onscreen = view->nlines; s->current_line = 1; s->f = NULL; s->context = context; s->sbs = 0; verbosity ? s->diff_flags |= FSL_DIFF_VERBOSE : 0; ignore_ws ? s->diff_flags |= FSL_DIFF_IGNORE_ALLWS : 0; invert ? s->diff_flags |= FSL_DIFF_INVERT : 0; s->timeline_view = timeline_view; s->colour = !fnc_init.nocolour && has_colors(); s->showmeta = showmeta; if (s->colour) { STAILQ_INIT(&s->colours); rc = set_colours(&s->colours, FNC_VIEW_DIFF); |
︙ | ︙ | |||
4250 4251 4252 4253 4254 4255 4256 | free_colours(&s->colours); return rc; } view->show = show_diff; view->input = diff_input_handler; view->close = close_diff_view; | | | > | > > > > < | | 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 | free_colours(&s->colours); return rc; } view->show = show_diff; view->input = diff_input_handler; view->close = close_diff_view; view->search_init = diff_search_init; view->search_next = diff_search_next; return rc; } static void show_diff_status(struct fnc_view *view) { mvwaddstr(view->window, 0, 0, "generating diff..."); #ifdef __linux__ wnoutrefresh(view->window); #else update_panels(); #endif doupdate(); } static int create_diff(struct fnc_diff_view_state *s) { FILE *fout = NULL; char *line, *st0 = NULL, *st = NULL; off_t lnoff = 0; int n, rc = 0; free(s->line_offsets); s->line_offsets = fsl_malloc(sizeof(off_t)); if (s->line_offsets == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_malloc"); s->nlines = 0; |
︙ | ︙ | |||
4296 4297 4298 4299 4300 4301 4302 | /* * We'll diff artifacts of type "ci" (i.e., "checkin") separately, as * it's a different process to diff the others (wiki, technote, etc.). */ if (s->selected_commit->diff_type == FNC_DIFF_COMMIT) rc = create_changeset(s->selected_commit); else if (s->selected_commit->diff_type == FNC_DIFF_BLOB) | | | > > < < | 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 | /* * We'll diff artifacts of type "ci" (i.e., "checkin") separately, as * it's a different process to diff the others (wiki, technote, etc.). */ if (s->selected_commit->diff_type == FNC_DIFF_COMMIT) rc = create_changeset(s->selected_commit); else if (s->selected_commit->diff_type == FNC_DIFF_BLOB) rc = diff_file_artifact(&s->buf, s->selected_commit->prid, NULL, s->selected_commit->rid, NULL, FSL_CKOUT_CHANGE_MOD, s->diff_flags, s->context, s->sbs, s->selected_commit->diff_type); else if (s->selected_commit->diff_type == FNC_DIFF_WIKI) rc = diff_non_checkin(&s->buf, s->selected_commit, s->diff_flags, s->context, s->sbs); if (rc) goto end; /* * Delay assigning diff headline labels (i.e., diff id1 id2) till now * because wiki parent commits are obtained in diff_non_checkin(). */ if (s->selected_commit->puuid) { s->id1 = fsl_strdup(s->selected_commit->puuid); if (s->id1 == NULL) { rc = RC(FSL_RC_ERROR, "%s", "fsl_strdup"); goto end; } } else s->id1 = NULL; /* Initial commit, tag, technote, etc. */ if (s->selected_commit->uuid) { s->id2 = fsl_strdup(s->selected_commit->uuid); if (s->id2 == NULL) { rc = RC(FSL_RC_ERROR, "%s", "fsl_strdup"); goto end; } } else s->id2 = NULL; /* Local work tree. */ |
︙ | ︙ | |||
4340 4341 4342 4343 4344 4345 4346 | /* * Diff local changes on disk in the current checkout differently to * checked-in versions: the former compares on disk file content with * file artifacts; the latter compares file artifact blobs only. */ if (s->selected_commit->diff_type == FNC_DIFF_COMMIT) | | > | > < | < < < < < < | > > > > > > | | 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 | /* * Diff local changes on disk in the current checkout differently to * checked-in versions: the former compares on disk file content with * file artifacts; the latter compares file artifact blobs only. */ if (s->selected_commit->diff_type == FNC_DIFF_COMMIT) diff_commit(&s->buf, s->selected_commit, s->diff_flags, s->context, s->sbs, s->paths); else if (s->selected_commit->diff_type == FNC_DIFF_CKOUT) diff_checkout(&s->buf, s->selected_commit->prid, s->diff_flags, s->context, s->sbs, s->paths); /* * Parse the diff buffer line-by-line to record byte offsets of each * line for scrolling and searching in diff view. */ st0 = fsl_strdup(fsl_buffer_str(&s->buf)); st = st0; lnoff = (s->line_offsets)[s->nlines - 1]; while ((line = fnc_strsep(&st, "\n")) != NULL) { n = fprintf(s->f, "%s\n", line); lnoff += n; rc = add_line_offset(&s->line_offsets, &s->nlines, lnoff); if (rc) goto end; } fputc('\n', s->f); ++lnoff; rc = add_line_offset(&s->line_offsets, &s->nlines, lnoff); if (rc) goto end; end: free(st0); fsl_buffer_clear(&s->buf); if (s->f && fflush(s->f) != 0 && rc == 0) rc = RC(FSL_RC_IO, "%s", "fflush"); return rc; } static int |
︙ | ︙ | |||
4487 4488 4489 4490 4491 4492 4493 | if (st == NULL) { RC(FSL_RC_ERROR, "%s", "fsl_strdup"); goto end; } while ((line = fnc_strsep(&st, "\n")) != NULL) { linelen = fsl_strlen(line); if (linelen >= s->ncols) { | | < < < | 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 | if (st == NULL) { RC(FSL_RC_ERROR, "%s", "fsl_strdup"); goto end; } while ((line = fnc_strsep(&st, "\n")) != NULL) { linelen = fsl_strlen(line); if (linelen >= s->ncols) { rc = wrapline(line, s->ncols, s, &lnoff); if (rc) goto end; } else { if ((n = fprintf(s->f, "%s\n", line)) < 0) goto end; lnoff += n; if ((rc = add_line_offset(&s->line_offsets, &s->nlines, lnoff))) goto end; } } fputc('\n', s->f); ++lnoff; if ((rc = add_line_offset(&s->line_offsets, &s->nlines, lnoff))) goto end; for (idx = 0; idx < s->selected_commit->changeset.used; ++idx) { char *changeline; struct fsl_file_artifact *file_change; file_change = s->selected_commit->changeset.list[idx]; switch (file_change->change) { |
︙ | ︙ | |||
4542 4543 4544 4545 4546 4547 4548 | file_change->fc->name)) < 0) goto end; lnoff += n; if ((rc = add_line_offset(&s->line_offsets, &s->nlines, lnoff))) goto end; } | < < < < < < < | 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 | file_change->fc->name)) < 0) goto end; lnoff += n; if ((rc = add_line_offset(&s->line_offsets, &s->nlines, lnoff))) goto end; } end: free(st0); free(line); if (rc) { free(*&s->line_offsets); s->line_offsets = NULL; s->nlines = 0; |
︙ | ︙ | |||
4629 4630 4631 4632 4633 4634 4635 | * exists in both d1 and d2). In cases (1) and (2), we call diff_file_artifact() * to dump the complete content of the added/deleted file if FSL_DIFF_VERBOSE is * set, otherwise only diff metatadata will be output. In case (3), if the * hash (UUID) of each F card is the same, there are no changes; if different, * both artifacts will be passed to diff_file_artifact() to be diffed. */ static int | | > | < | < | | | | 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 | * exists in both d1 and d2). In cases (1) and (2), we call diff_file_artifact() * to dump the complete content of the added/deleted file if FSL_DIFF_VERBOSE is * set, otherwise only diff metatadata will be output. In case (3), if the * hash (UUID) of each F card is the same, there are no changes; if different, * both artifacts will be passed to diff_file_artifact() to be diffed. */ static int diff_commit(fsl_buffer *buf, struct fnc_commit_artifact *commit, int diff_flags, int context, int sbs, struct fnc_pathlist_head *paths) { fsl_cx *const f = fcli_cx(); const fsl_card_F *fc1 = NULL; const fsl_card_F *fc2 = NULL; fsl_deck d1 = fsl_deck_empty; fsl_deck d2 = fsl_deck_empty; fsl_id_t id1; int different = 0, rc = 0; rc = fsl_deck_load_rid(f, &d2, commit->rid, FSL_SATYPE_CHECKIN); if (rc) goto end; rc = fsl_deck_F_rewind(&d2); if (rc) goto end; /* * For the one-and-only special case of repositories, such as the * canonical fnc, that do not have an "initial empty check-in", we * proceed with no parent version to diff against. */ if (commit->puuid) { rc = fsl_sym_to_rid(f, commit->puuid, FSL_SATYPE_CHECKIN, &id1); if (rc) goto end; rc = fsl_deck_load_rid(f, &d1, id1, FSL_SATYPE_CHECKIN); if (rc) goto end; rc = fsl_deck_F_rewind(&d1); if (rc) goto end; fsl_deck_F_next(&d1, &fc1); } fsl_deck_F_next(&d2, &fc2); while (fc1 || fc2) { const fsl_card_F *a = NULL, *b = NULL; fsl_ckout_change_e change = FSL_CKOUT_CHANGE_NONE; bool diff = true; if (paths != NULL && !TAILQ_EMPTY(paths)) { struct fnc_pathlist_entry *pe; diff = false; TAILQ_FOREACH(pe, paths, entry) if (!fsl_strcmp(pe->path, fc1->name) || !fsl_strcmp(pe->path, fc2->name) || !fsl_strncmp(pe->path, fc1->name, pe->pathlen) || !fsl_strncmp(pe->path, fc2->name, pe->pathlen)) { diff = true; break; |
︙ | ︙ | |||
4704 4705 4706 4707 4708 4709 4710 | fsl_deck_F_next(&d2, &fc2); } else if (different < 0) { a = fc1; change = FSL_CKOUT_CHANGE_REMOVED; fsl_deck_F_next(&d1, &fc1); } if (diff) | | > > | | > | | | 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 | fsl_deck_F_next(&d2, &fc2); } else if (different < 0) { a = fc1; change = FSL_CKOUT_CHANGE_REMOVED; fsl_deck_F_next(&d1, &fc1); } if (diff) rc = diff_file_artifact(buf, id1, a, commit->rid, b, change, diff_flags, context, sbs, commit->diff_type); } else if (!fsl_uuidcmp(fc1->uuid, fc2->uuid)) { /* No change */ fsl_deck_F_next(&d1, &fc1); fsl_deck_F_next(&d2, &fc2); } else { change = FSL_CKOUT_CHANGE_MOD; if (diff) rc = diff_file_artifact(buf, id1, fc1, commit->rid, fc2, change, diff_flags, context, sbs, commit->diff_type); fsl_deck_F_next(&d1, &fc1); fsl_deck_F_next(&d2, &fc2); } if (rc == FSL_RC_RANGE) { fsl_buffer_append(buf, "\nDiff has too many changes\n", -1); rc = 0; fsl_cx_err_reset(f); } else if (rc == FSL_RC_DIFF_BINARY) { fsl_buffer_append(buf, "\nBinary files cannot be diffed\n", -1); rc = 0; fsl_cx_err_reset(f); } else if (rc) goto end; } end: |
︙ | ︙ | |||
4745 4746 4747 4748 4749 4750 4751 | * buf output buffer in which diff content is appended * vid repository database record id of the version to diff against * diff_flags, context, and sbs are the same parameters as diff_file_artifact() * nb. This routine is only called with 'fnc diff [hash]'; that is, one or * zero args—not two—supplied to fnc's diff command line interface. */ static int | | > | < | 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 | * buf output buffer in which diff content is appended * vid repository database record id of the version to diff against * diff_flags, context, and sbs are the same parameters as diff_file_artifact() * nb. This routine is only called with 'fnc diff [hash]'; that is, one or * zero args—not two—supplied to fnc's diff command line interface. */ static int diff_checkout(fsl_buffer *buf, fsl_id_t vid, int diff_flags, int context, int sbs, struct fnc_pathlist_head *paths) { fsl_cx *const f = fcli_cx(); fsl_stmt *st = NULL; fsl_buffer sql, abspath, bminus; fsl_uuid_str xminus = NULL; fsl_id_t cid; int rc = 0; bool allow_symlinks; abspath = bminus = sql = fsl_buffer_empty; fsl_ckout_version_info(f, &cid, NULL); /* cid = fsl_config_get_id(f, FSL_CONFDB_CKOUT, 0, "checkout"); */ /* XXX Already done in cmd_diff(): Load vfile table with local state. */ /* rc = fsl_vfile_changes_scan(f, cid, */ /* FSL_VFILE_CKSIG_ENOTFILE & FSL_VFILE_CKSIG_KEEP_OTHERS); */ /* if (rc) */ /* return RC(rc, "%s", "fsl_vfile_changes_scan"); */ |
︙ | ︙ | |||
4881 4882 4883 4884 4885 4886 4887 | } if (!xminus) xminus = fsl_strdup(NULL_DEVICE); allow_symlinks = fsl_config_get_bool(f, FSL_CONFDB_REPO, false, "allow-symlinks"); if (!symlink != !(fsl_is_symlink(fsl_buffer_cstr(&abspath)) && allow_symlinks)) { | | | | | | | | | > | | | 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 | } if (!xminus) xminus = fsl_strdup(NULL_DEVICE); allow_symlinks = fsl_config_get_bool(f, FSL_CONFDB_REPO, false, "allow-symlinks"); if (!symlink != !(fsl_is_symlink(fsl_buffer_cstr(&abspath)) && allow_symlinks)) { rc = write_diff_meta(buf, path, xminus, path, NULL_DEVICE, diff_flags, change); fsl_buffer_append(buf, "\nSymbolic links and regular " "files cannot be diffed\n", -1); if (rc) goto yield; continue; } if (fid > 0 && change != FSL_CKOUT_CHANGE_ADDED) { rc = fsl_content_get(f, fid, &bminus); if (rc) goto yield; } else fsl_buffer_clear(&bminus); if (paths != NULL && !TAILQ_EMPTY(paths)) { struct fnc_pathlist_entry *pe; diff = false; TAILQ_FOREACH(pe, paths, entry) if (!fsl_strncmp(pe->path, path, pe->pathlen) || !fsl_strcmp(pe->path, path)) { diff = true; break; } } if (diff) rc = diff_file(buf, &bminus, path, xminus, fsl_buffer_cstr(&abspath), change, diff_flags, context, sbs); fsl_buffer_reuse(&bminus); fsl_buffer_reuse(&abspath); fsl_free(xminus); xminus = NULL; if (rc == FSL_RC_RANGE) { fsl_buffer_append(buf, "\nDiff has too many changes\n", -1); rc = 0; fsl_cx_err_reset(f); } else if (rc == FSL_RC_DIFF_BINARY) { fsl_buffer_append(buf, "\nBinary files cannot be diffed\n", -1); rc = 0; fsl_cx_err_reset(f); } else if (rc) goto yield; } |
︙ | ︙ | |||
4985 4986 4987 4988 4989 4990 4991 | /* FALL THROUGH */ default: minus = xminus; plus = xplus; break; } | | | | < | | | > < > | 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 | /* FALL THROUGH */ default: minus = xminus; plus = xplus; break; } if (diff_flags & FSL_DIFF_INVERT) { const char *tmp = minus; minus = plus; plus = tmp; tmp = zminus; zminus = zplus; zplus = tmp; } if ((diff_flags & (FSL_DIFF_SIDEBYSIDE | FSL_DIFF_BRIEF)) == 0) { rc = fsl_buffer_appendf(buf, "\nIndex: %s\n%.71c\n", index, '='); if (!rc) rc = fsl_buffer_appendf(buf, "hash - %s\nhash + %s\n", minus, plus); } if (!rc && (diff_flags & FSL_DIFF_BRIEF) == 0) rc = fsl_buffer_appendf(buf, "--- %s\n+++ %s\n", zminus, zplus); return rc; } /* * The diff_file_artifact() counterpart that diffs actual files on disk rather * than file artifacts in the Fossil repository's blob table. * buf output buffer in which diff output will be appended * bminus blob containing content of the versioned file being diffed against * zminus filename of bminus * xminus hex UUID containing the SHA{1,3} hash of the file named zminus * abspath absolute path to the file on disk being diffed * change enum denoting the versioning change of the file * diff_flags, context, and sbs are the same parameters as diff_file_artifact() */ static int diff_file(fsl_buffer *buf, fsl_buffer *bminus, const char *zminus, fsl_uuid_str xminus, const char *abspath, enum fsl_ckout_change_e change, int diff_flags, int context, bool sbs) { fsl_cx *const f = fcli_cx(); fsl_buffer bplus = fsl_buffer_empty; fsl_buffer xplus = fsl_buffer_empty; const char *zplus = NULL; int rc = 0; bool verbose; /* * If it exists, read content of abspath to diff EXCEPT for the content * of 'fossil rm FILE' files because they will either: (1) have the same * content as the versioned file's blob in bminus or (2) have changes. * As a result, the upcoming call to fsl_diff_text_to_buffer() _will_ * (1) produce an empty diff or (2) show the differences; neither are |
︙ | ︙ | |||
5087 5088 5089 5090 5091 5092 5093 | default: RC(FSL_RC_SIZE_MISMATCH, "invalid artifact uuid [%s]", xminus); goto end; } if (rc) goto end; | < < < | | < < < < | | | < < | | > | > < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 | default: RC(FSL_RC_SIZE_MISMATCH, "invalid artifact uuid [%s]", xminus); goto end; } if (rc) goto end; rc = write_diff_meta(buf, zminus, xminus, zplus, fsl_buffer_str(&xplus), diff_flags, change); if (rc) goto end; verbose = (diff_flags & FSL_DIFF_VERBOSE) != 0 ? true : false; if (diff_flags & FSL_DIFF_BRIEF) { rc = fsl_buffer_compare(bminus, &bplus); if (!rc) rc = fsl_buffer_appendf(buf, "CHANGED -> %s\n", zminus); } else if (verbose || (bminus->used && bplus.used)) { rc = fsl_diff_text_to_buffer(bminus, &bplus, buf, context, sbs, diff_flags); } end: fsl_buffer_clear(&bplus); fsl_buffer_clear(&xplus); return rc; } /* * Parse the deck of non-checkin commits to present a 'fossil ui' equivalent * of the corresponding artifact when selected from the timeline. * TODO: Rename this horrible function name. */ static int diff_non_checkin(fsl_buffer *buf, struct fnc_commit_artifact *commit, int diff_flags, int context, int sbs) { fsl_cx *const f = fcli_cx(); fsl_buffer wiki = fsl_buffer_empty; fsl_buffer pwiki = fsl_buffer_empty; fsl_id_t prid = 0; fsl_size_t idx; int rc = 0; fsl_deck *d = NULL; |
︙ | ︙ | |||
5251 5252 5253 5254 5255 5256 5257 | else { fsl_buffer_copy(buf, &wiki); goto end; } } /* Diff the artifacts if a parent is found. */ | | < | < | | < < < < < < | | > < < > | | 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 | else { fsl_buffer_copy(buf, &wiki); goto end; } } /* Diff the artifacts if a parent is found. */ if ((rc = fsl_sym_to_rid(f, commit->puuid, FSL_SATYPE_ANY, &prid))) goto end; if ((rc = fsl_deck_load_rid(f, d, prid, FSL_SATYPE_ANY))) goto end; fsl_buffer_append(&pwiki, d->W.mem, d->W.used); rc = fsl_diff_text_to_buffer(&pwiki, &wiki, buf, context, sbs, diff_flags); /* If a technote, provide the full content after its diff. */ if (d->type == FSL_SATYPE_TECHNOTE) fsl_buffer_appendf(buf, "\n---\n\n%s", wiki.mem); end: fsl_buffer_clear(&wiki); fsl_buffer_clear(&pwiki); fsl_deck_finalize(d); return rc; } /* * Compute the differences between two repository file artifacts to produce the * set of changes necessary to convert one into the other. * buf output buffer in which diff output will be appended * vid1 repo record id of the version from which artifact a belongs * a file artifact being diffed against * vid2 repo record id of the version from which artifact b belongs * b file artifact being diffed * change enum denoting the versioning change of the file * diff_flags bitwise flags to control the diff * context the number of context lines to surround changes * sbs number of columns in which to display each side-by-side diff */ static int diff_file_artifact(fsl_buffer *buf, fsl_id_t vid1, const fsl_card_F *a, fsl_id_t vid2, const fsl_card_F *b, enum fsl_ckout_change_e change, int diff_flags, int context, int sbs, enum fnc_diff_type diff_type) { fsl_cx *const f = fcli_cx(); fsl_stmt stmt = fsl_stmt_empty; fsl_buffer fbuf1 = fsl_buffer_empty; fsl_buffer fbuf2 = fsl_buffer_empty; char *zminus0 = NULL, *zplus0 = NULL; const char *zplus = NULL, *zminus = NULL; fsl_uuid_str xplus0 = NULL, xminus0 = NULL; fsl_uuid_str xplus = NULL, xminus = NULL; int rc = 0; bool verbose; assert(vid1 != vid2); assert(vid2 > 0 && "local checkout should be diffed with diff_checkout()"); fbuf2.used = fbuf1.used = 0; if (a) { rc = fsl_card_F_content(f, a, &fbuf1); if (rc) goto end; zminus = a->name; xminus = a->uuid; } else if (diff_type == FNC_DIFF_BLOB) { rc = fsl_cx_prepare(f, &stmt, "SELECT name FROM filename, mlink " "WHERE filename.fnid=mlink.fnid AND mlink.fid = %d", vid1); if (rc) { rc = RC(FSL_RC_DB, "%s %d", "fsl_cx_prepare", vid1); goto end; } |
︙ | ︙ | |||
5350 5351 5352 5353 5354 5355 5356 | } if (b) { rc = fsl_card_F_content(f, b, &fbuf2); if (rc) goto end; zplus = b->name; xplus = b->uuid; | | | 4842 4843 4844 4845 4846 4847 4848 4849 4850 4851 4852 4853 4854 4855 4856 | } if (b) { rc = fsl_card_F_content(f, b, &fbuf2); if (rc) goto end; zplus = b->name; xplus = b->uuid; } else if (diff_type == FNC_DIFF_BLOB) { rc = fsl_cx_prepare(f, &stmt, "SELECT name FROM filename, mlink " "WHERE filename.fnid=mlink.fnid AND mlink.fid = %d", vid2); if (rc) { rc = RC(FSL_RC_DB, "%s %d", "fsl_cx_prepare", vid2); goto end; } |
︙ | ︙ | |||
5375 5376 5377 5378 5379 5380 5381 | } xplus0 = fsl_rid_to_uuid(f, vid2); xplus = xplus0; fsl_stmt_finalize(&stmt); fsl_content_get(f, vid2, &fbuf2); } | < < < < < | | > | < | < | < < < < < | 4867 4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 | } xplus0 = fsl_rid_to_uuid(f, vid2); xplus = xplus0; fsl_stmt_finalize(&stmt); fsl_content_get(f, vid2, &fbuf2); } rc = write_diff_meta(buf, zminus, xminus, zplus, xplus, diff_flags, change); verbose = (diff_flags & FSL_DIFF_VERBOSE) != 0 ? true : false; if (verbose || (a && b)) rc = fsl_diff_text_to_buffer(&fbuf1, &fbuf2, buf, context, sbs, diff_flags); if (rc) RC(rc, "%s: fsl_diff_text_to_buffer\n" " -> %s [%s]\n -> %s [%s]", fsl_rc_cstr(rc), a ? a->name : NULL_DEVICE, a ? a->uuid : NULL_DEVICE, b ? b->name : NULL_DEVICE, b ? b->uuid : NULL_DEVICE); end: fsl_free(zminus0); fsl_free(zplus0); fsl_free(xminus0); fsl_free(xplus0); fsl_buffer_clear(&fbuf1); fsl_buffer_clear(&fbuf2); return rc; } static int show_diff(struct fnc_view *view) { struct fnc_diff_view_state *s = &view->state.diff; |
︙ | ︙ | |||
5450 5451 5452 5453 5454 5455 5456 | regmatch_t *regmatch = &view->regmatch; struct fnc_colour *c = NULL; wchar_t *wcstr; char *line; size_t linesz = 0; ssize_t linelen; off_t line_offset; | | | | < < < < < < < < < < < | | | | < | < | | > | | | > | < < < < < < < < < < < < < < | | < | | < > | < < | | | < | | < | | | | > > | 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 4976 4977 4978 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 4989 4990 4991 4992 4993 4994 4995 4996 4997 4998 4999 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 5017 5018 5019 5020 5021 5022 5023 5024 5025 5026 5027 5028 5029 5030 5031 5032 5033 5034 5035 5036 5037 5038 | regmatch_t *regmatch = &view->regmatch; struct fnc_colour *c = NULL; wchar_t *wcstr; char *line; size_t linesz = 0; ssize_t linelen; off_t line_offset; int wstrlen; int max_lines = view->nlines; int nlines = s->nlines; int rc = 0, nprintln = 0; line_offset = s->line_offsets[s->first_line_onscreen - 1]; if (fseeko(s->f, line_offset, SEEK_SET)) return RC(fsl_errno_to_rc(errno, FSL_RC_ERROR), "%s", "fseeko"); werase(view->window); if (headln) { if ((line = fsl_mprintf("[%d/%d] %s", (s->first_line_onscreen - 1 + s->current_line), nlines, headln)) == NULL) return RC(FSL_RC_RANGE, "%s", "fsl_mprintf"); rc = formatln(&wcstr, &wstrlen, line, view->ncols, 0); fsl_free(line); fsl_free(headln); if (rc) return rc; if (screen_is_shared(view)) wattron(view->window, A_REVERSE); waddwstr(view->window, wcstr); fsl_free(wcstr); wcstr = NULL; while (wstrlen < view->ncols) { waddch(view->window, ' '); ++wstrlen; } if (screen_is_shared(view)) wattroff(view->window, A_REVERSE); if (max_lines <= 1) return rc; --max_lines; } s->eof = false; line = NULL; while (max_lines > 0 && nprintln < max_lines) { linelen = getline(&line, &linesz, s->f); if (linelen == -1) { if (feof(s->f)) { s->eof = true; break; } fsl_free(line); RC(ferror(s->f) ? fsl_errno_to_rc(errno, FSL_RC_IO) : FSL_RC_IO, "%s", "getline"); return rc; } if (s->colour) c = match_colour(&s->colours, line); if (c) wattr_on(view->window, COLOR_PAIR(c->scheme), NULL); if (s->first_line_onscreen + nprintln == s->matched_line && regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) { rc = write_matched_line(&wstrlen, line, view->ncols, 0, view->window, regmatch); if (rc) { fsl_free(line); return rc; } } else { rc = formatln(&wcstr, &wstrlen, line, view->ncols, 0); if (rc) { fsl_free(line); return rc; } waddwstr(view->window, wcstr); fsl_free(wcstr); wcstr = NULL; } if (c) wattr_off(view->window, COLOR_PAIR(c->scheme), NULL); if (wstrlen <= view->ncols - 1) waddch(view->window, '\n'); ++nprintln; } fsl_free(line); if (nprintln >= 1) s->last_line_onscreen = s->first_line_onscreen + (nprintln - 1); else s->last_line_onscreen = s->first_line_onscreen; draw_vborder(view); if (s->eof) { while (nprintln < view->nlines) { waddch(view->window, '\n'); ++nprintln; } wstandout(view->window); waddstr(view->window, "(END)"); wstandend(view->window); } return rc; |
︙ | ︙ | |||
5594 5595 5596 5597 5598 5599 5600 | return false; } else if (!screen_is_split(view)) return false; return view->active; } | | | | < < < < < < < < < < < < < | | | | < | < < < | < < | | | | < | < < < < < < < | > | < | | | | < | < < | < < < | | < | < | < < < < < | | < < < < < | < | | | > | < < < < < < < < < < | | | < > | < < < | < | < | < < < < < < < | < < < < < | < < < < < < | > > | | > > > > > | > > > | > > > > > > > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < > | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058 5059 5060 5061 5062 5063 5064 5065 5066 5067 5068 5069 5070 5071 5072 5073 5074 5075 5076 5077 5078 5079 5080 5081 5082 5083 5084 5085 5086 5087 5088 5089 5090 5091 5092 5093 5094 5095 5096 5097 5098 5099 5100 5101 5102 5103 5104 5105 5106 5107 5108 5109 5110 5111 5112 5113 5114 5115 5116 5117 5118 5119 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 5143 5144 5145 5146 5147 5148 5149 5150 5151 5152 5153 5154 5155 5156 5157 5158 5159 5160 5161 5162 5163 5164 5165 5166 5167 5168 5169 5170 5171 5172 5173 5174 5175 5176 5177 5178 5179 5180 5181 5182 5183 5184 5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 | return false; } else if (!screen_is_split(view)) return false; return view->active; } static int view_is_parent(struct fnc_view *view) { return view->parent == NULL; } static int screen_is_split(struct fnc_view *view) { return view->start_col > 0; } static int write_matched_line(int *col_pos, const char *line, int ncols_avail, int start_column, WINDOW *window, regmatch_t *regmatch) { wchar_t *wcstr; char *s; int wstrlen; int rc = 0; *col_pos = 0; /* Copy the line up to the matching substring & write it to screen. */ s = fsl_strndup(line, regmatch->rm_so); if (s == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_strndup"); rc = formatln(&wcstr, &wstrlen, s, ncols_avail, start_column); if (rc) { free(s); return rc; } waddwstr(window, wcstr); free(wcstr); free(s); ncols_avail -= wstrlen; *col_pos += wstrlen; /* If not EOL, copy matching string & write to screen with highlight. */ if (ncols_avail > 0) { s = fsl_strndup(line + regmatch->rm_so, regmatch->rm_eo - regmatch->rm_so); if (s == NULL) { rc = RC(FSL_RC_ERROR, "%s", "fsl_strndup"); free(s); return rc; } rc = formatln(&wcstr, &wstrlen, s, ncols_avail, start_column); if (rc) { free(s); return rc; } wattr_on(window, A_REVERSE, NULL); waddwstr(window, wcstr); wattr_off(window, A_REVERSE, NULL); free(wcstr); free(s); ncols_avail -= wstrlen; *col_pos += wstrlen; } /* Write the rest of the line if not yet at EOL. */ if (ncols_avail > 0 && fsl_strlen(line) > (fsl_size_t)regmatch->rm_eo) { rc = formatln(&wcstr, &wstrlen, line + regmatch->rm_eo, ncols_avail, start_column); if (rc) return rc; waddwstr(window, wcstr); free(wcstr); *col_pos += wstrlen; } return rc; } static void draw_vborder(struct fnc_view *view) { const struct fnc_view *view_above; char *codeset = nl_langinfo(CODESET); PANEL *panel; if (view->parent) draw_vborder(view->parent); panel = panel_above(view->panel); if (panel == NULL) return; view_above = panel_userptr(panel); mvwvline(view->window, view->start_ln, view_above->start_col - 1, (strcmp(codeset, "UTF-8") == 0) ? ACS_VLINE : '|', view->nlines); #ifdef __linux__ wnoutrefresh(view->window); #endif } static int diff_input_handler(struct fnc_view **new_view, struct fnc_view *view, int ch) { struct fnc_view *branch_view; struct fnc_diff_view_state *s = &view->state.diff; struct fnc_tl_view_state *tlstate; struct commit_entry *previous_selection; char *line = NULL; ssize_t linelen; size_t linesz = 0; int i, rc = 0; bool tl_down = false; switch (ch) { case KEY_DOWN: case 'j': if (!s->eof) ++s->first_line_onscreen; break; case KEY_NPAGE: case CTRL('f'): case ' ': if (s->eof) break; i = 0; while (!s->eof && i++ < view->nlines - 1) { linelen = getline(&line, &linesz, s->f); ++s->first_line_onscreen; if (linelen == -1) { if (feof(s->f)) s->eof = true; else RC(ferror(s->f) ? fsl_errno_to_rc(errno, FSL_RC_IO) : FSL_RC_IO, "%s", "getline"); break; } } free(line); break; case KEY_END: case 'G': if (s->eof) break; s->first_line_onscreen = (s->nlines - view->nlines) + 2; s->eof = true; break; case KEY_UP: case 'k': if (s->first_line_onscreen > 1) --s->first_line_onscreen; break; case KEY_PPAGE: case CTRL('b'): if (s->first_line_onscreen == 1) break; i = 0; while (i++ < view->nlines - 1 && s->first_line_onscreen > 1) --s->first_line_onscreen; break; case 'g': if (!fnc_home(view)) break; /* FALL THROUGH */ case KEY_HOME: s->first_line_onscreen = 1; break; case 'b': { int start_col = 0; if (view_is_parent(view)) start_col = view_split_start_col(view->start_col); branch_view = view_open(view->nlines, view->ncols, view->start_ln, start_col, FNC_VIEW_BRANCH); |
︙ | ︙ | |||
5965 5966 5967 5968 5969 5970 5971 | case 'c': case 'i': case 'v': case 'w': if (ch == 'c') s->colour = !s->colour; if (ch == 'i') | | | | > > > | > | > > > > > > | | > | 5245 5246 5247 5248 5249 5250 5251 5252 5253 5254 5255 5256 5257 5258 5259 5260 5261 5262 5263 5264 5265 5266 5267 5268 5269 5270 5271 5272 5273 5274 5275 5276 5277 5278 5279 5280 5281 5282 5283 5284 5285 5286 5287 5288 | case 'c': case 'i': case 'v': case 'w': if (ch == 'c') s->colour = !s->colour; if (ch == 'i') s->diff_flags ^= FSL_DIFF_INVERT; if (ch == 'v') s->diff_flags ^= FSL_DIFF_VERBOSE; if (ch == 'w') s->diff_flags ^= FSL_DIFF_IGNORE_ALLWS; wclear(view->window); s->first_line_onscreen = 1; s->last_line_onscreen = view->nlines; show_diff_status(view); rc = create_diff(s); break; case '-': case '_': if (s->context > 0) { --s->context; show_diff_status(view); rc = create_diff(s); if (s->first_line_onscreen + view->nlines - 1 > (int)s->nlines) { s->first_line_onscreen = 1; s->last_line_onscreen = view->nlines; } } break; case '+': case '=': if (s->context < DIFF_MAX_CTXT) { ++s->context; show_diff_status(view); rc = create_diff(s); } break; case CTRL('j'): case '>': case '.': case 'J': tl_down = true; |
︙ | ︙ | |||
6011 6012 6013 6014 6015 6016 6017 | if (previous_selection == tlstate->selected_commit) break; if ((rc = set_selected_commit(s, tlstate->selected_commit))) break; | < < < < < < | < < | < < | < < < < < | | < < | < < < < < < < | < < | < | < < < < < < < < < < | | > | > | < | | < < < | < < < | | | | | | | | | | | | < < < < < < < < < < < < < < < < < < < < < < | < < < < > | < | < | | > < | > | > | | < < < | < < < < < | | | < < < < < < < < < < > > < < < < < < < < < < < < | | | 5302 5303 5304 5305 5306 5307 5308 5309 5310 5311 5312 5313 5314 5315 5316 5317 5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337 5338 5339 5340 5341 5342 5343 5344 5345 5346 5347 5348 5349 5350 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364 5365 5366 5367 5368 5369 5370 5371 5372 5373 5374 5375 5376 5377 5378 5379 5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392 5393 5394 5395 5396 5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423 5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450 5451 5452 5453 5454 5455 5456 5457 5458 5459 | if (previous_selection == tlstate->selected_commit) break; if ((rc = set_selected_commit(s, tlstate->selected_commit))) break; s->first_line_onscreen = 1; s->last_line_onscreen = view->nlines; show_diff_status(view); rc = create_diff(s); break; default: break; } return rc; } static int set_selected_commit(struct fnc_diff_view_state *s, struct commit_entry *entry) { fsl_free(s->id2); s->id2 = fsl_strdup(entry->commit->uuid); if (s->id2 == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_strdup"); fsl_free(s->id1); s->id1 = entry->commit->puuid ? fsl_strdup(entry->commit->puuid) : NULL; s->selected_commit = entry->commit; return 0; } static int diff_search_init(struct fnc_view *view) { struct fnc_diff_view_state *s = &view->state.diff; s->matched_line = 0; return 0; } static int diff_search_next(struct fnc_view *view) { struct fnc_diff_view_state *s = &view->state.diff; char *line = NULL; ssize_t linelen; size_t linesz = 0; int start_ln; if (view->searching == SEARCH_DONE) { view->search_status = SEARCH_CONTINUE; return 0; } if (s->matched_line) { if (view->searching == SEARCH_FORWARD) start_ln = s->matched_line + 1; else start_ln = s->matched_line - 1; } else { if (view->searching == SEARCH_FORWARD) start_ln = 1; else start_ln = s->nlines; } while (1) { off_t offset; if (start_ln <= 0 || start_ln > (int)s->nlines) { if (s->matched_line == 0) { view->search_status = SEARCH_CONTINUE; break; } if (view->searching == SEARCH_FORWARD) start_ln = 1; else start_ln = s->nlines; } offset = s->line_offsets[start_ln - 1]; if (fseeko(s->f, offset, SEEK_SET) != 0) { free(line); return RC(fsl_errno_to_rc(errno, FSL_RC_IO), "%s", "fseeko"); } linelen = getline(&line, &linesz, s->f); if (linelen != -1 && regexec(&view->regex, line, 1, &view->regmatch, 0) == 0) { view->search_status = SEARCH_CONTINUE; s->matched_line = start_ln; break; } if (view->searching == SEARCH_FORWARD) ++start_ln; else --start_ln; } free(line); if (s->matched_line) { s->first_line_onscreen = s->matched_line; s->current_line = 1; } return 0; } static int close_diff_view(struct fnc_view *view) { struct fnc_diff_view_state *s = &view->state.diff; int rc = 0; if (s->f && fclose(s->f) == EOF) rc = RC(fsl_errno_to_rc(errno, FSL_RC_IO), "%s", "fclose"); fsl_free(s->id1); s->id1 = NULL; fsl_free(s->id2); s->id2 = NULL; fsl_free(s->line_offsets); free_colours(&s->colours); s->line_offsets = NULL; s->nlines = 0; return rc; } static void fnc_resizeterm(void) { struct winsize size; int cols, lines; if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) { cols = 80; lines = 24; } else { cols = size.ws_col; lines = size.ws_row; } resize_term(lines, cols); } static int view_resize(struct fnc_view *view) { int nlines, ncols; if (view->lines > LINES) nlines = view->nlines - (view->lines - LINES); else nlines = view->nlines + (LINES - view->lines); if (view->cols > COLS) |
︙ | ︙ | |||
6272 6273 6274 6275 6276 6277 6278 | wclear(view->window); view->nlines = nlines; view->ncols = ncols; view->lines = LINES; view->cols = COLS; | | | | | | < < | > | 5468 5469 5470 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 5486 5487 5488 5489 5490 5491 5492 5493 5494 5495 5496 5497 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507 5508 5509 5510 5511 5512 5513 | wclear(view->window); view->nlines = nlines; view->ncols = ncols; view->lines = LINES; view->cols = COLS; if (view->child) { view->child->start_col = view_split_start_col(view->start_col); if (view->child->start_col == 0) { make_fullscreen(view->child); if (view->child->active) show_panel(view->child->panel); else show_panel(view->panel); } else { make_splitscreen(view->child); show_panel(view->child->panel); } } return 0; } /* * Consume repeatable arguments containing artifact type values used in * constructing the SQL query to generate commit records of the specified type * for the timeline. n.b. filter_types->values is owned by fcli—do not free. * TODO: Enhance to generalise processing of various repeatable args--paths, * usernames, branches, etc.--so we can filter on multiples of these values. */ static int fcli_flag_type_arg_cb(fcli_cliflag const *v) { struct artifact_types *ft = &fnc_init.filter_types; const char *t = *((const char **)v->flagValue); if (*t != 'e' && *t != 'f' && *t != 'g' && *t != 't' && *t != 'w' && fsl_strcmp(t, "ci")) { fnc_init.err = RC(FSL_RC_TYPE, "invalid type: %s", t); usage(); /* NOT REACHED */ } ft->values = fsl_realloc(ft->values, (ft->nitems + 1) * sizeof(char *)); ft->values[ft->nitems++] = t; |
︙ | ︙ | |||
6390 6391 6392 6393 6394 6395 6396 | exit(fcli_end_of_main(fnc_init.err)); } static void usage_timeline(void) { fsl_fprintf(fnc_init.err ? stderr : stdout, | | | | | | | < | | | < | | < | 5585 5586 5587 5588 5589 5590 5591 5592 5593 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 5604 5605 5606 5607 5608 5609 5610 5611 5612 5613 5614 5615 5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 5628 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638 5639 5640 5641 5642 5643 5644 5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 5656 5657 5658 5659 5660 5661 5662 5663 5664 5665 5666 5667 5668 5669 | exit(fcli_end_of_main(fnc_init.err)); } static void usage_timeline(void) { fsl_fprintf(fnc_init.err ? stderr : stdout, " usage: %s timeline [-C|--no-colour] [-T tag] [-b branch] " "[-c commit] [-f glob] [-h|--help] [-n n] [-t type] [-u user] " "[-z|--utc] [path]\n" " e.g.: %s timeline --type ci -u jimmy src/frobnitz.c\n\n", fcli_progname(), fcli_progname()); } static void usage_diff(void) { fsl_fprintf(fnc_init.err ? stderr : stdout, " usage: %s diff [-C|--no-colour] [-h|--help] [-i|--invert]" " [-q|--quiet] [-w|--whitespace] [-x|--context n] " "[artifact1 [artifact2]] [path ...]\n " "e.g.: %s diff --context 3 d34db33f c0ff33 src/*.c\n\n", fcli_progname(), fcli_progname()); } static void usage_tree(void) { fsl_fprintf(fnc_init.err ? stderr : stdout, " usage: %s tree [-C|--no-colour] [-c commit] [-h|--help] [path]\n" " e.g.: %s tree -c d34dc0d3\n\n" , fcli_progname(), fcli_progname()); } static void usage_blame(void) { fsl_fprintf(fnc_init.err ? stderr : stdout, " usage: %s blame [-C|--no-colour] [-c commit [-r]] [-h|--help] " "[-n n] path\n" " e.g.: %s blame -c d34db33f src/foo.c\n\n" , fcli_progname(), fcli_progname()); } static void usage_branch(void) { fsl_fprintf(fnc_init.err ? stderr : stdout, " usage: %s branch [-C|--no-colour] [-a|--after date] " "[-b|--before date] [-c|--closed] [-h|--help] [-o|--open] " "[-p|--no-private] [-r|--reverse] [-s|--sort order] [glob]\n" " e.g.: %s branch -b 2020-10-10\n\n" , fcli_progname(), fcli_progname()); } static void usage_config(void) { fsl_fprintf(fnc_init.err ? stderr : stdout, " usage: %s config [-h|--help] [--ls] [setting [value|--unset]]\n" " e.g.: %s config FNC_DIFF_COMMIT blue\n\n" , fcli_progname(), fcli_progname()); } static int cmd_diff(fcli_command const *argv) { fsl_cx *const f = fcli_cx(); struct fnc_view *view; struct fnc_commit_artifact *commit = NULL; struct fnc_pathlist_head paths; struct fnc_pathlist_entry *pe; fsl_deck d = fsl_deck_empty; fsl_stmt *q = NULL; const char *artifact1 = NULL, *artifact2 = NULL; char *path0 = NULL; fsl_id_t prid = -1, rid = -1; int context = DIFF_DEF_CTXT, rc = 0; unsigned short blob = 0; enum fnc_diff_type diff_type = FNC_DIFF_CKOUT; bool showmeta = false; rc = fcli_process_flags(argv->flags); if (rc || (rc = fcli_has_unused_flags(false))) return rc; |
︙ | ︙ | |||
6607 6608 6609 6610 6611 6612 6613 | commit->type = fsl_strdup("blob"); commit->diff_type = diff_type; } rc = init_curses(); if (rc) goto end; | < < < < < < | | 5799 5800 5801 5802 5803 5804 5805 5806 5807 5808 5809 5810 5811 5812 5813 5814 5815 5816 5817 5818 | commit->type = fsl_strdup("blob"); commit->diff_type = diff_type; } rc = init_curses(); if (rc) goto end; if (fnc_init.context) { if ((rc = strtonumcheck(&context, fnc_init.context, INT_MIN, INT_MAX))) goto end; context = MIN(DIFF_MAX_CTXT, context); } view = view_open(0, 0, 0, 0, FNC_VIEW_DIFF); if (view == NULL) { rc = RC(FSL_RC_ERROR, "%s", "view_open"); goto end; } |
︙ | ︙ | |||
6644 6645 6646 6647 6648 6649 6650 | TAILQ_FOREACH(pe, &paths, entry) free((char *)pe->path); fnc_pathlist_free(&paths); return rc; } static int | | | | 5830 5831 5832 5833 5834 5835 5836 5837 5838 5839 5840 5841 5842 5843 5844 5845 5846 5847 5848 5849 5850 | TAILQ_FOREACH(pe, &paths, entry) free((char *)pe->path); fnc_pathlist_free(&paths); return rc; } static int browse_commit_tree(struct fnc_view **new_view, int start_col, struct commit_entry *entry, const char *path) { struct fnc_view *tree_view; int rc = 0; tree_view = view_open(0, 0, 0, start_col, FNC_VIEW_TREE); if (tree_view == NULL) return RC(FSL_RC_ERROR, "%s", "view_open"); rc = open_tree_view(tree_view, path, entry->commit->rid); if (rc) return rc; |
︙ | ︙ | |||
6719 6720 6721 6722 6723 6724 6725 | fcli_progname()); goto end; } rc = init_curses(); if (rc) goto end; | < < < < < < | 5905 5906 5907 5908 5909 5910 5911 5912 5913 5914 5915 5916 5917 5918 | fcli_progname()); goto end; } rc = init_curses(); if (rc) goto end; view = view_open(0, 0, 0, 0, FNC_VIEW_TREE); if (view == NULL) { RC(FSL_RC_ERROR, "%s", "view_open"); goto end; } |
︙ | ︙ | |||
6801 6802 6803 6804 6805 6806 6807 | if (rc) goto end; } view->show = show_tree_view; view->input = tree_input_handler; view->close = close_tree_view; | | | | 5981 5982 5983 5984 5985 5986 5987 5988 5989 5990 5991 5992 5993 5994 5995 5996 | if (rc) goto end; } view->show = show_tree_view; view->input = tree_input_handler; view->close = close_tree_view; view->search_init = tree_search_init; view->search_next = tree_search_next; end: if (rc) close_tree_view(view); return rc; } /* |
︙ | ︙ | |||
6909 6910 6911 6912 6913 6914 6915 | memset(ptr, 0, sizeof(struct fnc_repository_tree)); rc = fsl_deck_load_rid(f, &d, rid, FSL_SATYPE_CHECKIN); if (rc) return RC(rc, "fsl_deck_load_rid(%d) [%s]", rid, id); rc = fsl_deck_F_rewind(&d); if (rc) | | | | < > | 6089 6090 6091 6092 6093 6094 6095 6096 6097 6098 6099 6100 6101 6102 6103 6104 6105 6106 6107 6108 6109 6110 6111 6112 6113 6114 6115 6116 6117 6118 6119 6120 6121 6122 6123 6124 6125 6126 6127 6128 6129 6130 6131 6132 6133 6134 | memset(ptr, 0, sizeof(struct fnc_repository_tree)); rc = fsl_deck_load_rid(f, &d, rid, FSL_SATYPE_CHECKIN); if (rc) return RC(rc, "fsl_deck_load_rid(%d) [%s]", rid, id); rc = fsl_deck_F_rewind(&d); if (rc) goto end;; rc = fsl_deck_F_next(&d, &cf); if (rc) goto end;; while (cf) { char *filename = NULL, *uuid = NULL; fsl_time_t mtime; filename = fsl_strdup(cf->name); if (filename == NULL) { rc = RC(FSL_RC_ERROR, "%s", "fsl_strdup"); goto end; } uuid = fsl_strdup(cf->uuid); if (uuid == NULL) { rc = RC(FSL_RC_ERROR, "%s", "fsl_strdup"); goto end; } rc = fsl_mtime_of_F_card(f, rid, cf, &mtime); if (!rc) rc = link_tree_node(ptr, filename, uuid, mtime); fsl_free(filename); fsl_free(uuid); if (!rc) rc = fsl_deck_F_next(&d, &cf); if (rc) goto end; } end: fsl_deck_finalize(&d); *repo = ptr; return rc; } /* * This routine constructs the (sub)trees that are displayed. The directory dir * and its contents form a subtree, which is an array of tree entries copied |
︙ | ︙ | |||
7042 7043 7044 7045 7046 7047 7048 | * path The repository relative pathname of the versioned file * uuid The SHA hash of the file * mtime Modification time of the file * Returns 0 on success, non-zero on error. */ static int link_tree_node(struct fnc_repository_tree *tree, const char *path, | | | 6222 6223 6224 6225 6226 6227 6228 6229 6230 6231 6232 6233 6234 6235 6236 | * path The repository relative pathname of the versioned file * uuid The SHA hash of the file * mtime Modification time of the file * Returns 0 on success, non-zero on error. */ static int link_tree_node(struct fnc_repository_tree *tree, const char *path, const char *uuid, fsl_time_t mtime) { struct fnc_repo_tree_node *parent_dir; fsl_buffer buf = fsl_buffer_empty; struct stat s; int i, rc = 0; parent_dir = tree->tail; |
︙ | ︙ | |||
7158 7159 7160 7161 7162 7163 7164 | rc = tree_entry_path(&treepath, &s->parents, NULL); if (rc) return rc; rc = draw_tree(view, treepath); fsl_free(treepath); | | | 6338 6339 6340 6341 6342 6343 6344 6345 6346 6347 6348 6349 6350 6351 6352 | rc = tree_entry_path(&treepath, &s->parents, NULL); if (rc) return rc; rc = draw_tree(view, treepath); fsl_free(treepath); draw_vborder(view); return rc; } /* * Construct absolute repository path of the currently selected tree entry to * display in the tree view header, or pass to open_timeline_view() to construct |
︙ | ︙ | |||
7241 7242 7243 7244 7245 7246 7247 | static int draw_tree(struct fnc_view *view, const char *treepath) { struct fnc_tree_view_state *s = &view->state.tree; struct fnc_tree_entry *te; struct fnc_colour *c = NULL; wchar_t *wcstr; | | | < | 6421 6422 6423 6424 6425 6426 6427 6428 6429 6430 6431 6432 6433 6434 6435 6436 6437 6438 6439 6440 6441 6442 6443 6444 6445 6446 | static int draw_tree(struct fnc_view *view, const char *treepath) { struct fnc_tree_view_state *s = &view->state.tree; struct fnc_tree_entry *te; struct fnc_colour *c = NULL; wchar_t *wcstr; int rc = 0; int wstrlen, n, idx, nentries; int limit = view->nlines; uint_fast8_t hashlen = FSL_UUID_STRLEN_MIN; s->ndisplayed = 0; werase(view->window); if (limit == 0) return rc; /* Write (highlighted) headline (if view is active in splitscreen). */ rc = formatln(&wcstr, &wstrlen, s->tree_label, view->ncols, 0); if (rc) return rc; if (screen_is_shared(view)) wattron(view->window, A_REVERSE); if (s->colour) c = get_colour(&s->colours, FNC_COLOUR_COMMIT); if (c) |
︙ | ︙ | |||
7277 7278 7279 7280 7281 7282 7283 | wattroff(view->window, A_REVERSE); fsl_free(wcstr); wcstr = NULL; if (--limit <= 0) return rc; /* Write this (sub)tree's absolute repository path subheader. */ | | > | | > | < | < | 6456 6457 6458 6459 6460 6461 6462 6463 6464 6465 6466 6467 6468 6469 6470 6471 6472 6473 6474 6475 6476 6477 6478 6479 6480 6481 6482 6483 6484 6485 6486 6487 6488 6489 6490 6491 6492 6493 6494 6495 6496 6497 6498 6499 6500 6501 6502 6503 6504 6505 6506 6507 6508 6509 6510 6511 6512 6513 6514 6515 6516 6517 6518 6519 6520 6521 6522 6523 6524 6525 6526 | wattroff(view->window, A_REVERSE); fsl_free(wcstr); wcstr = NULL; if (--limit <= 0) return rc; /* Write this (sub)tree's absolute repository path subheader. */ rc = formatln(&wcstr, &wstrlen, treepath, view->ncols, 0); if (rc) return rc; waddwstr(view->window, wcstr); fsl_free(wcstr); wcstr = NULL; if (wstrlen < view->ncols - 1) waddch(view->window, '\n'); if (--limit <= 0) return rc; waddch(view->window, '\n'); if (--limit <= 0) return rc; /* Write parent dir entry (i.e., "..") if top of the tree is in view. */ if (s->first_entry_onscreen == NULL) { te = &s->tree->entries[0]; if (s->selected_idx == 0) { if (view->active) wattr_on(view->window, A_REVERSE, NULL); s->selected_entry = NULL; } waddstr(view->window, " ..\n"); if (s->selected_idx == 0 && view->active) wattr_off(view->window, A_REVERSE, NULL); ++s->ndisplayed; if (--limit <= 0) return rc; n = 1; } else { n = 0; te = s->first_entry_onscreen; } nentries = s->tree->nentries; for (idx = 0; idx < nentries; ++idx) /* Find max hash length. */ if (hashlen < fsl_strlen(s->tree->entries[idx].uuid)) hashlen = fsl_strlen(s->tree->entries[idx].uuid); /* Iterate and write tree nodes postfixed with path type identifier. */ for (idx = te->idx; idx < nentries; ++idx) { char *line = NULL, *idstr = NULL, *targetlnk = NULL; const char *modestr = ""; mode_t mode; if (idx < 0 || idx >= s->tree->nentries) return 0; te = &s->tree->entries[idx]; mode = te->mode; if (s->show_id) { idstr = fsl_strdup(te->uuid); /* Directories don't have UUIDs; pad with "..." dots. */ if (idstr == NULL && !S_ISDIR(mode)) return RC(FSL_RC_ERROR, "%s", "fsl_strdup"); /* If needed, pad SHA1 hash to align w/ SHA3 hashes. */ if (idstr == NULL || fsl_strlen(idstr) < hashlen) { char buf[hashlen], pad = '.'; idstr = fsl_mprintf("%s%s", idstr ? idstr : "", (char *)memset(buf, pad, hashlen - fsl_strlen(idstr))); if (idstr == NULL) return RC(FSL_RC_RANGE, "%s", "fsl_mprintf"); idstr[hashlen] = '\0'; |
︙ | ︙ | |||
7362 7363 7364 7365 7366 7367 7368 | } modestr = "@"; } else if (S_ISDIR(mode)) modestr = "/"; else if (mode & S_IXUSR) modestr = "*"; | < < < < < < < | < | | | | < | > | > | > | | | | 6541 6542 6543 6544 6545 6546 6547 6548 6549 6550 6551 6552 6553 6554 6555 6556 6557 6558 6559 6560 6561 6562 6563 6564 6565 6566 6567 6568 6569 6570 6571 6572 6573 6574 6575 6576 6577 6578 6579 6580 6581 6582 6583 | } modestr = "@"; } else if (S_ISDIR(mode)) modestr = "/"; else if (mode & S_IXUSR) modestr = "*"; if ((line = fsl_mprintf("%s %s%s%s%s", idstr ? idstr : "", te->basename, modestr, targetlnk ? " -> ": "", targetlnk ? targetlnk : "")) == NULL) { fsl_free(idstr); fsl_free(targetlnk); return RC(FSL_RC_RANGE, "%s", "fsl_mprintf"); } fsl_free(idstr); fsl_free(targetlnk); rc = formatln(&wcstr, &wstrlen, line, view->ncols, 0); if (rc) { fsl_free(line); break; } if (n == s->selected_idx) { if (view->active) wattr_on(view->window, A_REVERSE, NULL); s->selected_entry = te; } if (s->colour) c = match_colour(&s->colours, line); if (c) wattr_on(view->window, COLOR_PAIR(c->scheme), NULL); waddwstr(view->window, wcstr); if (c) wattr_off(view->window, COLOR_PAIR(c->scheme), NULL); if (wstrlen < view->ncols - 1) waddch(view->window, '\n'); if (n == s->selected_idx && view->active) wattr_off(view->window, A_REVERSE, NULL); fsl_free(line); fsl_free(wcstr); wcstr = NULL; ++n; ++s->ndisplayed; s->last_entry_onscreen = te; |
︙ | ︙ | |||
7474 7475 7476 7477 7478 7479 7480 7481 | } static int tree_input_handler(struct fnc_view **new_view, struct fnc_view *view, int ch) { struct fnc_view *branch_view, *timeline_view; struct fnc_tree_view_state *s = &view->state.tree; struct fnc_tree_entry *te; | > | < > > < < < | 6647 6648 6649 6650 6651 6652 6653 6654 6655 6656 6657 6658 6659 6660 6661 6662 6663 6664 6665 6666 6667 6668 6669 6670 6671 6672 6673 6674 6675 6676 6677 6678 6679 6680 6681 6682 6683 6684 6685 6686 6687 6688 6689 6690 6691 6692 6693 6694 | } static int tree_input_handler(struct fnc_view **new_view, struct fnc_view *view, int ch) { struct fnc_view *branch_view, *timeline_view; struct fnc_tree_view_state *s = &view->state.tree; struct fnc_tl_thread_cx *tcx = NULL; struct fnc_tree_entry *te; int n, start_col = 0, rc = 0; switch (ch) { case 'b': if (view_is_parent(view)) start_col = view_split_start_col(view->start_col); branch_view = view_open(view->nlines, view->ncols, view->start_ln, start_col, FNC_VIEW_BRANCH); if (branch_view == NULL) return RC(FSL_RC_ERROR, "%s", "view_open"); rc = open_branch_view(branch_view, BRANCH_LS_OPEN_CLOSED, NULL, 0, 0); if (rc) { view_close(branch_view); return rc; } tcx = fcli_cx()->clientState.state; tcx->needs_reset = true; view->active = false; branch_view->active = true; if (view_is_parent(view)) { rc = view_close_child(view); if (rc) return rc; view_set_child(view, branch_view); view->focus_child = true; } else *new_view = branch_view; break; case 'c': s->colour = !s->colour; break; case 'i': s->show_id = !s->show_id; break; case 't': if (!s->selected_entry) break; if (view_is_parent(view)) |
︙ | ︙ | |||
7560 7561 7562 7563 7564 7565 7566 7567 7568 7569 7570 7571 7572 7573 7574 7575 | } s->first_entry_onscreen = te; te = get_tree_entry(s->tree, te->idx - 1); } if (n > 0) s->selected_idx = n - 1; break; case KEY_DOWN: case 'j': if (s->selected_idx < s->ndisplayed - 1) { ++s->selected_idx; break; } if (get_tree_entry(s->tree, s->last_entry_onscreen->idx + 1) == NULL) break; /* Reached last entry. */ | > > > > > > > > > > > > > > > > > > > | < < < < < < < < < < < | < | < < < < < < < < < < < < < < | 6732 6733 6734 6735 6736 6737 6738 6739 6740 6741 6742 6743 6744 6745 6746 6747 6748 6749 6750 6751 6752 6753 6754 6755 6756 6757 6758 6759 6760 6761 6762 6763 6764 6765 6766 6767 6768 6769 6770 6771 6772 6773 6774 6775 6776 6777 6778 6779 6780 6781 6782 6783 6784 6785 6786 6787 6788 | } s->first_entry_onscreen = te; te = get_tree_entry(s->tree, te->idx - 1); } if (n > 0) s->selected_idx = n - 1; break; case KEY_UP: case 'k': if (s->selected_idx > 0) { --s->selected_idx; break; } tree_scroll_up(s, 1); break; case KEY_PPAGE: case CTRL('b'): if (s->tree == s->root) { if (&s->tree->entries[0] == s->first_entry_onscreen) s->selected_idx = 0; } else { if (s->first_entry_onscreen == NULL) s->selected_idx = 0; } tree_scroll_up(s, MAX(0, view->nlines - 3)); break; case KEY_DOWN: case 'j': if (s->selected_idx < s->ndisplayed - 1) { ++s->selected_idx; break; } if (get_tree_entry(s->tree, s->last_entry_onscreen->idx + 1) == NULL) break; /* Reached last entry. */ tree_scroll_down(s, 1); break; case KEY_NPAGE: case CTRL('f'): if (get_tree_entry(s->tree, s->last_entry_onscreen->idx + 1) == NULL) { /* * When the last entry on screen is the last node in the * tree move cursor to it instead of scrolling the view. */ if (s->selected_idx < s->ndisplayed - 1) s->selected_idx = s->ndisplayed - 1; break; } tree_scroll_down(s, view->nlines - 3); break; case KEY_BACKSPACE: case KEY_ENTER: case KEY_LEFT: case KEY_RIGHT: case '\r': case 'h': |
︙ | ︙ | |||
7637 7638 7639 7640 7641 7642 7643 | TAILQ_REMOVE(&s->parents, parent, entry); fnc_object_tree_close(s->tree); s->tree = parent->tree; s->first_entry_onscreen = parent->first_entry_onscreen; s->selected_entry = parent->selected_entry; s->selected_idx = parent->selected_idx; | < < < | > > > | > > > > > > > > > > > > > > > < < < < < < < < < < < < < < < < < < < < < < < < | 6802 6803 6804 6805 6806 6807 6808 6809 6810 6811 6812 6813 6814 6815 6816 6817 6818 6819 6820 6821 6822 6823 6824 6825 6826 6827 6828 6829 6830 6831 6832 6833 6834 6835 6836 6837 6838 6839 6840 6841 6842 6843 6844 6845 6846 6847 6848 6849 6850 6851 6852 6853 6854 6855 6856 6857 6858 6859 6860 | TAILQ_REMOVE(&s->parents, parent, entry); fnc_object_tree_close(s->tree); s->tree = parent->tree; s->first_entry_onscreen = parent->first_entry_onscreen; s->selected_entry = parent->selected_entry; s->selected_idx = parent->selected_idx; fsl_free(parent); } else if (s->selected_entry != NULL && S_ISDIR(s->selected_entry->mode)) { struct fnc_tree_object *subtree = NULL; rc = tree_builder(s->repo, &subtree, s->selected_entry->path); if (rc) break; rc = visit_subtree(s, subtree); if (rc) { fnc_object_tree_close(subtree); break; } } else if (S_ISREG(s->selected_entry->mode)) { struct fnc_view *blame_view; int start_col = view_is_parent(view) ? view_split_start_col(view->start_col) : 0; rc = blame_tree_entry(&blame_view, start_col, s->selected_entry, &s->parents, s->commit_id); if (rc) break; view->active = false; blame_view->active = true; if (view_is_parent(view)) { rc = view_close_child(view); if (rc) return rc; view_set_child(view, blame_view); view->focus_child = true; } else *new_view = blame_view; } break; case KEY_RESIZE: if (view->nlines >= 4 && s->selected_idx >= view->nlines - 3) s->selected_idx = view->nlines - 4; break; default: break; } return rc; } static int timeline_tree_entry(struct fnc_view **new_view, int start_col, struct fnc_tree_view_state *s) { struct fnc_view *timeline_view; char *path; int rc = 0; |
︙ | ︙ | |||
7741 7742 7743 7744 7745 7746 7747 | break; } s->first_entry_onscreen = te; te = get_tree_entry(s->tree, te->idx - 1); } } | | | < | | | < | | < < | 6897 6898 6899 6900 6901 6902 6903 6904 6905 6906 6907 6908 6909 6910 6911 6912 6913 6914 6915 6916 6917 6918 6919 6920 6921 6922 6923 6924 6925 6926 6927 6928 6929 6930 | break; } s->first_entry_onscreen = te; te = get_tree_entry(s->tree, te->idx - 1); } } static void tree_scroll_down(struct fnc_tree_view_state *s, int maxscroll) { struct fnc_tree_entry *next, *last; int n = 0; if (s->first_entry_onscreen) next = get_tree_entry(s->tree, s->first_entry_onscreen->idx + 1); else next = &s->tree->entries[0]; last = s->last_entry_onscreen; while (next && last && n++ < maxscroll) { last = get_tree_entry(s->tree, last->idx + 1); if (last) { s->first_entry_onscreen = next; next = get_tree_entry(s->tree, next->idx + 1); } } } static int visit_subtree(struct fnc_tree_view_state *s, struct fnc_tree_object *subtree) { struct fnc_parent_tree *parent; |
︙ | ︙ | |||
7789 7790 7791 7792 7793 7794 7795 | s->selected_idx = 0; s->first_entry_onscreen = NULL; return 0; } static int | | | | | > | < | > < | > < < | 6941 6942 6943 6944 6945 6946 6947 6948 6949 6950 6951 6952 6953 6954 6955 6956 6957 6958 6959 6960 6961 6962 6963 6964 6965 6966 6967 6968 6969 6970 6971 6972 6973 6974 6975 6976 6977 6978 6979 6980 6981 6982 6983 6984 6985 6986 6987 6988 6989 6990 6991 6992 6993 6994 6995 6996 6997 6998 6999 7000 7001 7002 7003 7004 7005 7006 7007 7008 7009 7010 7011 7012 7013 7014 7015 7016 7017 7018 7019 7020 | s->selected_idx = 0; s->first_entry_onscreen = NULL; return 0; } static int blame_tree_entry(struct fnc_view **new_view, int start_col, struct fnc_tree_entry *te, struct fnc_parent_trees *parents, fsl_uuid_str commit_id) { struct fnc_view *blame_view; char *path; int rc = 0; *new_view = NULL; rc = tree_entry_path(&path, parents, te); if (rc) return rc; blame_view = view_open(0, 0, 0, start_col, FNC_VIEW_BLAME); if (blame_view == NULL) { rc = RC(FSL_RC_ERROR, "%s", "view_open"); goto end; } rc = open_blame_view(blame_view, path, commit_id, 0, 0); if (rc) view_close(blame_view); else *new_view = blame_view; end: fsl_free(path); return rc; } static int tree_search_init(struct fnc_view *view) { struct fnc_tree_view_state *s = &view->state.tree; s->matched_entry = NULL; return 0; } static int tree_search_next(struct fnc_view *view) { struct fnc_tree_view_state *s = &view->state.tree; struct fnc_tree_entry *te = NULL; int rc = 0; if (view->searching == SEARCH_DONE) { view->search_status = SEARCH_CONTINUE; return rc; } if (s->matched_entry) { if (view->searching == SEARCH_FORWARD) { if (s->selected_entry) te = &s->tree->entries[s->selected_entry->idx + 1]; else te = &s->tree->entries[0]; } else { if (s->selected_entry == NULL) te = &s->tree->entries[s->tree->nentries - 1]; else te = &s->tree->entries[s->selected_entry->idx - 1]; } } else { if (view->searching == SEARCH_FORWARD) te = &s->tree->entries[0]; else te = &s->tree->entries[s->tree->nentries - 1]; } while (1) { |
︙ | ︙ | |||
7881 7882 7883 7884 7885 7886 7887 | if (match_tree_entry(te, &view->regex)) { view->search_status = SEARCH_CONTINUE; s->matched_entry = te; break; } if (view->searching == SEARCH_FORWARD) | | | < < < < < < < < | | < | 7032 7033 7034 7035 7036 7037 7038 7039 7040 7041 7042 7043 7044 7045 7046 7047 7048 7049 7050 7051 7052 7053 | if (match_tree_entry(te, &view->regex)) { view->search_status = SEARCH_CONTINUE; s->matched_entry = te; break; } if (view->searching == SEARCH_FORWARD) te = &s->tree->entries[te->idx + 1]; else te = &s->tree->entries[te->idx - 1]; } if (s->matched_entry) { s->first_entry_onscreen = s->matched_entry; s->selected_idx = 0; } return rc; } static int match_tree_entry(struct fnc_tree_entry *te, regex_t *regex) |
︙ | ︙ | |||
8004 8005 8006 8007 8008 8009 8010 | } fsl_free(repo); } static int cmd_config(const fcli_command *argv) { | | < < < < < < | < < < < < < | | | | | | | | | | | > > > > > > | | | | | > > > > > > | | | > > > > > > > | | 7146 7147 7148 7149 7150 7151 7152 7153 7154 7155 7156 7157 7158 7159 7160 7161 7162 7163 7164 7165 7166 7167 7168 7169 7170 7171 7172 7173 7174 7175 7176 7177 7178 7179 7180 7181 7182 7183 7184 7185 7186 7187 7188 7189 7190 7191 7192 7193 7194 7195 7196 7197 7198 7199 7200 7201 7202 7203 7204 7205 7206 7207 7208 7209 7210 7211 7212 7213 7214 7215 7216 7217 7218 7219 7220 7221 7222 7223 7224 7225 7226 7227 7228 7229 7230 7231 7232 7233 7234 7235 7236 7237 7238 7239 7240 7241 7242 7243 7244 7245 7246 7247 7248 7249 7250 7251 7252 7253 7254 7255 7256 7257 7258 7259 7260 7261 7262 7263 7264 7265 7266 7267 7268 7269 7270 7271 7272 7273 | } fsl_free(repo); } static int cmd_config(const fcli_command *argv) { const char *set = NULL, *value = NULL; int setid, rc = 0; rc = fcli_process_flags(argv->flags); if (rc || (rc = fcli_has_unused_flags(false))) return rc; set = fcli_next_arg(true); if (set == NULL || fnc_init.lsconf) { if (fnc_init.unset) { fnc_init.err = RC(FSL_RC_MISSING_INFO, "%s", "-u|--unset requires <setting>"); usage(); /* NOT REACHED */ } return fnc_conf_ls_settings(fnc_init.lsconf ? false : true); } setid = fnc_conf_str2enum(set); if (!setid) /* Presently, the only valid settings are colours. */ return RC(FSL_RC_NOT_FOUND, "invalid setting: %s", set); value = fcli_next_arg(true); if (value || fnc_init.unset) { if (value && fnc_init.unset) return RC(FSL_RC_MISUSE, "\n--unset or set %s to %s?", set, value); char *prev = fnc_conf_get(setid, true); rc = fnc_conf_set(setid, value, fnc_init.unset); if (!rc) f_out("%s: %s -> %s (local)", fnc_conf_enum2str(setid), prev ? prev : "default", value ? value : "default"); fsl_free(prev); } else { char *v = fnc_conf_get(setid, true); f_out("%s = %s", fnc_conf_enum2str(setid), v ? v : "default"); fsl_free(v); } return rc; } static int fnc_conf_ls_settings(bool all) { static const char *fnc_settings[] = { SETTINGS(GEN_STR) }; enum settings { SETTINGS(GEN_ENUM) }; char *value = NULL; int idx, last = 0; size_t maxlen = 0; for (idx = FNC_START_SETTINGS + 1; idx < FNC_EOF_SETTINGS; ++idx) { last = (value = fnc_conf_get(idx, true)) ? idx : last; maxlen = MAX(fsl_strlen(fnc_settings[idx]), maxlen); fsl_free(value); } if (!last && !all) { f_out("No user-defined settings: " "'%s config' for list of available settings.", fcli_progname()); return 0; } for (idx = FNC_START_SETTINGS + 1; idx < FNC_EOF_SETTINGS; ++idx) { value = fnc_conf_get(idx, true); if (value || all) f_out("%-*s%s%s%c", maxlen + 2, fnc_settings[idx], value ? " = " : "", value ? value : "", all ? (idx + 1 < FNC_EOF_SETTINGS ? '\n' : '\0') : idx < last ? '\n' : '\0'); fsl_free(value); value = NULL; } return 0; } static int fnc_conf_str2enum(const char *str) { static const char *fnc_settings[] = { SETTINGS(GEN_STR) }; enum settings { SETTINGS(GEN_ENUM) }; int idx; for (idx = FNC_START_SETTINGS + 1; idx < FNC_EOF_SETTINGS; ++idx) if (!fsl_stricmp(str, fnc_settings[idx])) return idx; return FNC_START_SETTINGS; } static const char * fnc_conf_enum2str(int id) { static const char *fnc_settings[] = { SETTINGS(GEN_STR) }; enum settings { SETTINGS(GEN_ENUM) }; if (id <= FNC_START_SETTINGS || id >= FNC_EOF_SETTINGS) return NULL; return fnc_settings[id]; } static int view_close_child(struct fnc_view *view) { int rc = 0; |
︙ | ︙ | |||
8132 8133 8134 8135 8136 8137 8138 | } static void view_set_child(struct fnc_view *view, struct fnc_view *child) { view->child = child; child->parent = view; | < < < < < < < < < < | | 7281 7282 7283 7284 7285 7286 7287 7288 7289 7290 7291 7292 7293 7294 7295 7296 7297 7298 7299 7300 | } static void view_set_child(struct fnc_view *view, struct fnc_view *child) { view->child = child; child->parent = view; } static int set_colours(struct fnc_colours *s, enum fnc_view_id vid) { int rc = 0; switch (vid) { case FNC_VIEW_DIFF: { static const char *regexp_diff[] = { "^((checkin|wiki|ticket|technote) " "[0-9a-f]|hash [+-] |\\[[+~>-]] |[+-]{3} )", "^user:", "^date:", "^tags:", "^-", "^\\+", "^@@" |
︙ | ︙ | |||
8223 8224 8225 8226 8227 8228 8229 | nitems(regexp_branch)); break; } default: rc = RC(FSL_RC_TYPE, "invalid fnc_view_id: %s", vid); } | < < | 7362 7363 7364 7365 7366 7367 7368 7369 7370 7371 7372 7373 7374 7375 | nitems(regexp_branch)); break; } default: rc = RC(FSL_RC_TYPE, "invalid fnc_view_id: %s", vid); } return rc; } static int set_colour_scheme(struct fnc_colours *colours, const int (*pairs)[2], const char **regexp, int n) { |
︙ | ︙ | |||
8260 8261 8262 8263 8264 8265 8266 | STAILQ_INSERT_HEAD(colours, colour, entries); } return rc; } static int | | | | 7397 7398 7399 7400 7401 7402 7403 7404 7405 7406 7407 7408 7409 7410 7411 7412 7413 7414 7415 7416 | STAILQ_INSERT_HEAD(colours, colour, entries); } return rc; } static int init_colour(enum fnc_colour_obj id) { char *val = NULL; int rc = 0; val = fnc_conf_get(id, false); if (val == NULL) return default_colour(id); if (!fsl_stricmp(val, "black")) rc = COLOR_BLACK; else if (!fsl_stricmp(val, "red")) |
︙ | ︙ | |||
8302 8303 8304 8305 8306 8307 8308 | * found, return a dynamically allocated string obtained from fsl_db_g_text() or * strdup(), which must be disposed of by the caller. Alternatively, if ls is * set, search local settings and envvars for id. If found, dynamically allocate * and return a formatted string for pretty printing the current state of id, * which the caller must free. In either case, if not found, return NULL. */ static char * | | | | | | | | | | | | | | | | < | | | > | | | > | | | | > | > | | | > | > | > | | > > | | | | < | | 7439 7440 7441 7442 7443 7444 7445 7446 7447 7448 7449 7450 7451 7452 7453 7454 7455 7456 7457 7458 7459 7460 7461 7462 7463 7464 7465 7466 7467 7468 7469 7470 7471 7472 7473 7474 7475 7476 7477 7478 7479 7480 7481 7482 7483 7484 7485 7486 7487 7488 7489 7490 7491 7492 7493 7494 7495 7496 7497 7498 7499 7500 7501 7502 7503 7504 7505 7506 7507 7508 7509 7510 7511 7512 7513 7514 7515 7516 7517 7518 7519 7520 7521 7522 7523 7524 | * found, return a dynamically allocated string obtained from fsl_db_g_text() or * strdup(), which must be disposed of by the caller. Alternatively, if ls is * set, search local settings and envvars for id. If found, dynamically allocate * and return a formatted string for pretty printing the current state of id, * which the caller must free. In either case, if not found, return NULL. */ static char * fnc_conf_get(enum fnc_colour_obj id, bool ls) { fsl_cx *const f = fcli_cx(); fsl_db *db = NULL; char *colour = NULL, *colour_g = NULL; db = fsl_needs_repo(f); if (!db) { /* Theoretically, this shouldn't happen. */ RC(FSL_RC_DB, "%s", "fsl_needs_repo"); return NULL; } colour = fsl_db_g_text(db, NULL, "SELECT value FROM config WHERE name=%Q", fnc_conf_enum2str(id)); if (colour == NULL || ls) colour_g = fsl_strdup(getenv(fnc_conf_enum2str(id))); if (ls && (colour || colour_g)) { char *colour_ls = fsl_mprintf("%s%s%s%s%s", colour ? colour : "", colour ? " (local)" : "", colour && colour_g ? ", " : "", colour_g ? colour_g : "", colour_g ? " (envvar)" : ""); fsl_free(colour); fsl_free(colour_g); colour = colour_ls; } return ls ? colour : (colour ? colour : colour_g); } static int default_colour(enum fnc_colour_obj obj) { if (obj == FNC_COLOUR_COMMIT) return COLOR_GREEN; if (obj == FNC_COLOUR_USER) return COLOR_CYAN; if (obj == FNC_COLOUR_DATE) return COLOR_YELLOW; if (obj == FNC_COLOUR_DIFF_META) return COLOR_GREEN; if (obj == FNC_COLOUR_DIFF_MINUS) return COLOR_MAGENTA; if (obj == FNC_COLOUR_DIFF_PLUS) return COLOR_CYAN; if (obj == FNC_COLOUR_DIFF_CHUNK) return COLOR_YELLOW; if (obj == FNC_COLOUR_DIFF_TAGS) return COLOR_MAGENTA; if (obj == FNC_COLOUR_TREE_LINK) return COLOR_MAGENTA; if (obj == FNC_COLOUR_TREE_DIR) return COLOR_CYAN; if (obj == FNC_COLOUR_TREE_EXEC) return COLOR_GREEN; if (obj == FNC_COLOUR_BRANCH_OPEN) return COLOR_CYAN; if (obj == FNC_COLOUR_BRANCH_CLOSED) return COLOR_MAGENTA; if (obj == FNC_COLOUR_BRANCH_CURRENT) return COLOR_GREEN; if (obj == FNC_COLOUR_BRANCH_PRIVATE) return COLOR_YELLOW; return -1; /* Terminal default foreground colour. */ } static int fnc_conf_set(enum fnc_colour_obj id, const char *val, bool unset) { fsl_cx *const f = fcli_cx(); fsl_db *db = NULL; db = fsl_needs_repo(f); if (!db) /* Theoretically, this shouldn't happen. */ |
︙ | ︙ | |||
8455 8456 8457 8458 8459 8460 8461 | cmd_blame(fcli_command const *argv) { fsl_cx *const f = fcli_cx(); struct fnc_view *view; char *path = NULL; fsl_uuid_str commit_id = NULL; fsl_id_t tip = 0, rid = 0; | | < | 7599 7600 7601 7602 7603 7604 7605 7606 7607 7608 7609 7610 7611 7612 7613 | cmd_blame(fcli_command const *argv) { fsl_cx *const f = fcli_cx(); struct fnc_view *view; char *path = NULL; fsl_uuid_str commit_id = NULL; fsl_id_t tip = 0, rid = 0; int nlimit = 0, rc = 0; rc = fcli_process_flags(argv->flags); if (rc || (rc = fcli_has_unused_flags(false))) goto end; if (!fcli_next_arg(false)) { rc = RC(FSL_RC_MISSING_INFO, "%s blame requires versioned file path", fcli_progname()); |
︙ | ︙ | |||
8495 8496 8497 8498 8499 8500 8501 | rc = fsl_sym_to_rid(f, "tip", FSL_SATYPE_CHECKIN, &tip); if (rc) goto end; } rc = fsl_sym_to_rid(f, fnc_init.sym, FSL_SATYPE_CHECKIN, &rid); if (rc) goto end; | | < < < | < < < < < < < < | 7638 7639 7640 7641 7642 7643 7644 7645 7646 7647 7648 7649 7650 7651 7652 7653 7654 7655 7656 7657 7658 7659 7660 7661 7662 7663 7664 7665 7666 7667 7668 7669 7670 7671 | rc = fsl_sym_to_rid(f, "tip", FSL_SATYPE_CHECKIN, &tip); if (rc) goto end; } rc = fsl_sym_to_rid(f, fnc_init.sym, FSL_SATYPE_CHECKIN, &rid); if (rc) goto end; } else if (!fnc_init.sym) fsl_ckout_version_info(f, &rid, NULL); rc = map_repo_path(&path); if (rc) { if (rc != FSL_RC_NOT_FOUND || !fnc_init.sym) goto end; /* Path may be valid in repository tree of specified commit. */ rc = 0; fcli_err_reset(); } commit_id = fsl_rid_to_uuid(f, rid); if (rc || (path[0] == '/' && path[1] == '\0')) { rc = rc ? rc : RC(FSL_RC_MISSING_INFO, "%s blame requires versioned file path", fcli_progname()); goto end; } init_curses(); view = view_open(0, 0, 0, 0, FNC_VIEW_BLAME); if (view == NULL) { rc = RC(FSL_RC_ERROR, "%s", view_open); goto end; } |
︙ | ︙ | |||
8585 8586 8587 8588 8589 8590 8591 | if (rc) return rc; } view->show = show_blame_view; view->input = blame_input_handler; view->close = close_blame_view; | | | | 7717 7718 7719 7720 7721 7722 7723 7724 7725 7726 7727 7728 7729 7730 7731 7732 | if (rc) return rc; } view->show = show_blame_view; view->input = blame_input_handler; view->close = close_blame_view; view->search_init = blame_search_init; view->search_next = blame_search_next; return run_blame(view); } static int run_blame(struct fnc_view *view) { |
︙ | ︙ | |||
8627 8628 8629 8630 8631 8632 8633 | rc = RC(FSL_RC_NOT_FOUND, "'%s' not found in tree [%s]", filepath, s->blamed_commit->id); goto end; } rc = fsl_card_F_content(f, cf, &buf); if (rc) goto end; | < < < < | 7759 7760 7761 7762 7763 7764 7765 7766 7767 7768 7769 7770 7771 7772 | rc = RC(FSL_RC_NOT_FOUND, "'%s' not found in tree [%s]", filepath, s->blamed_commit->id); goto end; } rc = fsl_card_F_content(f, cf, &buf); if (rc) goto end; /* * We load f with the actual file content to map line offsets so we * accurately find tokens when running a search. */ blame->f = tmpfile(); if (blame->f == NULL) { |
︙ | ︙ | |||
8714 8715 8716 8717 8718 8719 8720 | s->blame_complete = false; if (s->first_line_onscreen + view->nlines - 1 > blame->nlines) { s->first_line_onscreen = 1; s->last_line_onscreen = view->nlines; s->selected_line = 1; } | | < | 7842 7843 7844 7845 7846 7847 7848 7849 7850 7851 7852 7853 7854 7855 7856 | s->blame_complete = false; if (s->first_line_onscreen + view->nlines - 1 > blame->nlines) { s->first_line_onscreen = 1; s->last_line_onscreen = view->nlines; s->selected_line = 1; } end: fsl_free(master); fsl_free(root); fsl_deck_finalize(&d); fsl_buffer_clear(&buf); if (rc) stop_blame(blame); |
︙ | ︙ | |||
8750 8751 8752 8753 8754 8755 8756 | if (filesz) *filesz = 0; if (nlines) *nlines = 0; len = buf->used; if (len == 0) | | | | 7877 7878 7879 7880 7881 7882 7883 7884 7885 7886 7887 7888 7889 7890 7891 7892 | if (filesz) *filesz = 0; if (nlines) *nlines = 0; len = buf->used; if (len == 0) return RC(FSL_RC_SIZE_MISMATCH, "%s", "fnc_dump_buffer_to_file"); if (nlines) { if (line_offsets && *line_offsets == NULL) { *nlines = 1; nalloc = alloc_chunksz; *line_offsets = calloc(nalloc, sizeof(**line_offsets)); if (*line_offsets == NULL) return RC(fsl_errno_to_rc(errno, FSL_RC_ERROR), |
︙ | ︙ | |||
8845 8846 8847 8848 8849 8850 8851 | halfdelay(1); /* Fast refresh while annotating. */ } if (s->blame_complete) cbreak(); /* Return to blocking mode. */ rc = draw_blame(view); | | | 7972 7973 7974 7975 7976 7977 7978 7979 7980 7981 7982 7983 7984 7985 7986 | halfdelay(1); /* Fast refresh while annotating. */ } if (s->blame_complete) cbreak(); /* Return to blocking mode. */ rc = draw_blame(view); draw_vborder(view); return rc; } static void * blame_thread(void *state) { |
︙ | ︙ | |||
8920 8921 8922 8923 8924 8925 8926 | /* -r can return lines with no version, so use root check-in. */ if (opt->originRid && !line->id) { line->id = fsl_strdup(cx->root_commit); line->annotated = true; } | < < | | < | > > > | > | | 8047 8048 8049 8050 8051 8052 8053 8054 8055 8056 8057 8058 8059 8060 8061 8062 8063 8064 8065 8066 8067 8068 8069 8070 8071 8072 8073 8074 8075 8076 8077 8078 8079 8080 8081 8082 8083 8084 8085 8086 8087 8088 8089 8090 8091 8092 8093 8094 8095 8096 8097 8098 8099 8100 8101 | /* -r can return lines with no version, so use root check-in. */ if (opt->originRid && !line->id) { line->id = fsl_strdup(cx->root_commit); line->annotated = true; } ++cx->nlines; end: rc = pthread_mutex_unlock(&fnc_mutex); if (rc) rc = RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_unlock"); return rc; } static int draw_blame(struct fnc_view *view) { struct fnc_blame_view_state *s = &view->state.blame; struct fnc_blame *blame = &s->blame; struct fnc_blame_line *blame_line; regmatch_t *regmatch = &view->regmatch; struct fnc_colour *c = NULL; wchar_t *wcstr; char *line = NULL; fsl_uuid_str prev_id = NULL, id_str = NULL; ssize_t linelen; size_t linesz = 0; int width, lineno = 0, nprinted = 0; int rc = 0; const int idfield = 11; /* Prefix + space. */ id_str = fsl_strdup(s->blamed_commit->id); if (id_str == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_strdup"); rewind(blame->f); werase(view->window); if ((line = fsl_mprintf("checkin %s", id_str)) == NULL) { rc = RC(fsl_errno_to_rc(errno, FSL_RC_ERROR), "%s", "fsl_mprintf"); fsl_free(id_str); return rc; } rc = formatln(&wcstr, &width, line, view->ncols, 0); fsl_free(line); line = NULL; if (rc) return rc; if (screen_is_shared(view)) wattron(view->window, A_REVERSE); if (s->colour) |
︙ | ︙ | |||
8984 8985 8986 8987 8988 8989 8990 | if (screen_is_shared(view)) wattroff(view->window, A_REVERSE); fsl_free(wcstr); wcstr = NULL; if (width < view->ncols - 1) waddch(view->window, '\n'); | | | | > | < < < < | < | < | > | | 8112 8113 8114 8115 8116 8117 8118 8119 8120 8121 8122 8123 8124 8125 8126 8127 8128 8129 8130 8131 8132 8133 8134 8135 8136 8137 8138 8139 8140 8141 8142 8143 8144 8145 8146 8147 8148 8149 8150 8151 8152 8153 8154 8155 8156 8157 8158 8159 8160 8161 8162 8163 8164 8165 8166 8167 8168 | if (screen_is_shared(view)) wattroff(view->window, A_REVERSE); fsl_free(wcstr); wcstr = NULL; if (width < view->ncols - 1) waddch(view->window, '\n'); line = fsl_mprintf("[%d/%d] %s%s%s %c", s->first_line_onscreen - 1 + s->selected_line, blame->nlines, s->blame_complete ? "" : "annotating... ", fnc_init.sym ? "/" : "", s->path, s->blame_complete ? ' ' : SPINNER[s->spin_idx]); if (SPINNER[++s->spin_idx] == '\0') s->spin_idx = 0; fsl_free(id_str); rc = formatln(&wcstr, &width, line, view->ncols, 0); fsl_free(line); line = NULL; if (rc) return rc; waddwstr(view->window, wcstr); fsl_free(wcstr); wcstr = NULL; if (width < view->ncols - 1) waddch(view->window, '\n'); s->eof = false; while (nprinted < view->nlines - 2) { linelen = getline(&line, &linesz, blame->f); if (linelen == -1) { if (feof(blame->f)) { s->eof = true; break; } fsl_free(line); return RC(ferror(blame->f) ? fsl_errno_to_rc(errno, FSL_RC_IO) : FSL_RC_IO, "%s", "getline"); } if (++lineno < s->first_line_onscreen) continue; if (view->active && nprinted == s->selected_line - 1) wattr_on(view->window, A_REVERSE, NULL); if (blame->nlines > 0) { blame_line = &blame->lines[lineno - 1]; if (blame_line->annotated && prev_id && fsl_uuidcmp(prev_id, blame_line->id) == 0 && !(view->active && nprinted == s->selected_line - 1)) { waddstr(view->window, " "); } else if (blame_line->annotated) { char *id_str; id_str = fsl_strndup(blame_line->id, idfield - 1); if (id_str == NULL) { fsl_free(line); |
︙ | ︙ | |||
9058 9059 9060 9061 9062 9063 9064 | COLOR_PAIR(c->scheme), NULL); fsl_free(id_str); prev_id = blame_line->id; } else { waddstr(view->window, ".........."); prev_id = NULL; } | < < < | | | | > | | < | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < | 8182 8183 8184 8185 8186 8187 8188 8189 8190 8191 8192 8193 8194 8195 8196 8197 8198 8199 8200 8201 8202 8203 8204 8205 8206 8207 8208 8209 8210 8211 8212 8213 8214 8215 8216 8217 8218 8219 8220 8221 8222 8223 8224 8225 8226 8227 8228 8229 8230 8231 8232 8233 8234 8235 8236 8237 8238 8239 8240 8241 8242 8243 8244 8245 8246 8247 8248 8249 8250 8251 8252 8253 8254 | COLOR_PAIR(c->scheme), NULL); fsl_free(id_str); prev_id = blame_line->id; } else { waddstr(view->window, ".........."); prev_id = NULL; } } else { waddstr(view->window, ".........."); prev_id = NULL; } if (view->active && nprinted == s->selected_line - 1) wattr_off(view->window, A_REVERSE, NULL); waddstr(view->window, " "); if (view->ncols <= idfield) { width = idfield; wcstr = wcsdup(L""); if (wcstr == NULL) { rc = RC(fsl_errno_to_rc(errno, FSL_RC_RANGE), "%s", "wcsdup"); fsl_free(line); return rc; } } else if (s->first_line_onscreen + nprinted == s->matched_line && regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) { rc = write_matched_line(&width, line, view->ncols - idfield, idfield, view->window, regmatch); if (rc) { fsl_free(line); return rc; } width += idfield; } else { rc = formatln(&wcstr, &width, line, view->ncols - idfield, idfield); waddwstr(view->window, wcstr); fsl_free(wcstr); wcstr = NULL; width += idfield; } if (width <= view->ncols - 1) waddch(view->window, '\n'); if (++nprinted == 1) s->first_line_onscreen = lineno; } fsl_free(line); s->last_line_onscreen = lineno; draw_vborder(view); return rc; } static int blame_input_handler(struct fnc_view **new_view, struct fnc_view *view, int ch) { struct fnc_view *branch_view, *diff_view; struct fnc_blame_view_state *s = &view->state.blame; int start_col = 0, rc = 0; switch (ch) { case 'q': s->done = true; if (s->selected_commit) fnc_commit_artifact_close(s->selected_commit); break; case 'c': s->colour = !s->colour; |
︙ | ︙ | |||
9227 9228 9229 9230 9231 9232 9233 9234 9235 9236 9237 9238 9239 9240 9241 9242 | s->first_line_onscreen = 1; } else { s->selected_line = view->nlines - 2; s->first_line_onscreen = s->blame.nlines - (view->nlines - 3); } break; case KEY_DOWN: case 'j': if (s->selected_line < view->nlines - 2 && s->first_line_onscreen + s->selected_line <= s->blame.nlines) ++s->selected_line; else if (s->last_line_onscreen < s->blame.nlines) ++s->first_line_onscreen; break; | > > > > > > > > > > > > > > > > > > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 8267 8268 8269 8270 8271 8272 8273 8274 8275 8276 8277 8278 8279 8280 8281 8282 8283 8284 8285 8286 8287 8288 8289 8290 8291 8292 8293 8294 8295 8296 8297 8298 8299 8300 8301 8302 8303 8304 8305 8306 8307 | s->first_line_onscreen = 1; } else { s->selected_line = view->nlines - 2; s->first_line_onscreen = s->blame.nlines - (view->nlines - 3); } break; case KEY_UP: case 'k': if (s->selected_line > 1) --s->selected_line; else if (s->selected_line == 1 && s->first_line_onscreen > 1) --s->first_line_onscreen; break; case KEY_PPAGE: case CTRL('b'): if (s->first_line_onscreen == 1) { s->selected_line = 1; break; } if (s->first_line_onscreen > view->nlines - 2) s->first_line_onscreen -= (view->nlines - 2); else s->first_line_onscreen = 1; break; case KEY_DOWN: case 'j': if (s->selected_line < view->nlines - 2 && s->first_line_onscreen + s->selected_line <= s->blame.nlines) ++s->selected_line; else if (s->last_line_onscreen < s->blame.nlines) ++s->first_line_onscreen; break; case 'b': case 'p': { fsl_uuid_cstr id = NULL; id = get_selected_commit_id(s->blame.lines, s->blame.nlines, s->first_line_onscreen, s->selected_line); if (id == NULL) break; |
︙ | ︙ | |||
9324 9325 9326 9327 9328 9329 9330 | if (fsl_deck_F_search(&d, s->path + (fnc_init.sym ? 0 : 1)) == NULL) { char *m = fsl_mprintf("-- %s not in [%.12s] --", s->path + (fnc_init.sym ? 0 : 1), pid); if (m == NULL) rc = RC(FSL_RC_ERROR, "%s", "fsl_mprintf"); | > | > > > > > > | 8331 8332 8333 8334 8335 8336 8337 8338 8339 8340 8341 8342 8343 8344 8345 8346 8347 8348 8349 8350 8351 8352 | if (fsl_deck_F_search(&d, s->path + (fnc_init.sym ? 0 : 1)) == NULL) { char *m = fsl_mprintf("-- %s not in [%.12s] --", s->path + (fnc_init.sym ? 0 : 1), pid); if (m == NULL) rc = RC(FSL_RC_ERROR, "%s", "fsl_mprintf"); wattr_on(view->window, A_BOLD, NULL); mvwaddstr(view->window, view->start_ln + view->nlines - 1, 0, m); wclrtoeol(view->window); wattr_off(view->window, A_BOLD, NULL); update_panels(); doupdate(); sleep(1); fsl_deck_finalize(&d); fsl_free(pid); fsl_free(m); break; } rc = fnc_commit_qid_alloc(&s->blamed_commit, pid); if (rc) |
︙ | ︙ | |||
9425 9426 9427 9428 9429 9430 9431 | start_col = view_split_start_col(view->start_col); diff_view = view_open(0, 0, 0, start_col, FNC_VIEW_DIFF); if (diff_view == NULL) { fnc_commit_artifact_close(commit); rc = RC(FSL_RC_ERROR, "%s", "view_open"); break; } | | | 8439 8440 8441 8442 8443 8444 8445 8446 8447 8448 8449 8450 8451 8452 8453 | start_col = view_split_start_col(view->start_col); diff_view = view_open(0, 0, 0, start_col, FNC_VIEW_DIFF); if (diff_view == NULL) { fnc_commit_artifact_close(commit); rc = RC(FSL_RC_ERROR, "%s", "view_open"); break; } rc = open_diff_view(diff_view, commit, DIFF_DEF_CTXT, fnc_init.ws, fnc_init.invert, !fnc_init.quiet, NULL, true, NULL); s->selected_commit = commit; if (rc) { fnc_commit_artifact_close(commit); view_close(diff_view); break; |
︙ | ︙ | |||
9448 9449 9450 9451 9452 9453 9454 9455 9456 9457 9458 9459 9460 9461 9462 9463 9464 9465 9466 | view->focus_child = true; } else *new_view = diff_view; if (rc) break; break; } case KEY_RESIZE: if (s->selected_line > view->nlines - 2) { s->selected_line = MIN(s->blame.nlines, view->nlines - 2); } break; default: break; } return rc; } | > > > > > > > > > > > > > > > > > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 8462 8463 8464 8465 8466 8467 8468 8469 8470 8471 8472 8473 8474 8475 8476 8477 8478 8479 8480 8481 8482 8483 8484 8485 8486 8487 8488 8489 8490 8491 8492 8493 8494 8495 8496 8497 8498 8499 8500 8501 8502 8503 8504 8505 8506 8507 8508 8509 8510 8511 8512 8513 8514 8515 8516 8517 8518 8519 8520 8521 8522 8523 8524 8525 8526 8527 8528 8529 8530 8531 8532 8533 8534 8535 8536 8537 8538 8539 8540 8541 8542 8543 8544 8545 8546 8547 8548 8549 8550 8551 8552 8553 8554 8555 8556 8557 8558 8559 8560 8561 8562 8563 8564 8565 8566 8567 8568 8569 8570 8571 8572 8573 8574 8575 8576 8577 8578 8579 8580 8581 | view->focus_child = true; } else *new_view = diff_view; if (rc) break; break; } case KEY_NPAGE: case CTRL('f'): case ' ': if (s->last_line_onscreen >= s->blame.nlines && s->selected_line >= MIN(s->blame.nlines, view->nlines - 2)) break; if (s->last_line_onscreen >= s->blame.nlines && s->selected_line < view->nlines - 2) { s->selected_line = MIN(s->blame.nlines, view->nlines - 2); break; } if (s->last_line_onscreen + view->nlines - 2 <= s->blame.nlines) s->first_line_onscreen += view->nlines - 2; else s->first_line_onscreen = s->blame.nlines - (view->nlines - 3); break; case KEY_RESIZE: if (s->selected_line > view->nlines - 2) { s->selected_line = MIN(s->blame.nlines, view->nlines - 2); } break; default: break; } return rc; } static int blame_search_init(struct fnc_view *view) { struct fnc_blame_view_state *s = &view->state.blame; s->matched_line = 0; return 0; } static int blame_search_next(struct fnc_view *view) { struct fnc_blame_view_state *s = &view->state.blame; char *line = NULL; ssize_t linelen; size_t linesz = 0; int lineno; if (view->searching == SEARCH_DONE) { view->search_status = SEARCH_CONTINUE; return 0; } if (s->matched_line) { if (view->searching == SEARCH_FORWARD) lineno = s->matched_line + 1; else lineno = s->matched_line - 1; } else { if (view->searching == SEARCH_FORWARD) lineno = 1; else lineno = s->blame.nlines; } while (1) { off_t offset; if (lineno <= 0 || lineno > s->blame.nlines) { if (s->matched_line == 0) { view->search_status = SEARCH_CONTINUE; break; } if (view->searching == SEARCH_FORWARD) lineno = 1; else lineno = s->blame.nlines; } offset = s->blame.line_offsets[lineno - 1]; if (fseeko(s->blame.f, offset, SEEK_SET) != 0) { fsl_free(line); return RC(fsl_errno_to_rc(errno, FSL_RC_IO), "%s", "fseeko"); } linelen = getline(&line, &linesz, s->blame.f); if (linelen != -1 && regexec(&view->regex, line, 1, &view->regmatch, 0) == 0) { view->search_status = SEARCH_CONTINUE; s->matched_line = lineno; break; } if (view->searching == SEARCH_FORWARD) ++lineno; else --lineno; } fsl_free(line); if (s->matched_line) { s->first_line_onscreen = s->matched_line; s->selected_line = 1; } return 0; } static fsl_uuid_cstr get_selected_commit_id(struct fnc_blame_line *lines, int nlines, int first_line_onscreen, int selected_line) { struct fnc_blame_line *line; |
︙ | ︙ | |||
9528 9529 9530 9531 9532 9533 9534 | static int stop_blame(struct fnc_blame *blame) { int idx, rc = 0; if (blame->thread_id) { | | | 8630 8631 8632 8633 8634 8635 8636 8637 8638 8639 8640 8641 8642 8643 8644 | static int stop_blame(struct fnc_blame *blame) { int idx, rc = 0; if (blame->thread_id) { int retval; rc = pthread_mutex_unlock(&fnc_mutex); if (rc) return RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_unlock"); rc = pthread_join(blame->thread_id, (void **)&retval); if (rc) return RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), |
︙ | ︙ | |||
9646 9647 9648 9649 9650 9651 9652 | when = fnc_init.after ? 1 : -1; rc = fnc_date_to_mtime(&dateline, d, when); if (rc) return rc; } glob = fsl_strdup(fcli_next_arg(true)); | | < < < < < < < < < | > > | > > | | | | < < | 8748 8749 8750 8751 8752 8753 8754 8755 8756 8757 8758 8759 8760 8761 8762 8763 8764 8765 8766 8767 8768 8769 8770 8771 8772 8773 8774 8775 8776 8777 8778 8779 8780 8781 8782 8783 8784 8785 8786 8787 8788 8789 8790 8791 8792 8793 8794 8795 8796 8797 8798 8799 8800 8801 8802 8803 8804 8805 8806 8807 8808 8809 8810 | when = fnc_init.after ? 1 : -1; rc = fnc_date_to_mtime(&dateline, d, when); if (rc) return rc; } glob = fsl_strdup(fcli_next_arg(true)); init_curses(); view = view_open(0, 0, 0, 0, FNC_VIEW_BRANCH); if (view == NULL) { rc = RC(FSL_RC_ERROR, "%s", "view_open"); goto end; } rc = open_branch_view(view, branch_flags, glob, dateline, when); if (rc) goto end; rc = view_loop(view); end: if (rc) fnc_free_branches(&view->state.branch.branches); fsl_free(glob); return rc; } static int open_branch_view(struct fnc_view *view, int branch_flags, const char *glob, double dateline, int when) { struct fnc_branch_view_state *s = &view->state.branch; int rc = 0; s->selected_branch = 0; s->colour = !fnc_init.nocolour && has_colors(); s->branch_flags = branch_flags; s->branch_glob = glob; s->dateline = dateline; s->when = when; rc = fnc_load_branches(s); if (rc) return rc; if (s->colour) { STAILQ_INIT(&s->colours); rc = set_colours(&s->colours, FNC_VIEW_BRANCH); } view->show = show_branch_view; view->input = branch_input_handler; view->close = close_branch_view; view->search_init = branch_search_init; view->search_next = branch_search_next; return rc; } static int fnc_load_branches(struct fnc_branch_view_state *s) { fsl_cx *const f = fcli_cx(); |
︙ | ︙ | |||
9743 9744 9745 9746 9747 9748 9749 | " FROM tmp_brlist WHERE isclosed", -1); break; } if (rc) goto end; if (s->branch_glob) { | < | < < | | < | 8838 8839 8840 8841 8842 8843 8844 8845 8846 8847 8848 8849 8850 8851 8852 8853 8854 | " FROM tmp_brlist WHERE isclosed", -1); break; } if (rc) goto end; if (s->branch_glob) { char *like = fsl_mprintf("%%%%%s%%%%", s->branch_glob); rc = fsl_buffer_appendf(&sql, " AND name LIKE %Q", like); fsl_free(like); if (rc) goto end; } if (FLAG_CHK(s->branch_flags, BRANCH_LS_NO_PRIVATE)) { rc = fsl_buffer_append(&sql, " AND NOT isprivate", -1); if (rc) |
︙ | ︙ | |||
9822 9823 9824 9825 9826 9827 9828 | return rc; } static int create_tmp_branchlist_table(void) { fsl_cx *const f = fcli_cx(); | | | 8913 8914 8915 8916 8917 8918 8919 8920 8921 8922 8923 8924 8925 8926 8927 | return rc; } static int create_tmp_branchlist_table(void) { fsl_cx *const f = fcli_cx(); fsl_db *db = fsl_needs_ckout(f); static const char tmp_branchlist_table[] = "CREATE TEMP TABLE IF NOT EXISTS tmp_brlist AS " "SELECT tagxref.value AS name," " max(event.mtime) AS mtime," " EXISTS(SELECT 1 FROM tagxref AS tx WHERE tx.rid=tagxref.rid" " AND tx.tagid=(SELECT tagid FROM tag WHERE tagname='closed')" " AND tx.tagtype > 0) AS isclosed," |
︙ | ︙ | |||
9848 9849 9850 9851 9852 9853 9854 | " AND tagxref.tagtype>0" " AND tag.tagname='branch'" " AND event.objid=tagxref.rid " "GROUP BY 1;"; int rc = 0; if (!db) | | | 8939 8940 8941 8942 8943 8944 8945 8946 8947 8948 8949 8950 8951 8952 8953 | " AND tagxref.tagtype>0" " AND tag.tagname='branch'" " AND event.objid=tagxref.rid " "GROUP BY 1;"; int rc = 0; if (!db) return RC(FSL_RC_NOT_A_CKOUT, "%s", "fsl_needs_ckout"); rc = fsl_db_exec(db, tmp_branchlist_table); return rc ? RC(fsl_cx_uplift_db_error2(f, db, rc), "%s", "fsl_db_exec") : rc; } static int |
︙ | ︙ | |||
9958 9959 9960 9961 9962 9963 9964 | be = s->first_branch_onscreen; if ((line = fsl_mprintf("branches [%d/%d]", be->idx + s->selected + 1, s->nbranches)) == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_mprintf"); | | | 9049 9050 9051 9052 9053 9054 9055 9056 9057 9058 9059 9060 9061 9062 9063 | be = s->first_branch_onscreen; if ((line = fsl_mprintf("branches [%d/%d]", be->idx + s->selected + 1, s->nbranches)) == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_mprintf"); rc = formatln(&wline, &width, line, view->ncols, 0); if (rc) { fsl_free(line); return rc; } if (screen_is_shared(view)) wattron(view->window, A_REVERSE); waddwstr(view->window, wline); |
︙ | ︙ | |||
9998 9999 10000 10001 10002 10003 10004 | s->show_date ? be->branch->date : 0); if (line == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_mprintf"); if (s->colour) c = match_colour(&s->colours, line); | | | 9089 9090 9091 9092 9093 9094 9095 9096 9097 9098 9099 9100 9101 9102 9103 | s->show_date ? be->branch->date : 0); if (line == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_mprintf"); if (s->colour) c = match_colour(&s->colours, line); rc = formatln(&wline, &width, line, view->ncols, 0); if (rc) { fsl_free(line); return rc; } if (n == s->selected) { if (view->active) |
︙ | ︙ | |||
10029 10030 10031 10032 10033 10034 10035 | ++n; ++s->ndisplayed; --limit; s->last_branch_onscreen = be; be = TAILQ_NEXT(be, entries); } | | | | < > > | | | < < | < > > | < | | | | < < | | 9120 9121 9122 9123 9124 9125 9126 9127 9128 9129 9130 9131 9132 9133 9134 9135 9136 9137 9138 9139 9140 9141 9142 9143 9144 9145 9146 9147 9148 9149 9150 9151 9152 9153 9154 9155 9156 9157 9158 9159 9160 9161 9162 9163 9164 9165 9166 9167 9168 9169 9170 9171 9172 9173 9174 | ++n; ++s->ndisplayed; --limit; s->last_branch_onscreen = be; be = TAILQ_NEXT(be, entries); } draw_vborder(view); return rc; } static int branch_input_handler(struct fnc_view **new_view, struct fnc_view *view, int ch) { struct fnc_branch_view_state *s = &view->state.branch; struct fnc_view *timeline_view, *tree_view; struct fnc_branchlist_entry *be; int start_col = 0, n, rc = 0; switch (ch) { case 'c': s->colour = !s->colour; break; case 'd': s->show_date = !s->show_date; break; case 'i': s->show_id = !s->show_id; break; case KEY_ENTER: case '\r': case ' ': if (!s->selected_branch) break; if (view_is_parent(view)) start_col = view_split_start_col(view->start_col); rc = tl_branch_entry(&timeline_view, start_col, s->selected_branch); view->active = false; timeline_view->active = true; if (view_is_parent(view)) { rc = view_close_child(view); if (rc) return rc; view_set_child(view, timeline_view); view->focus_child = true; } else *new_view = timeline_view; break; case 't': if (!s->selected_branch) break; if (view_is_parent(view)) start_col = view_split_start_col(view->start_col); rc = browse_branch_tree(&tree_view, start_col, |
︙ | ︙ | |||
10132 10133 10134 10135 10136 10137 10138 | if (s->selected < s->ndisplayed - 1) { ++s->selected; break; } if (TAILQ_NEXT(s->last_branch_onscreen, entries) == NULL) /* Reached last entry. */ break; | | < < < | | < < < | < | > > > > > > > > > > > > > > > > > > > > > > > > | 9220 9221 9222 9223 9224 9225 9226 9227 9228 9229 9230 9231 9232 9233 9234 9235 9236 9237 9238 9239 9240 9241 9242 9243 9244 9245 9246 9247 9248 9249 9250 9251 9252 9253 9254 9255 9256 9257 9258 9259 9260 9261 9262 9263 9264 9265 9266 9267 9268 9269 9270 9271 9272 9273 9274 9275 9276 9277 9278 9279 9280 9281 9282 9283 9284 9285 9286 9287 9288 9289 9290 9291 9292 9293 | if (s->selected < s->ndisplayed - 1) { ++s->selected; break; } if (TAILQ_NEXT(s->last_branch_onscreen, entries) == NULL) /* Reached last entry. */ break; branch_scroll_down(s, 1); break; case KEY_PPAGE: case CTRL('b'): if (s->first_branch_onscreen == TAILQ_FIRST(&s->branches)) s->selected = 0; branch_scroll_up(s, MAX(0, view->nlines - 1)); break; case KEY_NPAGE: case CTRL('f'): if (TAILQ_NEXT(s->last_branch_onscreen, entries) == NULL) { /* No more entries off-page; move cursor down. */ if (s->selected < s->ndisplayed - 1) s->selected = s->ndisplayed - 1; break; } branch_scroll_down(s, view->nlines - 1); break; case CTRL('l'): case 'R': fnc_free_branches(&s->branches); s->branch_glob = NULL; /* Shared pointer. */ s->when = 0; s->branch_flags = BRANCH_LS_OPEN_CLOSED; rc = fnc_load_branches(s); break; case KEY_RESIZE: if (view->nlines >= 2 && s->selected >= view->nlines - 1) s->selected = view->nlines - 2; break; default: break; } return rc; } static int tl_branch_entry(struct fnc_view **new_view, int start_col, struct fnc_branchlist_entry *be) { struct fnc_view *timeline_view; fsl_id_t rid; int rc = 0; *new_view = NULL; rid = fsl_uuid_to_rid(fcli_cx(), be->branch->id); if (rid < 0) return RC(rc, "%s", "fsl_uuid_to_rid"); timeline_view = view_open(0, 0, 0, start_col, FNC_VIEW_TIMELINE); if (timeline_view == NULL) return RC(FSL_RC_ERROR, "%s", "view_open"); rc = open_timeline_view(timeline_view, rid, "/", NULL); if (!rc) *new_view = timeline_view; return rc; } static int browse_branch_tree(struct fnc_view **new_view, int start_col, struct fnc_branchlist_entry *be) { struct fnc_view *tree_view; fsl_id_t rid; |
︙ | ︙ | |||
10218 10219 10220 10221 10222 10223 10224 | if (be == NULL) break; s->first_branch_onscreen = be; be = TAILQ_PREV(be, fnc_branchlist_head, entries); } } | | | < | < | < | | > | 9323 9324 9325 9326 9327 9328 9329 9330 9331 9332 9333 9334 9335 9336 9337 9338 9339 9340 9341 9342 9343 9344 9345 9346 9347 9348 9349 9350 9351 9352 9353 9354 9355 9356 9357 9358 9359 9360 9361 9362 9363 9364 | if (be == NULL) break; s->first_branch_onscreen = be; be = TAILQ_PREV(be, fnc_branchlist_head, entries); } } static void branch_scroll_down(struct fnc_branch_view_state *s, int maxscroll) { struct fnc_branchlist_entry *next, *last; int idx = 0; if (s->first_branch_onscreen) next = TAILQ_NEXT(s->first_branch_onscreen, entries); else next = TAILQ_FIRST(&s->branches); last = s->last_branch_onscreen; while (next && last && idx++ < maxscroll) { last = TAILQ_NEXT(last, entries); if (last) { s->first_branch_onscreen = next; next = TAILQ_NEXT(next, entries); } } } static int branch_search_init(struct fnc_view *view) { struct fnc_branch_view_state *s = &view->state.branch; s->matched_branch = NULL; return 0; } static int branch_search_next(struct fnc_view *view) { struct fnc_branch_view_state *s = &view->state.branch; struct fnc_branchlist_entry *be = NULL; |
︙ | ︙ | |||
10309 10310 10311 10312 10313 10314 10315 | if (view->searching == SEARCH_FORWARD) be = TAILQ_NEXT(be, entries); else be = TAILQ_PREV(be, fnc_branchlist_head, entries); } if (s->matched_branch) { | < < < < < | | | | < | | 9412 9413 9414 9415 9416 9417 9418 9419 9420 9421 9422 9423 9424 9425 9426 9427 9428 9429 9430 | if (view->searching == SEARCH_FORWARD) be = TAILQ_NEXT(be, entries); else be = TAILQ_PREV(be, fnc_branchlist_head, entries); } if (s->matched_branch) { s->first_branch_onscreen = s->matched_branch; s->selected = 0; } return 0; } static int match_branchlist_entry(struct fnc_branchlist_entry *be, regex_t *regex) { regmatch_t regmatch; |
︙ | ︙ | |||
10480 10481 10482 10483 10484 10485 10486 | static void fnc_show_version(void) { printf("%s %s\n", fcli_progname(), PRINT_VERSION); } static int | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 9577 9578 9579 9580 9581 9582 9583 9584 9585 9586 9587 9588 9589 9590 9591 9592 9593 9594 9595 9596 9597 9598 9599 9600 9601 9602 9603 9604 9605 9606 9607 9608 9609 9610 9611 | static void fnc_show_version(void) { printf("%s %s\n", fcli_progname(), PRINT_VERSION); } static int strtonumcheck(int *ret, const char *nstr, const int min, const int max) { const char *ptr; int n; ptr = NULL; errno = 0; n = strtonum(nstr, min, max, &ptr); if (errno == ERANGE) return RC(FSL_RC_RANGE, "<n> out of range: -n|--limit=%s [%s]", nstr, ptr); else if (errno != 0 || errno == EINVAL) return RC(FSL_RC_MISUSE, "<n> not a number: -n|--limit=%s [%s]", nstr, ptr); else if (ptr && *ptr != '\0') return RC(FSL_RC_MISUSE, "invalid char in <n>: -n|--limit=%s [%s]", nstr, ptr); *ret = n; return 0; } /* * Attempt to parse string d, which must resemble either an ISO8601 formatted * date (e.g., 2021-10-10, 2020-01-01T10:10:10), disgregarding any trailing * garbage or space characters such that "2021-10-10x" or "2020-01-01 10:10:10" * will pass, or an _unambiguous_ DD/MM/YYYY or MM/DD/YYYY formatted date. Upon |
︙ | ︙ | |||
10631 10632 10633 10634 10635 10636 10637 | *ptr = token; } else *ptr = NULL; return s; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 9661 9662 9663 9664 9665 9666 9667 | *ptr = token; } else *ptr = NULL; return s; } |