Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
History of file src/import.c at check-in 08ed91a7b21e9b3c
|
2025-10-28
| ||
| 15:05 | Cache the name of the main branch. file: [1ee4f154da] check-in: [ca0d66b2e4] user: danield branch: trunk, size: 67747 | |
|
2025-10-25
| ||
| 13:48 | Remove some fossil_free() calls added by the previous check-in. file: [c3a365a06b] check-in: [6a617d004f] user: danield branch: softcoded-main-branch, size: 67777 | |
|
2025-10-23
| ||
| 14:50 | Replace hard-coded "trunk" with the value of 'main-branch' (defaulting to "trunk"). file: [2a535c8fb6] check-in: [dd8995bbdd] user: danield branch: softcoded-main-branch, size: 67833 | |
|
2025-07-23
| ||
| 15:58 | Minor optimization: replace calls to mprintf("%s", X) with fossil_strdup(X). file: [6997a6b6d9] check-in: [4c3e1728e1] user: danield branch: trunk, size: 67612 | |
|
2025-04-08
| ||
| 12:49 | Ensure that ALL fopen() calls include 'b' in their modes. The git import/export fopen()s did not have this, which may (hypothetically, but unproven) lead to EOL conversion on Windows. file: [e8baa37057] check-in: [13049ef245] user: stephan branch: fopen-mode-b, size: 67614 | |
|
2024-08-23
| ||
| 13:00 | Move the fossil_strdup() implementation from import.c over to util.c where it belongs. Add a new fossil_strdup_nn() that mimics the behavior of mprintf("%s",...), only faster. file: [28a4e12b97] check-in: [0c9dff644e] user: drh branch: trunk, size: 67612 | |
|
2024-06-03
| ||
| 06:46 | Resolve memory leaks in the SVN import which can cause large imports to hit OOM, reported in [forum:bb19df2426679bfc|forum thread bb19df2426679bfc]. file: [313d8f9b69] check-in: [93266c5151] user: stephan branch: trunk, size: 67999 | |
|
2024-05-27
| ||
| 11:45 | Add a couple missing the's to [d2e89721b3965a7c19bc]. file: [5ce62d2f04] check-in: [dcb55e6731] user: stephan branch: trunk, size: 67863 | |
| 11:43 | Make the error message from [05ae1fe2fedcec7] more informative. file: [3897b84e30] check-in: [d2e89721b3] user: stephan branch: trunk, size: 67855 | |
| 11:28 | Call fossil_fatal() in svn import when trying to import an empty blob, rather than stepping on NULL later. Reported in [forum:15d4b242bda2a108|forum post 15d4b242bda2a108]. file: [19f544f5af] check-in: [05ae1fe2fe] user: stephan branch: trunk, size: 67742 | |
|
2024-02-02
| ||
| 22:18 | Remove trailing whitespace from non-external C files. file: [aa7e267f27] check-in: [7db0a2d910] user: danield branch: fix-overlength-lines, size: 67535 | |
|
2023-09-29
| ||
| 13:35 | merge in hash-admin-user-password file: [1a9e1fff00] check-in: [593e801bdf] user: preben branch: trunk, size: 67536 | |
|
2023-06-22
| ||
| 13:49 | enable importing multiple git repos into one fsl repo This fixes an issue reported by James Cook in [forum:d162b6e2dc]. Previously, we assumed the fx_git table does not exist when creating a new import, thus the previously untested use case of importing multiple new (read: not incremental) git repos into the same fossil repo failed at this assumption. While here, document the persistent nature of attributions in the import cmd help text; previously, this was only in the online docs: [/doc/trunk/www/inout.wiki] file: [aaf3ee7836] check-in: [47fb3ddc5a] user: mark branch: trunk, size: 67502 | |
|
2023-06-18
| ||
| 03:12 | fix import handling of git repositories with renamed files Reported by James Cook in [forum:2b857ded1b]: renamed files were shown as a deletion and an addition. This was because the optional 3rd and 4th field in the manifest's F card to indicate renames were omitted, despite having parsed these data from the git fast-export marks. file: [26bf6db4a5] check-in: [7ab1e11850] user: mark branch: trunk, size: 67143 | |
|
2023-02-17
| ||
| 14:37 | A large collection of compiler warning fixes re. signed/unsigned comparison from Daniel D. file: [ac87067f14] check-in: [c71f711ec9] user: stephan branch: compiler-warnings, size: 67017 | |
|
2022-12-21
| ||
| 09:31 | Improved consistency for --help option descriptions. file: [6981da2fc9] check-in: [2e56ef4e8d] user: km branch: trunk, size: 66990 | |
| 09:00 | Improved consistency for --help option descriptions: begin with uppercase letter; do not use a period at the end of short-ish sentences. file: [0300732efb] check-in: [de684083c6] user: km branch: spelling-fixes, size: 66992 | |
|
2022-12-20
| ||
| 09:46 | Change spelling for check-in and similar file: [d34065e083] check-in: [d9c4321e7a] user: danield branch: check-in-spelling, size: 66992 | |
|
2022-11-13
| ||
| 16:26 | Apply fixes to all web views to pass WCAG 2.1 tests performed by "axe DevTools" browser extension. Most fixes related to screen reader compatibility, like making sure that form elements have labels. Some color changes to improve contrast on Default skin. Made more HTML5 compliant. Minor improvement to select combo boxes for UX. Improved Search form UX. Two minor bug fixes for malformed HTML. Fixed help pages to resolve issues with non-compliant HTML being generated. Mostly documented at https://fossil-scm.org/forum/forumpost/aafb17a981df4166 file: [6b1376eb01] check-in: [1f231db380] user: ericwikman branch: wcag-2.1, size: 66987 | |
|
2021-11-19
| ||
| 12:29 | Remove unused randomize flag to rebuild_db(), per /chat discussion, along with the no-op --randomize flag to the rebuild command. file: [2ba916df77] check-in: [298ccff06c] user: stephan branch: trunk, size: 66990 | |
|
2021-03-25
| ||
| 01:32 | Reduce fossil_panic() calls to those indicating bugs and internal errors. Also clarify effects and purposes of fossil_fatal() vs. fossil_panic(). file: [99f89e77ef] check-in: [91a4652f22] user: larrybr branch: panic-reduction, size: 66993 | |
|
2021-02-05
| ||
| 09:32 | Amend 'fossil help' output for all commands to make options conform to GNU 'short|long' convention (e.g., -v|--verbose). file: [33962edf9f] check-in: [7f3c728db3] user: jamsek branch: trunk, size: 66993 | |
|
2021-01-14
| ||
| 11:15 | Fixed a couple C99-isms reported at [https://fossil-scm.org/forum/forumpost/487f05e382 | /forumpost/487f05e382]. file: [54a4726efd] check-in: [a7af387dd8] user: stephan branch: trunk, size: 66993 | |
|
2020-11-28
| ||
| 13:36 | Fix how Fossil handles 'import --git' into a repository that already exists when neither the '--increment' nor '--force' options are passed, as reported by Warren in [forum:/forumpost/29e358909c|forum post 29e358909c]. The proposed fix required duplicating a file descriptor for stdin to accept keyboard input from the user and piped input from git fast-import, which necessitated machine-dependent ifdefs that have not yet been tested on Windows platforms. The fix revealed another bug that this commit also solves by avoiding duplicate artifacts being inserted into the blob table during fast_insert_content(), which can arise when importing into a repository that has used the recently implemented '--attribute' feature if manifests are generated from the same content but with different U cards. Due to a bug in Git's output, this required an additional temp table for tracking tag artifacts (see comments). Due to the complexity of this commit, and having not been tested yet on Windows platforms, further testing is needed. file: [e531d962ca] check-in: [a69f71a275] user: jamsek branch: import-git-dev, size: 72008 | |
|
2020-11-20
| ||
| 19:44 | Fix a C++-ism in the import code. file: [fa1a6c477b] check-in: [87c4b7c48c] user: drh branch: trunk, size: 66960 | |
|
2020-11-14
| ||
| 06:52 | Add extra check in git_fast_import() so that 'import --git --incremental' queries the new 'fx_git' table if it exists in the repository database to attribute check-ins. file: [616dbca507] check-in: [8eeba7a8db] user: jamsek branch: trunk, size: 66950 | |
|
2020-11-13
| ||
| 14:49 | Improvements to "fossil import" to try to make it work better with breezy - based in part on suggestions in [forum:/info/be2aa46dcecf1802|forum post be2aa46dcecf1802]. file: [ac992de1b2] check-in: [806c6f60c4] user: drh branch: trunk, size: 66907 | |
|
2020-11-12
| ||
| 14:26 | Add new --attribute option to the 'fossil import --git' command that enables attributing commits to a username rather than the corresponding Git committer/author contact info of a given commit. Conversely, construct a full 'user <emailaddr>' Git committer string for commits when using 'fossil git export' by querying the new 'fx_git' table if it exists, or the 'info' column in the 'user' table. If no user specified emailaddr can be parsed, then use the generic 'user@noemail.net' string. file: [2da0b425cc] check-in: [cd4fbdee00] user: jamsek branch: trunk, size: 66710 | |
|
2020-10-01
| ||
| 18:33 | Fix an issue with the "R" (rename)" and "C" (copy) commands when interpreting git-fast-export files. file: [1ebd6da35f] check-in: [8e5b010349] user: drh branch: breezy-fast-import, size: 64470 | |
| 12:46 | Fix an issue with the logic that prevents Fossil control artifacts from being imported as regular files. Probably unrelated to the breezy changes. Came up during testing. file: [c95c3f1ab1] check-in: [92ab247435] user: drh branch: breezy-fast-import, size: 64488 | |
| 12:13 | An attempt to enhance the git-fast-export reader so that it can handle breezy-generated output files. file: [7d2a7ed616] check-in: [ddcd35d6a5] user: drh branch: breezy-fast-import, size: 64476 | |
|
2020-09-16
| ||
| 13:21 | Make an appropriate entry in the rcvfrom table when doing a git or svn import. See [forum:92db82a45e|forum post 92db82a45e] for details on the problem that this check-in attempts to fix. file: [dd5d4cad8e] check-in: [59ba20f845] user: drh branch: trunk, size: 63485 | |
|
2020-09-11
| ||
| 15:40 | If the "fossil import --git" command encounters a file that looks like a well-formed Fossil artifact, append a line to the end of that file so that it is no longer a well-formed artifact before importing it. This prevents "manifest" files that found their way into Git from being reinterpreted by Fossil when the repository is reimported back into Fossil. file: [2d041f8f97] check-in: [2777682b63] user: drh branch: trunk, size: 63369 | |
| 12:20 | Fix over-length source code lines in import.c. file: [5242312914] check-in: [8d9d8654a3] user: drh branch: trunk, size: 63274 | |
|
2020-08-18
| ||
| 13:17 | More missing db_unprotect() calls. file: [d0af879c0c] check-in: [06d3789a2a] user: drh branch: sec2020, size: 63271 | |
|
2020-08-09
| ||
| 13:49 | Revise and simplify the list of 1st-tier commands that are shown by the "fossil help" command. file: [b6e7722f77] check-in: [84f697e570] user: drh branch: trunk, size: 63242 | |
|
2020-05-27
| ||
| 22:14 | Updated all user-facing documentation and "fossil help" output (plus select internal comments and function names) to use "hash" rather than "UUID". No functional changes. (Yet?) See forum thread https://www.fossil-scm.org/forum/forumpost/ddc14c6866 for discussion. file: [9869461c22] check-in: [df5201950e] user: wyoung branch: uuid-to-hash, size: 63241 | |
|
2020-02-25
| ||
| 18:34 | Added --admin-user flag to the import command, per discussion at [https://fossil-scm.org/forum/forumpost/2ecbbdf7c6|forumpost/2ecbbdf7c6]. file: [2d1f6dcd25] check-in: [bdc242fb07] user: stephan branch: import-admin-user, size: 63262 | |
|
2019-12-21
| ||
| 18:24 | Moved two decls from an outer scope to the inner scope where they're used. file: [7f99ab7269] check-in: [2576cf5fd1] user: stephan branch: memleak-fixes, size: 63065 | |
|
2019-12-19
| ||
| 20:41 | Clean up g.non-const zXYZ members in the atexit handler. Add a blob_reset() in finish_tag() to cover the case that fast_insert_content() does not reset it. file: [f4862b1b07] check-in: [252ca35f47] user: stephan branch: memleak-fixes, size: 63063 | |
| 18:54 | Several memleak fixes reported via https://fossil-scm.org/forum/forumpost/205b004d8a. In a branch so the OP can test them in his setup. file: [4b4c8232e1] check-in: [4566da665d] user: stephan branch: memleak-fixes, size: 63038 | |
| 15:13 | Never mind.... Was: Attempt to fix a memory leak on Git import. file: [d6df423671] check-in: [81bfdca9e5] user: drh branch: git-import-memleak, size: 62965 | |
| 14:40 | Moved a blob_reset() to fix a leak reported in https://fossil-scm.org/forum/forumpost/6871eaaa07. file: [a5f4dc08a8] check-in: [8628cbd428] user: stephan branch: trunk, size: 62940 | |
|
2019-09-18
| ||
| 14:57 | Style cleanup (no tabs). No functional change. file: [4689601689] check-in: [89872d17d1] user: andybradford branch: trunk, size: 62942 | |
|
2019-03-19
| ||
| 14:09 | Replace most calls to db_begin_transaction() with db_begin_write() to avoid having a reader locking during a COMMIT. file: [5e8baf0ba9] check-in: [6cc5354821] user: andybradford branch: db-begin-txn-updates, size: 62902 | |
|
2018-07-15
| ||
| 19:56 | Clarify the difference between fossil_fatal() and fossil_panic(). The fossil_panic() interface puts a message on the error log when generating webpages. Otherwise the two routines are identical. Convert some fossil_fatal() calls into fossil_panic() where appropriate. The goal here is to limit messages on the error log to things that require attention from the system administrator, or represent bugs. file: [d1c748c011] check-in: [3f5ab71744] user: drh branch: trunk, size: 62914 | |
|
2018-02-12
| ||
| 13:01 | Add the --use-author flag to "fossil import --git". Patch from Dingyuan Wang. file: [4519efff1f] check-in: [fe87e4cb9d] user: drh branch: trunk, size: 62914 | |
|
2017-06-30
| ||
| 19:00 | Report an error if the input file to "fossil import" cannot be opened. file: [e48f2f2e00] check-in: [038dcc00e5] user: drh branch: trunk, size: 62532 | |
|
2017-06-08
| ||
| 12:50 | Make sure fossil_strndup() always adds a zero terminator. file: [ec3911e2ad] check-in: [8707e86949] user: drh branch: trunk, size: 62457 | |
|
2017-04-03
| ||
| 11:40 | Add support for GIT comment tags, as suggested [https://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg24595.html|here]. Implementation by Roy Marples, but modified to use the (existing) 'T' card in stead of the 'C' card. file: [14ebf8376b] check-in: [3bba2a6e82] user: jan.nijtmans branch: trunk, size: 62445 | |
|
2017-03-22
| ||
| 16:42 | Since "allow-symlinks" is already ON by default on non-unix platforms (since fossil 1.35 already), no need to do anything special during GIT/SVN import. file: [7093c8ebb6] check-in: [f21820f4ab] user: jan.nijtmans branch: trunk, size: 61499 | |
| 16:26 | (cherry-pick): Fixes to SVN import received from Christophe Gouiran (bechris13250 at gmail) file: [ebe46ac229] check-in: [dec3383ed4] user: jan.nijtmans branch: branch-2.1, size: 61500 | |
| 14:52 | Fix (older) MSVC compile file: [36d6cd4f15] check-in: [80c94b7689] user: jan.nijtmans branch: trunk, size: 61763 | |
| 12:39 | Fixes to SVN import received from Christophe Gouiran (bechris13250 at gmail) file: [2603a10a17] check-in: [035bd4f65c] user: drh branch: trunk, size: 61762 | |
|
2017-03-01
| ||
| 15:35 | Change references to "SHA1 hash" in comments and UI labels to be "artifact hash" or similar. file: [1c8c9a6f99] check-in: [b9a1a3b9d8] user: drh branch: fossil-2.0, size: 60322 | |
|
2017-02-23
| ||
| 07:51 | Fix harmless compiler warning seen with MSVC. file: [bd322d6730] check-in: [afcff4999e] user: mistachkin branch: trunk, size: 60317 | |
|
2017-02-22
| ||
| 09:49 | Merge stripping end-of-line change from "roy-export" branch file: [e4a36affec] check-in: [bd65092f33] user: jan.nijtmans branch: jn-export, size: 61255 | |
|
2017-02-21
| ||
| 21:36 | Only strip trailing newline when importing comments. file: [8c788edbb0] check-in: [0e4bf2ca5f] user: roy.marples branch: roy-export, size: 61245 | |
|
2017-02-13
| ||
| 10:59 | Cards must appear in a lexical order. Thanks Jan! file: [8bfde39e3e] check-in: [84804f01c5] user: roy.marples branch: roy-export, size: 61254 | |
| 10:37 | Same as "roy-export", but use tag value in stead of comment for storing comment related to tags. (Not actually tested with GIT yet!) file: [e0528aaefe] check-in: [cb1fb96f0d] user: jan.nijtmans branch: jn-export, size: 61262 | |
| 03:34 | Add comment cards to tags, which are accepted by git import and exported to git export. They are visible via the timeline, but currently lack an editable means via the UI. file: [36ec407663] check-in: [752bdd38c7] user: roy.marples branch: roy-export, size: 61254 | |
| 00:20 | Tags should be imported with a sym- prefix. file: [425a0435c0] check-in: [d90460dbf4] user: roy.marples branch: roy-export, size: 61009 | |
|
2017-02-12
| ||
| 15:17 | Match committer / tag name <email> with a user's contact info record. If not found, then use the email address as the user name. file: [0a960a6952] check-in: [8f901ff570] user: roy.marples branch: roy-export, size: 61005 | |
|
2017-02-10
| ||
| 22:07 | Set the main-branch config option to the trunk name we're using. file: [b4a56c13c4] check-in: [9501d941d5] user: roy.marples branch: roy-export, size: 60736 | |
| 22:04 | Add --rename-master option to import --git instead of forcing a naming convention. file: [d127ea2bc2] check-in: [50705503d9] user: roy.marples branch: roy-export, size: 60677 | |
|
2016-11-05
| ||
| 05:45 | Add fossil_strndup() function to duplicate a string that is not necessarily NUL-terminated file: [52e3769829] check-in: [b98776679e] user: andygoth branch: andygoth-timeline-ms, size: 60309 | |
|
2016-11-04
| ||
| 22:37 | Consistently use the count(X) macro in place of sizeof(X)/sizeof(*X) throughout the Fossil core, excluding things that don't use makeheaders. Also use count(X) instead of ArraySize(X) which has the same definition. file: [34fdde348d] check-in: [e5b62edb28] user: andygoth branch: trunk, size: 60136 | |
|
2016-10-26
| ||
| 21:45 | Create a temporary index to speed up incremental Git import. file: [67fd145dde] check-in: [0fa60142eb] user: mistachkin branch: trunk, size: 60156 | |
|
2016-10-23
| ||
| 02:16 | Fixes for incremental Git import/export. file: [c291d51b1b] check-in: [9599705c69] user: mistachkin branch: experimental, size: 60105 | |
|
2016-10-20
| ||
| 16:48 | Remove extra newlines from calls to fossil_fatal() file: [cc5b8328ac] check-in: [2c42b217e5] user: andygoth branch: trunk, size: 60033 | |
|
2016-09-23
| ||
| 02:46 | Coding style tweaks. file: [fdcbb80b69] check-in: [32e418f856] user: mistachkin branch: nick.lloyd-git-interop, size: 60111 | |
|
2016-09-21
| ||
| 19:05 | Fix a problem that can occasionally occur with repeated syncs to/from a git repository, where a fossil-generated mark clashes with a mark previously generated by git, causing the sync to fail. file: [1935508c3e] check-in: [69668f8c57] user: nick.lloyd branch: nick.lloyd-git-interop, size: 60109 | |
|
2016-06-10
| ||
| 14:43 | Enhancements to SVN import file: [060b06a406] check-in: [fa9ead30dc] user: drh branch: trunk, size: 60039 | |
| 14:41 | Add the "fossil reparent" command and the --dryrun option on "fossil tag add" and "fossil tag cancel". file: [19fed0531b] check-in: [96164bb2b1] user: drh branch: trunk, size: 55148 | |
|
2016-05-27
| ||
| 21:03 | Compiler warning and coding style fixes. file: [7d25fd7c00] check-in: [d037468910] user: mistachkin branch: trunk, size: 55150 | |
|
2016-05-23
| ||
| 15:37 | Merge trunk file: [697e836ad4] check-in: [6164dac54c] user: andygoth branch: andygoth-svn-import, size: 59991 | |
|
2016-05-17
| ||
| 00:46 | Add logic to process "parent" tags. Add the "reparent" command used to create an appropriate parent tag to cause a check-in to be reparented. file: [3ad909be7c] check-in: [5c5a364d5e] user: drh branch: reparent, size: 55098 | |
|
2016-05-16
| ||
| 17:58 | Remove C99-isms that MSVC has trouble with. file: [a4d6275c24] check-in: [addfe48990] user: drh branch: nick.lloyd-git-interop, size: 55100 | |
|
2016-05-14
| ||
| 21:41 | Add --import-marks and --export-marks options to 'fossil import' subcommand. This allows one to save all git-generated marks following an import. Previously, performing an incremental import from git resulted in new commits being imported as orphans, and trying to perform an export to git at some later time resulted in git complaining of undefined marks. To remedy this, the format of the marks file is amended to include the rid, mark, and UUID of each commit. Now, fossil and git agree on the mapping between commits and marks, so updates in either direction can be performed easily. file: [0c01dc75d4] check-in: [c26213be47] user: nick.lloyd branch: nick.lloyd-git-interop, size: 55091 | |
| 13:10 | Ignore Subversion property changes when importing. Property changes were previously interpreted as changing a file to be empty. file: [520d8a5227] check-in: [ed7905b64d] user: andygoth branch: andygoth-svn-import, size: 58524 | |
| 04:32 | Avoid NULL dereference when importing incremental Subversion dumps. This may not be the correct solution, but at least it's not outright crashing anymore. file: [dfdf0a3e3e] check-in: [2ade560ea0] user: andygoth branch: andygoth-svn-import, size: 58505 | |
| 04:29 | Add -ignore-tree to import command file: [f2bc5c7b33] check-in: [10faea6e0f] user: andygoth branch: andygoth-svn-import, size: 58456 | |
|
2016-05-12
| ||
| 16:12 | Add -rename-trunk, -rename-branch, -rename-tag, -rename-rev, -rev-tags, and -no-rev-tags options to import command file: [ee07ca998b] check-in: [d7b8b3e183] user: andygoth branch: andygoth-svn-import, size: 57313 | |
|
2016-04-01
| ||
| 13:37 | Fix typos in comments. No changes to code. file: [27ecf5430e] check-in: [b6b50b1244] user: mistachkin branch: trunk, size: 53633 | |
|
2016-03-02
| ||
| 02:10 | Permit the TH1 hooks subsystem to check for the configuration without raising a 'fatal' error. file: [7e3f433033] check-in: [b06cd631f1] user: mistachkin branch: trunk, size: 53632 | |
|
2015-12-29
| ||
| 20:18 | Add the --no-rebuild and --no-vacuum options to the "fossil import" command. file: [dcacafa93e] check-in: [219f967cd7] user: drh branch: trunk, size: 53629 | |
|
2015-12-25
| ||
| 13:42 | Fix the "fossil import --git" command so that it does delta compression on the fly, and hence uses much less temporary disk space. Also show progress information unless --quiet is used. file: [c23ad04d71] check-in: [063779a14c] user: drh branch: trunk, size: 53253 | |
|
2015-12-19
| ||
| 13:08 | Fix a minor typo in the git-import logic. file: [f163b54573] check-in: [f7afea949d] user: drh branch: trunk, size: 52846 | |
|
2015-11-29
| ||
| 17:33 | Fix the backslash-octal escapes on the filename quoting while importing from git. file: [19f34d2902] check-in: [09cf1ad8ee] user: drh branch: trunk, size: 52846 | |
|
2015-08-26
| ||
| 14:06 | fix bug in finding previous version of changed file file: [e1a455d321] check-in: [24048eadf9] user: baruch branch: svn-import, size: 52511 | |
|
2015-03-18
| ||
| 14:17 | Add the --create option to "fossil server", which causes a new repository to be created for the server if one does not already exist. The intended use case is Docker. file: [39947d8db7] check-in: [a6e2ceb454] user: drh branch: trunk, size: 52510 | |
|
2015-03-16
| ||
| 20:32 | merge trunk file: [98fbfba268] check-in: [cd234b1c46] user: jan.nijtmans branch: svn-import, size: 52513 | |
| 19:45 | Fix an extraneous blank line in the previous check-in. file: [0b601c5f91] check-in: [bfbf3bfd96] user: drh branch: git-import, size: 25313 | |
| 19:01 | Reverse ref name traversal because git refs may have forward-slashes file: [b5d29b177a] check-in: [3d9c875160] user: jmoger branch: git-import, size: 25314 | |
|
2015-03-09
| ||
| 14:12 | merge trunk file: [4afb38d824] check-in: [5d3c6df6ba] user: jan.nijtmans branch: svn-import, size: 52518 | |
|
2015-02-28
| ||
| 10:11 | replaced 'checkin' with 'check-in' in code-comment, inline command help-text, SQL-statement comment, fatal error messages and some non-functional webpage-content file: [bc289d3b4c] check-in: [7c30266a45] user: michai branch: ml-jb-doc-typos, size: 25318 | |
|
2015-02-25
| ||
| 22:39 | Merge trunk. Remove --no-svn-rev switch for "fossil import --svn", just use --incremental for that (svn-rev-?? tags are off by default, but switched on by --incremental) file: [8502ed8dbd] check-in: [89a56fe0c7] user: jan.nijtmans branch: svn-import, size: 52516 | |
| 17:19 | Usage text only modifications: - Mention about --force. - Show that --git is optional (?--git?) - Add short option (-f for --force and -i for --incremental) (No change to the code) file: [cea940fcc5] check-in: [c2cdd0e3e8] user: mgagnon branch: svn-import, size: 52638 | |
| 16:09 | Make --git the default for "fossil import" if neither --git nor --svn is specified. Make --force work (again) with "fossil import --git". file: [c290110112] check-in: [3a6c848f68] user: jan.nijtmans branch: svn-import, size: 52560 | |
| 14:51 | Change import command to use --git and --svn options instead of "svn" and "git" sub-sub-command to stay compatible with before. Make sure verify_all_options() fail with specifiying svn only option with --git. file: [04e9483e49] check-in: [4d3bb24b44] user: mgagnon branch: svn-import, size: 52656 | |
|
2015-02-22
| ||
| 15:59 | merge compiler fix for msvc.. file: [4e5c39d711] check-in: [44686ca1a9] user: mgagnon branch: svn-import_no-svn-rev, size: 52136 | |
| 15:35 | Compiler warning (cherry-picked from "svn-import_no-svn-rev" branch) file: [ae3d36f84f] check-in: [998ba3ada4] user: jan.nijtmans branch: svn-import, size: 51769 | |
| 15:31 | Safer version of previous compiler warning fix.. file: [856b5268ad] check-in: [936ebe677b] user: mgagnon branch: svn-import_no-svn-rev, size: 52091 | |
| 15:30 | Fix compilation on MSVC file: [bcdd3fb613] check-in: [916d1d463e] user: jan.nijtmans branch: svn-import, size: 51767 | |
| 15:17 | Fix compiler warning... file: [c1f846fe76] check-in: [44011cd21d] user: mgagnon branch: svn-import_no-svn-rev, size: 52090 | |
|
2015-02-16
| ||
| 13:50 | Stay in sync with svn-import... file: [1e096a7f22] check-in: [04308c2164] user: mgagnon branch: svn-import_no-svn-rev, size: 52089 | |
| 10:18 | Merge trunk. Fix compiler warning on VS. file: [3baa891eed] check-in: [ca336d2a9b] user: jan.nijtmans branch: svn-import, size: 51722 | |
|
2015-02-15
| ||
| 19:34 | Add the --no-svn-rev command line option to the "import svn" command that will skip the automatic tagging of every checkins with "svn-rev-nnn" tags. Proposition for the svn-import branch.. file: [4b1865720b] check-in: [3c24fede5a] user: mgagnon branch: svn-import_no-svn-rev, size: 52091 | |
|
2015-02-06
| ||
| 10:02 | merge trunk, (inadvently changed many "execute" flags, therefore moved to "mistake") file: [f9bbcde158] check-in: [bddc40ced2] user: jan.nijtmans branch: mistake, size: 51722 | |
| 10:00 | Restructure import.c, making it easier to compare with the new svn-import code. No change in functionality. (inadvently changed many "execute" flags, therefore moved to "mistake" file: [0c184184f4] check-in: [62a9987559] user: jan.nijtmans branch: mistake, size: 25316 | |
|
2015-01-28
| ||
| 11:07 | Deleting a branch closes it file: [5ae4954571] check-in: [86ab1f468b] user: baruch branch: svn-import, size: 51724 | |
|
2015-01-18
| ||
| 20:35 | Fix handling paths when branching to/from a subdir file: [624ff3c7ec] check-in: [261ff58e23] user: baruch branch: svn-import, size: 50579 | |
| 14:10 | Much better detection of changes to tags. Prevent commit with no changes. file: [fee6deb895] check-in: [bb020aed62] user: baruch branch: svn-import, size: 50197 | |
|
2015-01-15
| ||
| 16:17 | Fix for new branch detection and handling file: [77926fd6fd] check-in: [7673518b9b] user: baruch branch: svn-import, size: 49183 | |
|
2015-01-11
| ||
| 13:32 | Don't copy all files on a tag file: [9adac6268d] check-in: [fb90d6c657] user: baruch branch: svn-import, size: 49168 | |
| 12:44 | Change "magic numbers" to named constants file: [5cc755d6f1] check-in: [c8e00eb1f5] user: baruch branch: svn-import, size: 49267 | |
| 11:30 | Allow using tags as copy-source Move variables to smaller scope, as per coding style guidelines file: [a6bb44accb] check-in: [997da4f0e4] user: baruch branch: svn-import, size: 49096 | |
| 08:02 | Fix issue with branching from a branch file: [f018f66839] check-in: [93134dda26] user: baruch branch: svn-import, size: 48903 | |
|
2015-01-08
| ||
| 11:14 | Fix memory leaks file: [681d8dd6b1] check-in: [fa8f12b627] user: baruch branch: svn-import, size: 48423 | |
| 10:47 | Reformat long lines file: [793c4eec9e] check-in: [32e9483585] user: baruch branch: svn-import, size: 48319 | |
| 10:17 | Fix for copy on same branch causing a merge file: [d974aa256e] check-in: [06d3aa22d3] user: baruch branch: svn-import, size: 48060 | |
|
2015-01-07
| ||
| 14:07 | Fixes for detecting branch creation file: [31ad10bf77] check-in: [855f233b69] user: baruch branch: svn-import, size: 48216 | |
|
2015-01-06
| ||
| 20:17 | Fix a typo and tagging issue file: [273e852352] check-in: [2b6fc1dd2c] user: baruch branch: svn-import, size: 47288 | |
| 11:45 | Seems to work again on a simple test case. Not finished or well tested file: [b98893b9b7] check-in: [ea876c3f17] user: baruch branch: svn-import, size: 47252 | |
|
2015-01-01
| ||
| 15:02 | Another unfinished revision file: [0af3c0f0bf] check-in: [65f9525be5] user: baruch branch: svn-import, size: 47450 | |
|
2014-12-31
| ||
| 23:33 | More work. Still not usable file: [a9ce314349] check-in: [2ea79975b6] user: baruch branch: svn-import, size: 47606 | |
| 15:46 | Working on fixing/rewriting svn-import function. This is not in a stable state yet. DO NOT TEST file: [ca9dd05d4e] check-in: [9604c28207] user: baruch branch: svn-import, size: 51629 | |
|
2014-11-07
| ||
| 11:52 | Proposed fix for compiler warning: passing argument 4 of ‘sqlite3_result_text’ from incompatible pointer type file: [661095385b] check-in: [c2faa14d85] user: jan.nijtmans branch: svn-import, size: 48342 | |
|
2014-11-06
| ||
| 15:38 | fix some memory leaks file: [247bfab84f] check-in: [412030b145] user: baruch branch: svn-import, size: 48312 | |
|
2014-11-05
| ||
| 15:37 | fixes for various edge cases file: [ed8d250f26] check-in: [c9fb495e3d] user: baruch branch: svn-import, size: 48287 | |
| 09:36 | Fix name of trunk when using --trunk option file: [dba1f8beaa] check-in: [5488f7dd82] user: baruch branch: svn-import, size: 47709 | |
| 09:09 | Fix issue with branches having wrong parent. Needs cleanup file: [0fc2b96140] check-in: [5f4e2db949] user: baruch branch: svn-import, size: 47813 | |
|
2014-11-04
| ||
| 12:29 | Fix --filter option file: [47b489380d] check-in: [64c65816da] user: baruch branch: svn-import, size: 46779 | |
| 10:36 | Fix --flat option file: [c3c6963f3c] check-in: [57fa3896f3] user: baruch branch: svn-import, size: 46585 | |
|
2014-11-03
| ||
| 16:05 | Fix bugs with filter and with add+change in same commit file: [49d9f39783] check-in: [65dc40a1ed] user: baruch branch: svn-import, size: 46455 | |
| 14:50 | Fix bug when deleting whole folder file: [81ffb7d762] check-in: [05537c6fc0] user: baruch branch: svn-import, size: 46308 | |
|
2014-11-02
| ||
| 13:59 | Options to set trunk/branches/tags folder names and project repository root (filter). Various fixes file: [165ce4b476] check-in: [f67cb93fa6] user: baruch branch: svn-import, size: 45967 | |
|
2014-10-31
| ||
| 08:05 | Significant speed improvment file: [ae505b5143] check-in: [31b1e5a826] user: baruch branch: svn-import, size: 43622 | |
|
2014-10-28
| ||
| 12:19 | fix bug with multi-window svndiff file: [bf0fa26eb4] check-in: [ea54a29848] user: baruch branch: svn-import, size: 43894 | |
| 10:44 | Support version 3 format (diff dumps) file: [21b5fef636] check-in: [eb0bf08733] user: baruch branch: svn-import, size: 44174 | |
|
2014-10-27
| ||
| 08:19 | add support for tags file: [68765b51d3] check-in: [2889cdc36d] user: baruch branch: svn-import, size: 41330 | |
|
2014-10-26
| ||
| 14:16 | import branches file: [fa6589c12b] check-in: [c95c183e7b] user: baruch branch: svn-import, size: 40319 | |
|
2014-10-22
| ||
| 11:53 | Can now import full dump. Still only flat and only format 2. No tracking of file moves yet file: [a37a4f1444] check-in: [8d2e67512d] user: baruch branch: svn-import, size: 36562 | |
|
2014-10-21
| ||
| 15:00 | support copying files (no folders support yet) file: [a9f9b4b246] check-in: [0edbf144f3] user: baruch branch: svn-import, size: 35818 | |
| 14:41 | support for deleted files file: [b551120392] check-in: [3327886918] user: baruch branch: svn-import, size: 35638 | |
| 12:32 | prepare for svn branch importing file: [bff9f1fdc8] check-in: [bb1d783544] user: baruch branch: svn-import, size: 34952 | |
| 12:18 | fix manifest creation bugs file: [eda329bc58] check-in: [ffd61eedf5] user: baruch branch: svn-import, size: 34816 | |
| 09:22 | Very very basic svn-dump import. Can not handle anything realistic yet file: [b5e95aec39] check-in: [287cd78e27] user: baruch branch: svn-import, size: 34629 | |
|
2014-09-29
| ||
| 14:41 | merge trunk file: [5c93be3bc9] check-in: [2bd0ed05a3] user: baruch branch: svn-import, size: 25215 | |
|
2014-09-23
| ||
| 15:21 | Use strncmp() instead of memcmp() when comparing strings since memcmp() is not guaranteed to read bytes in order and hence might read past the zero-terminator of a string. file: [065b6bcb8b] check-in: [52cb240425] user: drh branch: trunk, size: 24999 | |
|
2014-09-15
| ||
| 11:52 | prepare for input from svn dumps file: [80e9d2b581] check-in: [6def3251d4] user: baruch branch: svn-import, size: 25192 | |
|
2014-08-15
| ||
| 09:24 | More style fixes, e.g. c/char const/const char/ file: [f115df2302] check-in: [38421a9c99] user: jan.nijtmans branch: trunk, size: 24976 | |
|
2013-12-22
| ||
| 20:38 | Fix indentation. file: [be7a31538a] check-in: [70b82e8cc5] user: dg branch: dg-timestamps, size: 25461 | |
|
2013-12-20
| ||
| 17:03 | Honour timezones in git fast-import dump timestamps. file: [e7bed6e6ae] check-in: [9c9e77676b] user: dg branch: mistake, size: 25431 | |
|
2013-10-04
| ||
| 09:30 | Better error-message in case of "manifest file is malformed" file: [e1b4641cbf] check-in: [1eb438d61a] user: jan.nijtmans branch: pending-review, size: 24976 | |
|
2013-07-14
| ||
| 22:21 | Improve the quoted path parsing and support more escape sequences. file: [9e7f15d053] check-in: [404d1a2554] user: isaac.jurado branch: git-better-import, size: 29356 | |
|
2013-07-07
| ||
| 19:23 | Implement the ability to generate delta manifests on import. file: [fc54d7cdae] check-in: [2844434ef5] user: isaac.jurado branch: git-better-import, size: 29059 | |
|
2013-06-25
| ||
| 20:21 | Remove the isFrom field from the ImportFile structure. file: [70fac4a4c6] check-in: [659825067f] user: isaac.jurado branch: git-better-import, size: 24600 | |
| 19:45 | Document the optional file argument of the import command. file: [8390b3fd91] check-in: [b0268d9856] user: isaac.jurado branch: git-better-import, size: 24914 | |
| 17:49 | Sort options alphabetically and show short options too. file: [55604a4bb4] check-in: [61fb03f961] user: isaac.jurado branch: git-better-import, size: 24847 | |
| 17:40 | Mention the --force option in import's help. file: [24c9dcef50] check-in: [08ed91a7b2] user: isaac.jurado branch: git-better-import, size: 24841 | |
|
2013-06-20
| ||
| 13:56 | Change return type of db_last_insert_rowid() to size_t. file: [9e24fdc607] check-in: [e1cb483a9b] user: jan.nijtmans branch: size_t-rcvid, size: 24979 | |
|
2013-06-17
| ||
| 21:44 | Changes from Isaac Jurado that record renames on an import from git. file: [2f61fcbfb4] check-in: [97d8a08ac9] user: drh branch: git-better-import, size: 24675 | |
|
2012-10-18
| ||
| 05:11 | dequote_git_filename: missing return type file: [ec3ecbbc8e] check-in: [ee424936da] user: jan.nijtmans branch: trunk, size: 24973 | |
|
2012-10-17
| ||
| 17:50 | It turns out that filenames in git-fast-export format can be quoted, if they contain special characters. Update the importer to dequote those names before trying to use them. file: [443173f2c5] check-in: [77cbe38af0] user: drh branch: trunk, size: 24985 | |
|
2012-09-18
| ||
| 03:21 | Add experimental support for copying the initial settings of a repository from another repository. file: [9ae0818577] check-in: [e771171c68] user: mistachkin branch: newTemplate, size: 24475 | |
|
2012-08-29
| ||
| 11:27 | fix for [01a2f3a346] file: [b61a6ef1cf] check-in: [0357ed556e] user: jan.nijtmans branch: msvc-broken, size: 24471 | |
|
2012-08-22
| ||
| 13:47 | new functions fossil_unicode_to_utf8 and fossil_utf8_to_unicode. Modify file_delete, file_tempname, fossil_getenv and fossil_fopen to use it, so now they can handle all unicode characters not only the ones from the mbcs This should allow all filenames and environment variables to contain unicode characters, without problems on WIN32. If main.c is compiled with -DUNICODE -D_UNICODE, then command line arguments allow unicode characters on win32 as well. Build system not adapted for that yet. file: [b79a02214f] check-in: [65c8ca0571] user: jan.nijtmans branch: eclipse-project, size: 24472 | |
|
2012-06-29
| ||
| 15:59 | Update to the latest SQLite4 that requires converting preprocessor macro prefixes from "SQLITE_" to "SQLITE4_". file: [40f65f42c9] check-in: [0328d68181] user: drh branch: sqlite4, size: 24466 | |
|
2012-06-27
| ||
| 12:30 | Begin a branch that is modified to use sqlite4 instead of sqlite3 as the storage engine. This check-in compiles (on unix) but does not work. file: [0de34095c5] check-in: [6823912746] user: drh branch: sqlite4, size: 24465 | |
|
2012-03-29
| ||
| 14:54 | Add vim modline everywhere file: [d3fdb20e16] check-in: [a496d8e88d] user: mgagnon branch: mgagnon_fix, size: 24507 | |
|
2011-11-14
| ||
| 00:13 | fossil import --incremental should set the appropriate ancestor for the first commit in each branch being added file: [5f96ac7d75] check-in: [c95d7a9c3d] user: steveb branch: steveb-fixes, size: 24671 | |
|
2011-09-14
| ||
| 00:32 | Begin streamline the online documentation to: * always include a short overview of the options supported by a given command, alphabetically sorted * reference similar/related commands with a final See also: section * Use ?x? for optional arguments * collapse supported options into ?OPTIONS? This is commit #1/n. file: [9951c27344] check-in: [3fbf8caa87] user: martin.weber branch: msw-docco, size: 24465 | |
|
2011-08-22
| ||
| 22:20 | Merge trunk. file: [38c89838f2] check-in: [c57830bec2] user: dmitry branch: symlinks, size: 24353 | |
|
2011-06-10
| ||
| 15:14 | When creating manifest files as part of a "fossil import" command, ensure that "T" cards are added in sorted order, and that there are no duplicates. file: [fd731ed08e] check-in: [6ed7ceb1de] user: dan branch: trunk, size: 23862 | |
|
2011-05-27
| ||
| 12:03 | Do not use strcmp() for comparison since the sort order can vary by locale. Use fossil_strcmp() instead. Ticket [3f0216560679fd41]. file: [1454967a1c] check-in: [32ad9a1584] user: drh branch: trunk, size: 23028 | |
|
2011-05-02
| ||
| 13:31 | Change calls to unlink() into file_delete(). The file_delete() routine converts filenames to MBCS from UTF if necessary. file: [38e5ccd5db] check-in: [eea6449098] user: drh branch: windows-i18n, size: 23021 | |
|
2011-04-27
| ||
| 18:21 | Attempt to get Fossil working on windows systems that do not use UTF8 in the shell. file: [464cb36ceb] check-in: [e805fa8db9] user: drh branch: windows-i18n, size: 23016 | |
|
2011-03-01
| ||
| 22:14 | Do not build clusters following an incremental import. file: [0ddd655aa2] check-in: [769e3d8e56] user: drh branch: trunk, size: 22974 | |
|
2011-02-22
| ||
| 21:14 | Do not print extraneous text about project-id and admin-user at the end of an incremental import. file: [aa2b4a7431] check-in: [691fccbaf7] user: drh branch: trunk, size: 22966 | |
| 21:09 | Add an --incremental option to the "import" command. file: [daaae4d889] check-in: [59ef7cb40c] user: drh branch: trunk, size: 22935 | |
|
2011-02-16
| ||
| 15:15 | Additional comments on the changes to deal with git-fast-export tagging, to try to better explain what Git is doing and how we are working around it. file: [1bf94be008] check-in: [352066b267] user: drh branch: trunk, size: 22739 | |
| 15:00 | Work around the seemingly buggy behavior of git-fast-export with regard to tags when doing an import. file: [33e961a840] check-in: [496aacd10e] user: drh branch: trunk, size: 21689 | |
|
2011-02-12
| ||
| 13:38 | This branch contains experimental changes attempting to address complaints that Fossil sometimes overwrites unmanaged files. In this checkin: Use file_delete() instead of unlink() everywhere. Add interfaces file_move() and file_dont_overwrite() but do not use those interfaces yet. file: [b17ca76bd6] check-in: [a1814d5015] user: drh branch: file-safety, size: 19208 | |
|
2011-02-07
| ||
| 18:02 | Ignore duplicate tags when interpreting git-fast-export text for import. file: [3749d786dc] check-in: [355bd99669] user: drh branch: trunk, size: 19203 | |
|
2011-01-28
| ||
| 19:04 | Add symlink support for Unix. New settings flag "allow-symlinks" controls this (off by default). file: [a767409173] check-in: [ed2ef7e9a3] user: dmitry branch: symlinks, size: 19674 | |
|
2011-01-26
| ||
| 20:38 | Add the fossil_strdup() utility function and use it instead of strdup(). file: [a8337fd114] check-in: [42f6e8bed7] user: drh branch: trunk, size: 19183 | |
|
2011-01-17
| ||
| 16:14 | Do not build clusters on a "rebuild" command unless the --cluster command-line option is used. But do build clusters on an "import" or a "reconstruct". file: [d3d5580078] check-in: [afc4bf41fa] user: drh branch: trunk, size: 19190 | |
|
2011-01-12
| ||
| 01:57 | On the "import" command, when the "from" commit is implied, be sure to load all of the files of the implied "from" commit prior to processing the changes. file: [0ace3764dd] check-in: [b1cbae5de4] user: drh branch: trunk, size: 19187 | |
|
2011-01-11
| ||
| 23:47 | For the "import --git" command, if a new commit omits the "from" field, then make it a child of the previous commit if the two are on the same branch. file: [1dbd5488bf] check-in: [25201dd86f] user: drh branch: trunk, size: 19187 | |
|
2010-12-23
| ||
| 02:22 | Add new function fossil_strcmp() that works like strcmp() except that it handles NULL arguments correctly. Use fossil_strcmp() in place of strcmp() in many places in the code. file: [ae713391c7] check-in: [31c52c7b3e] user: drh branch: trunk, size: 18529 | |
|
2010-12-11
| ||
| 00:28 | Update the git fast-export importer so that it is able to handle filenames with spaces - or at least to the extent that the fast-export format is able to deal with such filename. Ticket [4ee4aa5a30733a] file: [60a5ff0f90] check-in: [35aa6f8188] user: drh branch: trunk, size: 18533 | |
|
2010-12-09
| ||
| 20:48 | Fix a typo in the help text for "fossil import". Ticket [e8a6bfa54e0c3] file: [f85e38c490] check-in: [973a6b1ee8] user: drh branch: trunk, size: 18113 | |
|
2010-12-03
| ||
| 21:06 | Fix typo in import/export documentation (ticket [a66760daeecca231d84]). Add flexibility to the command-line options to import/export to accommodate future enhancements. file: [f6bea347ab] check-in: [1b53667d28] user: drh branch: trunk, size: 18113 | |
|
2010-11-17
| ||
| 13:15 | Set binary translation mode on windows for import and export. Ticket [feeb8a91eb838f743ae9] file: [c430fed5bf] check-in: [b408ece7f6] user: drh branch: trunk, size: 17850 | |
|
2010-11-16
| ||
| 18:02 | Additional fixes to the "fossil import" command. Correct handling of zero-length content files. Correct handling of merges with no new or modified files. file: [f21d03c197] check-in: [3873aa7ecb] user: drh branch: trunk, size: 17821 | |
| 04:18 | Fix a bug in the Git import routine. file: [f2d5213155] check-in: [9c31866404] user: drh branch: trunk, size: 17765 | |
|
2010-11-11
| ||
| 13:36 | Fix the "fossil import" command so that it correctly handles cases where a file is deleted then replaced by a directory with the same name. file: [f0659c25c7] check-in: [e5a734a19a] user: drh branch: trunk, size: 17705 | |
|
2010-11-10
| ||
| 21:00 | Fix a bug in processing of "merge" records for "fossil import". file: [c653dcc189] check-in: [6b76effa92] user: drh branch: trunk, size: 17206 | |
| 20:56 | Improved handling of branches and tags in the "fossil import" command. file: [398e994dea] check-in: [b2f637510a] user: drh branch: trunk, size: 17206 | |
| 13:36 | Fix the "divider" lines in the timeline display. Add the --force option to the "import" command. file: [f5de9c52a6] check-in: [ef68b04449] user: drh branch: trunk, size: 16360 | |
| 00:43 | The "fossil import" command works well enough to import the Git self-hosting repository. There are still issues and no doubt many bugs yet to be found. But this is a good start. file: [d68e1db933] check-in: [6c827ff02e] user: drh branch: trunk, size: 16272 | |
|
2010-11-09
| ||
| 18:15 | Partial implementation of the "fossil import" command. It is incomplete and does not work. file: [810745413a] check-in: [ba837f5e88] user: drh branch: trunk, size: 10336 | |
|
2010-11-08
| ||
| 19:00 | Added: Begin adding "import" and "export" commands for converting repositories from and to the Git format. The "export" command currently generates output but is not quite correct. The "import" command is still a stub. file: [f359c7db12] check-in: [b3fd32f925] user: drh branch: experimental, size: 1110 | |