Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
History of file src/branch.c at check-in 9659ed66f83f8952
|
2013-08-18
| ||
| 04:22 | Add CSS class to anchor for open leaves for consistency. file: [64b9b4bca8] check-in: [8ad0a8796a] user: andybradford branch: pending-review, size: 13569 | |
|
2013-07-12
| ||
| 12:39 | Better error reporting using fossil_error mechanism. file: [9bd7a36b2c] check-in: [97b47ddadf] user: jan.nijtmans branch: tkt-change-hook, size: 13538 | |
|
2013-07-11
| ||
| 11:58 | First shot at better error-reporting. file: [108f189ea1] check-in: [0dbaf29294] user: jan.nijtmans branch: tkt-change-hook, size: 13564 | |
| 10:46 | Don't allow "tktnew" and "tktedit" pages or the "Common" hook to use the "http" command any more. Don't let "fossil rebuild" run any hooks. file: [9c7526e97e] check-in: [57d1d2811b] user: jan.nijtmans branch: tkt-change-hook, size: 13556 | |
|
2013-04-23
| ||
| 08:40 | Add --limit as alias to --count in "fossil timeline" for consistancy with other commands. Add many short options, like "-a" for "--all" and "-c" for "--closed" (The JSON part already had those) file: [654edeb040] check-in: [8b17c2360a] user: jan.nijtmans branch: trunk, size: 13533 | |
|
2012-11-20
| ||
| 02:05 | Show much less output on a sync operation, unless the --verbose flag is given. file: [0481ffeeb3] check-in: [407cd4c534] user: drh branch: less-verbose-sync, size: 13489 | |
|
2012-10-28
| ||
| 21:38 | - finally, do the ++j update in looks_like_text() right - More consistancy in prompt handling: accept Capitals everywhere, use '(' not '[', and abbreviate yes/no to y/N everywhere file: [b579ae9262] check-in: [7c527165a6] user: jan.nijtmans branch: trunk, size: 13493 | |
|
2012-09-24
| ||
| 09:03 | modified fix for [c8c0b78c84], which no longer causes "Usage" printouts to use the full fossil path, even though the command line didn't use the full path file: [347981c710] check-in: [dacc694615] user: jan.nijtmans branch: trunk, size: 13441 | |
|
2012-09-02
| ||
| 19:39 | <pre>Minor additional fixes related to [c8c0b78c84]: - Use _wsystem() in stead of system() on Windows - Use g.argv[0] in stead of fossil_nameofexe() where only printing is involved - Use fossil_nameofexe() where fossil_system() is involved - Move the determination of the full windows path to fossil_nameofexec, so g.argv[0] can always be the unmodified argv[0] - g.argv[0] and fossil_nameofexec() are in utf-8, so we cannot use fprintf directly. Exception: when printing malloc errors.</pre> file: [1d11faa887] check-in: [be06861f3c] user: jan.nijtmans branch: ticket-c8c0b78c84, size: 13451 | |
|
2012-08-29
| ||
| 13:03 | merge trunk file: [7bb266c1af] check-in: [e9f38ae8ab] user: jan.nijtmans branch: utf8-in-sources, size: 13456 | |
|
2012-08-22
| ||
| 20:19 | Make use of %q instead of %s to avoid SQL injections. file: [3df909076f] check-in: [e766df0a69] user: drh branch: trunk, size: 13460 | |
|
2012-06-29
| ||
| 15:59 | Update to the latest SQLite4 that requires converting preprocessor macro prefixes from "SQLITE_" to "SQLITE4_". file: [57523c9edf] check-in: [0328d68181] user: drh branch: sqlite4, size: 13464 | |
|
2012-04-28
| ||
| 07:15 | Changes anchor tags (<a>) so that the href= attribute can be set by javascript rather than by HTML. This is to make it harder for spiders to follow the hyperlinks to every diff and annotation in the project history. It all seems to work, but it needs further testing and review before going live. file: [1aa724b4bc] check-in: [8ae52fc418] user: drh branch: spider-defense, size: 13460 | |
|
2012-04-16
| ||
| 15:53 | Document some more options of fossil branch new: --nosign, --user-override and --date-override. Fix a typo in fossil branch ls docco. file: [4b146c5df2] check-in: [7727eb12b0] user: martin.weber branch: msw-docco, size: 13535 | |
|
2012-02-04
| ||
| 00:30 | Make sure the "branch new --private" command does not create a public BLOB that is a delta of a private BLOB. Also, when doing a file clone or when doing "scrub --private", double-check that no public BLOBs are deltas of private BLOBs before deleting the private BLOBs. file: [c1037d47c5] check-in: [034e887c35] user: drh branch: trunk, size: 13308 | |
|
2011-09-21
| ||
| 18:55 | s/branch_prepare_query/branch_prepare_list_query/g file: [60b8906d05] check-in: [267739dd20] user: stephan branch: json, size: 13285 | |
| 18:20 | Refactored prepareBranchStatement() to simplify its usage, get rid of ambiguous arg handling, and allow the caller to specify the priority of the all-vs-closed-vs-opened decision. Made it non-static and renamed to branch_prepare_statement() for re-use in /json/branch/list. file: [cd233bce73] check-in: [5a81a5ead6] user: stephan branch: json, size: 13270 | |
| 18:10 | Minor timeline output cleanups. Added /json/branch/list. file: [98db5ace28] check-in: [f266ebdd3f] user: stephan branch: json, size: 13086 | |
|
2011-09-14
| ||
| 17:45 | Refactored g.okXXX perms flags to g.perm.XXX. file: [21dafe02b1] check-in: [34b4dec0bc] user: stephan branch: stephan-hack, size: 13093 | |
| 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: [8e3e0b2a5c] check-in: [3fbf8caa87] user: martin.weber branch: msw-docco, size: 13081 | |
|
2011-08-26
| ||
| 14:49 | Add the colortest query parameter to the brlist webpage. file: [cd6cea2fb8] check-in: [d0daac20da] user: drh branch: trunk, size: 12981 | |
|
2011-08-23
| ||
| 15:14 | Do not auto-push when creating a new private branch. Ticket [13fd567b51fac8] file: [a43850840d] check-in: [649efeb43d] user: drh branch: trunk, size: 12395 | |
|
2011-07-19
| ||
| 23:10 | Enhance the branch command and the branch www page so that they can show all branches. The branch command can now also show closed branches. Ticket [2adfb697fda1b2]. file: [d8e0bad7da] check-in: [ebeaf3ae26] user: drh branch: trunk, size: 12378 | |
|
2011-06-01
| ||
| 22:32 | In contexts where only a check-out makes since, only resolve tags or branch names into check-outs, not events or other artifacts. Ticket [5f611295e3c2a8]. file: [e1b5203400] check-in: [2a013f0228] user: drh branch: trunk, size: 11589 | |
|
2011-05-24
| ||
| 12:00 | Merge the latest trunk changes into the arjen-doc-updates branch. file: [e78c5ffef4] check-in: [5d4ef37a9d] user: drh branch: arjen-doc-updates, size: 11749 | |
|
2011-05-06
| ||
| 16:55 | Merge the latest trunk changes into windows-i18n branch. file: [94e523df0b] check-in: [59ddd3c8ae] user: drh branch: windows-i18n, size: 11577 | |
|
2011-05-04
| ||
| 13:56 | When listing closed branches, only show a branch if every leaf of that branch is closed. file: [511f26129b] check-in: [74c86dd1da] user: drh branch: trunk, size: 11559 | |
|
2011-04-27
| ||
| 18:21 | Attempt to get Fossil working on windows systems that do not use UTF8 in the shell. file: [b9fefdcc55] check-in: [e805fa8db9] user: drh branch: windows-i18n, size: 11227 | |
|
2011-04-26
| ||
| 06:37 | Online help for several commands edited - as found in allrepo.c, bisect.c, branch.c and checkin.c. Note: "commit" still to be edited file: [775172787d] check-in: [e66fe70c7f] user: Arjen Markus branch: arjen-doc-updates, size: 11381 | |
|
2011-03-26
| ||
| 12:53 | Add the --private option to the "fossil branch new" command. Give a default orange color to private branches created by "fossil branch new". If the new branch created by "fossil branch new" is off of a private branch, make the new branch private too. Ticket [e24ec32b1da5f8f5e4abe] file: [f05733e712] check-in: [2b33781694] user: drh branch: trunk, size: 11209 | |
|
2011-03-16
| ||
| 04:12 | "ls" alias to "list" subcommand of "fossil branch" command. file: [ec7cd6b196] check-in: [302213ed12] user: bharder branch: trunk, size: 10847 | |
| 02:31 | Fix the "branch new" command so that it works if the parent omits the R-card. Ticket [3bfff6e03bcc5f14] file: [151b4fed49] check-in: [448dc5adf7] user: drh branch: trunk, size: 10780 | |
|
2011-02-24
| ||
| 17:11 | Infrastructure changes: Simplify content_put() to a single parameter. Add content_put_ex() with lots of extra parameters. Add isPrivate parameters to content_put_ex() and content_new(). file: [41ee31fccc] check-in: [1b4516168d] user: drh branch: trunk, size: 10745 | |
|
2011-02-17
| ||
| 20:44 | Make sure manifest_crosslink() resets its input blob and that callers know this and do not attempt to reuse that blob. file: [72db73c23f] check-in: [d22519e500] user: drh branch: trunk, size: 10754 | |
|
2011-01-28
| ||
| 20:56 | Add a new meta-data table named LEAF that holds a precomputed set of all leaves in the checkin DAG. Use this precomputed table rather than trying to compute the LEAFs on the fly, as a performance enhancement for repositories with many checkins. A rebuild is required. file: [e5a961ca7e] check-in: [69f43fc077] user: drh branch: experimental, size: 10718 | |
| 14:09 | Add hyperlinks to the "user:" and "tags:" marks in timelines. file: [99f393dce6] check-in: [13165785e1] user: drh branch: trunk, size: 10962 | |
|
2011-01-07
| ||
| 16:20 | Record fractional seconds for artifact times. file: [26f8dae2f3] check-in: [722d7cac97] user: drh branch: trunk, size: 10956 | |
|
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: [afc04e984c] check-in: [31c52c7b3e] user: drh branch: trunk, size: 10975 | |
|
2010-12-16
| ||
| 14:46 | Use relative URLs for hyperlinks whereever possible, so that Fossil can work better behind a reverse proxy. file: [26a10ec1a6] check-in: [daeb10f65f] user: drh branch: trunk, size: 10968 | |
|
2010-12-09
| ||
| 15:52 | New cloning algorithm appears to be much faster at the cost of slightly more network bandwidth. Fully backwards compatible. Need to look at the network bandwidth issue prior to merging with trunk. Perhaps a command-line option for the clone command to select between slow-and-small or fast-and-larger. file: [1897aaa83c] check-in: [8bb8be26ca] user: drh branch: experimental, size: 10976 | |
|
2010-11-26
| ||
| 18:37 | Report an error if the repository schema version does not match what the fossil executable expects. file: [9089c6e9b2] check-in: [c0c3d92340] user: drh branch: trunk, size: 10973 | |
|
2010-11-13
| ||
| 23:45 | Change the "branch list" command to provide output more like Git. file: [2e524db72b] check-in: [761a6a9dcf] user: drh branch: trunk, size: 10967 | |
|
2010-11-12
| ||
| 21:51 | Add the fossil_nameofexe() function to use in place of g.argv[0]. file: [fe8ff8242b] check-in: [a04a650870] user: drh branch: trunk, size: 10557 | |
|
2010-10-27
| ||
| 19:56 | Fix a NULL-pointer dereference in "branch new". Ticket [a4a9f45b67cbbcf26]. file: [9f5ffe2ff5] check-in: [ff79f97a07] user: drh branch: trunk, size: 10548 | |
|
2010-10-25
| ||
| 13:52 | Redesign the control-artifact and manifest parser to run faster. file: [0a60e18d6f] check-in: [fa0ea2c3fa] user: drh branch: experimental, size: 10521 | |
|
2010-10-17
| ||
| 17:25 | Add the ability to parse and use manifests with the B-card. Add documentation for the B-card. file: [9e93bde709] check-in: [ec56d8ff58] user: drh branch: experimental, size: 10524 | |
|
2010-10-15
| ||
| 20:37 | Refactor the control-artifact parser. file: [e7b4fb209a] check-in: [da9fcdc95a] user: drh branch: experimental, size: 10485 | |
|
2010-10-01
| ||
| 18:02 | Allow fossil branch new --date-override 'YYYY-MM-DD HH:MM:SS' --user-override user thebranch checkin To aid in importing historic data from other scm's file: [16c61e6dda] check-in: [2cc6fd9107] user: renez branch: trunk, size: 10567 | |
|
2010-09-13
| ||
| 22:14 | Avoid the use of tabs. Make sure lines do not exceed 80 characters. file: [af2294d526] check-in: [4cc0ebef9a] user: drh branch: wolfgangFormat2CSS, size: 10327 | |
|
2010-09-10
| ||
| 20:19 | fixed many HTML-validator errors and moved more formats to CSS - tested on firefox and IE file: [53b9d1434a] check-in: [d1305d0a7a] user: wolfgang branch: wolfgangFormat2CSS, size: 10312 | |
|
2010-09-08
| ||
| 20:25 | css for hyperlinks disabled file: [f47713387e] check-in: [0e394b8fa2] user: wolfgang branch: wolfgangFormat2CSS, size: 10308 | |
| 19:26 | reduced html validator errors on branch page file: [1d7aad0714] check-in: [156358e296] user: wolfgang branch: wolfgangFormat2CSS, size: 10200 | |
|
2010-09-05
| ||
| 10:59 | sidebox via css file: [7d447e9462] check-in: [ff3b6b323b] user: Ratte branch: stv-skinning, size: 10207 | |
|
2010-08-15
| ||
| 19:57 | The "Branches" menu option shows only open branches. Closed branches are accessible from a hyperlink. file: [1a43c41864] check-in: [518439507a] user: drh branch: trunk, size: 10210 | |
|
2010-07-08
| ||
| 17:53 | Take care to close the connection to the database file before existing. This gives the database a chance to clean up (and, for example, delete WAL and shared-memory files). file: [ebef8eb082] check-in: [932825bc6a] user: drh branch: trunk, size: 10183 | |
|
2010-06-16
| ||
| 20:33 | On a branch timeline, in addition to showing the checkins of the branch, also show check-ins of other branches that merge into or from the branch being displayed. This helps to show what has happened to an infrequently changing branch which is part of a much more active project. file: [3f11f754a6] check-in: [6752934026] user: drh branch: trunk, size: 10176 | |
|
2010-05-16
| ||
| 19:08 | Change from GPL to the Simplified BSD License. file: [91b3556a6e] check-in: [c06edd231f] user: drh branch: clear-title, size: 10176 | |
|
2010-04-02
| ||
| 20:09 | Merge all recent trunk changes into the clear-title branch (since we hold clear title on all recent changes.) file: [afc0d0a5c7] check-in: [64541535d9] user: drh branch: clear-title, size: 10452 | |
|
2010-03-31
| ||
| 15:27 | Update the mechanism for reporting SQL that does not use indices. The warnings can be suppressed by comments in the SQL text. file: [3e9d5c03a5] check-in: [9f1d490dd6] user: drh branch: trunk, size: 10454 | |
|
2010-01-19
| ||
| 18:11 | Start a new branch that strives to contain only code for which we hold clear title. file: [af30bbd4c3] check-in: [ab0a0d7640] user: drh branch: clear-title, size: 10435 | |
|
2009-12-10
| ||
| 02:25 | reserve the use of brackets in stdout for artifacts file: [80adbdb5e4] check-in: [5bccc5a526] user: rwilson branch: trunk, size: 10436 | |
|
2009-02-09
| ||
| 04:41 | 'fossil' encode tagnames for manifest (for ticket 15f49be6b2b1e) (allows for tags with spaces in name) file: [3ef4b504fa] check-in: [8be6204607] user: bharder branch: trunk, size: 10436 | |
|
2009-01-24
| ||
| 23:40 | correct 'branch' subcommand usage string file: [e6d1392f9d] check-in: [8b6cf431fb] user: bch branch: trunk, size: 10436 | |
| 00:11 | Add a "nomenclature" sidebox for the Branches page, explaining the difference between an open and a closed branch. file: [76b93505eb] check-in: [83ac468aae] user: drh branch: trunk, size: 10443 | |
|
2009-01-23
| ||
| 23:57 | Make the distinction between open and closed branches. An open branch is a branch with one or more open leaves. Show open and closed branches separately on the "Branches" webpage. file: [f230ea602b] check-in: [9659ed66f8] user: drh branch: trunk, size: 9942 | |
|
2009-01-22
| ||
| 13:08 | Reenable the "Tags" menu item, but make it go to the new "taglist" page. Also add separate "tagtimeline" page and separate "brlist" into "brlist" and "brtimeline". file: [806b04e089] check-in: [a12cb216b7] user: drh branch: trunk, size: 9165 | |
| 12:03 | Change the way branches are tagged: The value of the "branch" property is used to identify the branch name. Repository rebuild required. Also, branches must be retagged. file: [4a024d4405] check-in: [42c2a18e73] user: drh branch: trunk, size: 9058 | |
|
2009-01-21
| ||
| 23:40 | Track the origin of tags and display that origin in the tag and properities information field of the "vinfo" page. Must "fossil rebuild" after this change. file: [ffbb452f74] check-in: [08db9e11cb] user: drh branch: trunk, size: 9020 | |
| 18:59 | Add timeline links on the leaves page. Also on the leaves page, do not show Merge labels on check-ins. The second part is the fix for ticket [d6bb26f436d8299f95d63f45fa51c92acdc91c5a]. file: [df727f7105] check-in: [2fa4df1e47] user: drh branch: trunk, size: 8148 | |
| 18:42 | Improvements to the timeline when displaying check-ins with a given tag. file: [dc15e48baa] check-in: [e631d8af6d] user: drh branch: trunk, size: 8152 | |
| 03:34 | After each item of the branch list, give a hyperlink to the timeline that shows all check-ins with the branch tag. file: [ccb39ffef0] check-in: [bdcac62937] user: drh branch: trunk, size: 8196 | |
| 01:23 | Suppress the display of the artificate ID on the timeline which showing changes to wiki or tickets. file: [dc5b99a321] check-in: [580d6ad8c7] user: drh branch: trunk, size: 7473 | |
|
2009-01-20
| ||
| 23:39 | On the "vinfo" page, add a link to a timeline of all other check-ins with the same tag. file: [124ac5fc7f] check-in: [fecb3e5cc9] user: drh branch: trunk, size: 7467 | |
| 22:38 | Require that the "branch new" command specify a basis. Do not let it use the current check-out. Otherwise it gets confusing to users. file: [a8d6e457d2] check-in: [4d39bbac10] user: drh branch: trunk, size: 6883 | |
| 22:21 | Add web-based branch color changer. Add the "branch list" command. Simplifications to color propagation logic. file: [6b0cfa07af] check-in: [b7f32a71ab] user: drh branch: trunk, size: 7063 | |
| 16:51 | Attempting to rationalize the tagging and branching logic. The "branch" command has been resurrected and appears to work now. The "tag branch" command has been removed. Special tags "newbranch" and "closed" used to manage branches. New changes are not well-tested - use with caution. You must "rebuild" when upgrading through this version. file: [85e459979d] check-in: [b6e22e62cf] user: drh branch: trunk, size: 6823 | |
|
2008-07-25
| ||
| 12:30 | Disable the "branch" command pending further discussion and clarification of its purpose and intent. file: [ff6e350782] check-in: [f6d3d89e76] user: drh branch: trunk, size: 6120 | |
|
2008-05-05
| ||
| 17:24 | Add the ability to modify global settings (such as the proxy setting) even when there are no repositories defined. file: [dcb06f995d] check-in: [4e683ef07b] user: drh branch: trunk, size: 6012 | |
|
2008-02-09
| ||
| 00:11 | Issue a warning after a commit if the commit causes a fork. file: [c6483e4ed6] check-in: [49b59bc559] user: drh branch: trunk, size: 6011 | |
|
2008-02-08
| ||
| 21:50 | Fix the branch subcommand so that the branch name tags it creates begin with "sym-". file: [40033fd3ad] check-in: [ce08928aaa] user: drh branch: trunk, size: 5999 | |
|
2008-02-07
| ||
| 10:33 | typo fix file: [b16668e4cd] check-in: [66b13f1015] user: bch branch: trunk, size: 6163 | |
|
2007-10-07
| ||
| 14:38 | Fixed omitsign discrepancies. Windows version now looks for USERNAME instead of USER when creating new database. file: [e4e607578f] check-in: [a21806dcf3] user: jnc branch: trunk, size: 6162 | |
|
2007-09-26
| ||
| 04:17 | Added safemerge option to commit, update and settings file: [efd61694e3] check-in: [41561125cd] user: jnc branch: trunk, size: 6163 | |
|
2007-09-25
| ||
| 20:23 | Updates to the autosync logic. Add the "setting" command. file: [6f4b5c89ef] check-in: [fff234b77c] user: drh branch: trunk, size: 6165 | |
| 07:19 | Autosync is now working. Added autosync to tag add, tag branch and branch create. file: [1d4c15b285] check-in: [e4517465f3] user: jnc branch: trunk, size: 6221 | |
|
2007-09-23
| ||
| 18:24 | Added RSS feed. You can set the RSS title, description in Setup. Added header to style to include title and pointer to the new RSS feed. The new RSS feed is BaseURL/timeline.rss file: [97ebfed53d] check-in: [07eaead5dc] user: jnc branch: trunk, size: 6105 | |
| 15:02 | Branching now working correctly, including adding of bgcolor tag and correct R line file: [c0919d6b52] check-in: [2ad378d065] user: jnc branch: trunk, size: 6074 | |
| 03:21 | Forgot a line of debug code, writting manifest.new... now removed file: [3a849760c1] check-in: [17596784d0] user: jnc branch: trunk, size: 5872 | |
| 03:13 | Added: fossil branch command added. Base branch new works. Specifying a color causes a malformed manifest file error. branch list does not work, just skeleton code right now. file: [5720860916] check-in: [b8a8959ec5] user: jnc branch: trunk, size: 5905 | |