Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix for lablgtk >= 2.18.6 | daviddavid | 2018-02-26 | 1 | -2/+2 |
| | |||||
* | Merge pull request #152 from g-raud/uitext-tweak-actions | Benjamin Pierce | 2018-02-09 | 1 | -2/+6 |
|\ | | | | | Uitext: some more actions and tweaks | ||||
| * | Uitext: print the number of items skipped for "forward" and "backward" | G.raud | 2018-02-06 | 1 | -2/+6 |
| | | |||||
* | | Merge pull request #158 from bcpierce00/update-docs | Benjamin Pierce | 2018-02-09 | 1 | -0/+17 |
|\ \ | | | | | | | Add some recent improvements | ||||
| * | | Add some recent improvements | Benjamin Pierce | 2018-02-09 | 1 | -0/+17 |
| | | | |||||
* | | | Merge pull request #157 from g-raud/better-server-failure | Benjamin Pierce | 2018-02-09 | 1 | -4/+6 |
|\ \ \ | | | | | | | | | Improve server failure message | ||||
| * | | | Main: catch and transform exception IllegalValue from the server into Fatal | G.raud | 2018-02-08 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This catches a discrepancy between server and client in the parsing of a preference string and prints the error instead of the backtrace. Even if such a discrepancy is probably best avoided by incompatible version numbers, it could occur between development versions with the same version, or because of a mistake or a local backport of new features. | ||||
| * | | | Main: make it clear that it is the server that fails | G.raud | 2018-02-08 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #148 from g-raud/uarg-fix-parse-cli-options | Benjamin Pierce | 2018-02-09 | 4 | -15/+26 |
|\ \ \ \ | |_|/ / |/| | | | Uarg: fix the parsing of command line options' arguments | ||||
| * | | | Prefs.parseLines: factorize by calling Util.splitAtFirstChar | G.raud | 2018-02-05 | 1 | -10/+9 |
| | | | | |||||
| * | | | Uarg: do not discard an empty value following the option | G.raud | 2018-02-02 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change makes command line arguments of the form "-option=" "val" considered equivalent to "-option" "" "val" but not to "-option" "val" anymore. The only function changed is Util.splitAtFirstChar. | ||||
| * | | | Uarg: fail cleanly when a value to an option has not the expected type | G.raud | 2018-02-02 | 1 | -3/+6 |
| | | | | |||||
| * | | | Uarg: fix parsing of equal sign '=' following command line option names | G.raud | 2018-02-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change makes the parser only take a single '=' as delimiter after an option name and lets it consider as valid other '=' in the value to the option. Splitting the argument with Util.splitAtFirstChar instead of Util.splitIntoWords also disables parsing of the escaping backslash in the option. | ||||
| * | | | Util.splitAtFirstChar: new function | G.raud | 2018-02-01 | 2 | -0/+9 |
| |/ / | |||||
* | | | Merge pull request #149 from g-raud/logfile-relative-to-home | Benjamin Pierce | 2018-02-09 | 3 | -2/+9 |
|\ \ \ | | | | | | | | | 'logfile': when relative path then root to home | ||||
| * | | | Update trace.ml | Benjamin Pierce | 2018-02-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | Trace: root a relative logfile parameter to home and not to cwd | G.raud | 2018-02-01 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old behaviour is wrong because: - first the current working directory can be anywhere with no relation whatsoever to unison so unison may corrupt an existing file; - secondly it can change between each run so that the log is scattered. The change enables the home directory not to be hardcoded which is desirable as the home directory can sometimes change. Also update the documentation string of logfile. | ||||
| * | | | Util.fileMaybeRelToHomeDir: new function | G.raud | 2018-02-01 | 2 | -0/+6 |
| |/ / | |||||
* | | | Merge pull request #154 from g-raud/uitext-matching-boolean-rpn | Benjamin Pierce | 2018-02-09 | 1 | -115/+325 |
|\ \ \ | | | | | | | | | Uitext: add RPN boolean operations on matching conditions | ||||
| * | | | Uitext: new action "pop" to pop a matching condition | G.raud | 2018-02-05 | 1 | -2/+8 |
| | | | | |||||
| * | | | Uitext: new actions "and" and "or" taking last 2 match in RPN style | G.raud | 2018-02-05 | 1 | -0/+12 |
| | | | | |||||
| * | | | Uitext.interact: enable setripred to also unset and modify ripred | G.raud | 2018-02-05 | 1 | -27/+25 |
| | | | | |||||
| * | | | Uitest.interact: save previous ripred when setting a new one | G.raud | 2018-02-05 | 1 | -4/+3 |
| | | | | |||||
| * | | | Uitext.interact: make !ripred a list instead of an option | G.raud | 2018-02-05 | 1 | -11/+11 |
| | |/ | |/| | |||||
| * | | Uitext: new action "backward" | G.raud | 2018-02-05 | 1 | -4/+10 |
| | | | |||||
| * | | Uitext: new action "forward" | G.raud | 2018-02-05 | 1 | -0/+11 |
| | | | |||||
| * | | Uitext: add some shortcuts to actions that match | G.raud | 2018-02-05 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | - '=' in addition to 'P' for matching unchanged paths. - '*' in addition to 'A' for matching all paths. - '$' in addition to 'U' for disabling matching. | ||||
| * | | Uitext: print some messages when changing match | G.raud | 2018-02-05 | 1 | -7/+13 |
| | | | |||||
| * | | Uitext: new action "changed" to resolve to the detriment of props changes | G.raud | 2018-02-04 | 1 | -0/+6 |
| | | | |||||
| * | | Uitext.interact: new subfunction setdirchanged | G.raud | 2018-02-04 | 1 | -0/+9 |
| | | | |||||
| * | | Uitext: make action "invert" print an message if change impossible | G.raud | 2018-02-03 | 1 | -1/+3 |
| | | | |||||
| * | | Uitext.interact: in actOnMatching replace option discard with fail | G.raud | 2018-02-03 | 1 | -4/+7 |
| | | | |||||
| * | | Uitext: prevent action "invert" from going next if direction not inverted | G.raud | 2018-02-03 | 1 | -0/+1 |
| | | | |||||
| * | | Uitext.interact: in actOnMatching let returned bool decide whether to go next | G.raud | 2018-02-03 | 1 | -3/+6 |
| | | | |||||
| * | | Uitext.interact: add an option discard to actOnMatching | G.raud | 2018-02-03 | 1 | -4/+4 |
| | | | |||||
| * | | Uitext: new action "invert" to invert the propagation direction | G.raud | 2018-02-03 | 1 | -0/+4 |
| | | | |||||
| * | | Uitext.interact: new subfunction invertdir | G.raud | 2018-02-03 | 1 | -0/+6 |
| | | | |||||
| * | | Uitext: add a few vi-like keybindings | G.raud | 2018-02-03 | 1 | -3/+3 |
| | | | |||||
| * | | Uitext: new action to match PropsChanged | G.raud | 2018-02-03 | 1 | -0/+5 |
| | | | |||||
| * | | Uitext.interact: new subfunction ispropschanged | G.raud | 2018-02-03 | 1 | -0/+7 |
| | | | |||||
| * | | Uitext: fix for actions "details" and "diff" (do not go next and print newline) | G.raud | 2018-02-03 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | "details" needs a fresh newline to display info and "diff" may print an error message. | ||||
| * | | Uitext.interact: tweak actOnMatching to accept functions that display | G.raud | 2018-02-03 | 1 | -4/+13 |
| | | | |||||
| * | | Uitext: new action "not" to invert the match condition | G.raud | 2018-02-03 | 1 | -0/+7 |
| | | | |||||
| * | | Uitext: new actions "start" and "end" to go to start or end of list | G.raud | 2018-02-03 | 1 | -0/+10 |
| | | | |||||
| * | | Uitext: let list actions list only matching items | G.raud | 2018-02-02 | 1 | -4/+7 |
| | | | |||||
| * | | Uitext.interact: document which actions operate on matching items | G.raud | 2018-02-02 | 1 | -9/+9 |
| | | | |||||
| * | | Uitext: new actions "1" and "2" to match according to direction | G.raud | 2018-02-02 | 1 | -0/+16 |
| | | | |||||
| * | | Uitext: let "skip" and "discard" operate on matching items | G.raud | 2018-02-02 | 1 | -9/+8 |
| | | | |||||
| * | | Uitext: let "newer" and "older" operate on matching items | G.raud | 2018-02-02 | 1 | -9/+6 |
| | | | |||||
| * | | Uitext: let setting of direction operate on matching items | G.raud | 2018-02-02 | 1 | -9/+5 |
| | | | |||||
| * | | Uitext: let "revert" and "merge" operate on matching items | G.raud | 2018-02-02 | 1 | -5/+6 |
| | | | |||||
| * | | Uitext: let "diff" and "details" operate on matching items | G.raud | 2018-02-02 | 1 | -7/+6 |
| | | | |||||
| * | | Uitext: new actions to match against following items | G.raud | 2018-02-02 | 1 | -0/+26 |
| | | | |||||
| * | | Uitext.interact: new subfunction actOnMatching | G.raud | 2018-02-02 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | A subfunction to do an action on the current item then repeat or to do an action on a subset of the following items that matches a mutable predicate and filter them. | ||||
| * | | Uitext.interact: improve menu order (skip after reconcile) | G.raud | 2018-02-02 | 1 | -11/+11 |
| | | | |||||
| * | | Uitext.interact: improve menu order (list edit towards the end) | G.raud | 2018-02-02 | 1 | -23/+23 |
| | | | |||||
| * | | Uitext.interact: improve menu order (moving at the top) | G.raud | 2018-02-02 | 1 | -14/+14 |
| | | | |||||
| * | | Uitext.interact: improve menu order (info at the top) | G.raud | 2018-02-02 | 1 | -25/+25 |
| | | | |||||
| * | | Uitext.interact: improve menu order (quitting at the end) | G.raud | 2018-02-02 | 1 | -13/+13 |
| | | | |||||
| * | | Uitext.selectAction: improve menu descriptions (be consistent with interact) | G.raud | 2018-02-02 | 1 | -2/+2 |
| | | | |||||
| * | | Uitext.interact: improve menu descriptions | G.raud | 2018-02-02 | 1 | -4/+4 |
| | | | |||||
| * | | Uitext: new action to revert then go back | G.raud | 2018-02-02 | 1 | -0/+7 |
| | | | |||||
| * | | Uitext: new action "revert" (as in Uigtk2) | G.raud | 2018-02-02 | 1 | -0/+5 |
| | | | |||||
| * | | Uitext: new action "next" | G.raud | 2018-02-02 | 1 | -1/+5 |
| | | | | | | | | | | | | Remove the shortcut "n" from the "stop" action. | ||||
| * | | Uitext: new actions to skip or discard all following | G.raud | 2018-02-02 | 1 | -0/+9 |
| | | | |||||
| * | | Uitext.interact: define a setskip subfunction to factorize | G.raud | 2018-02-02 | 1 | -2/+7 |
| | | | |||||
| * | | Uitext: new shortcut to "skip" | G.raud | 2018-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | The ':' is easier to type than '/' on a french keyboard. | ||||
| * | | Uitext: new action "reverse" (at the "reconcile" prompt) | G.raud | 2018-02-02 | 1 | -0/+4 |
| | | | |||||
| * | | Uitext: new action "discard" | G.raud | 2018-02-02 | 1 | -0/+4 |
| | | | |||||
| * | | Uitext: apply "newer" and "older" also to files that have been skipped | G.raud | 2018-02-02 | 1 | -2/+5 |
| | | | |||||
| * | | Uitext: new actions "newer" and "older" as in Uigtk2 | G.raud | 2018-02-02 | 1 | -0/+12 |
| | | | |||||
| * | | Uitext.interact: define the diff display in a subfunction showdiffs | G.raud | 2018-01-29 | 1 | -13/+15 |
| | | | |||||
| * | | Uitext.interact: fix indentation and newlines of output of "l" and "L" | G.raud | 2018-01-29 | 1 | -4/+2 |
| | | | |||||
| * | | Uitext: place newLine as the first command in args to selectAction | G.raud | 2018-01-29 | 1 | -21/+19 |
| | | | |||||
| * | | Uitext: more style consitency in args to selectAction | G.raud | 2018-01-29 | 1 | -48/+47 |
| | | | |||||
| * | | Uitext: add missing newLine for cbreak mode | G.raud | 2018-01-29 | 1 | -2/+3 |
| |/ | |||||
* | | Recon: warn that the preference merge overrides prefer | G.raud | 2018-02-08 | 1 | -1/+2 |
| | | |||||
* | | Fix documentation: backupnot is not like ignorenot | G.raud | 2018-02-08 | 1 | -3/+1 |
| | | | | | | | | | | | | backup does not even apply to directories so the selection of a path prefix cannot mask paths below it; ignore is the only option that can mask subhierarchies. | ||||
* | | Globals: warn that the preference atomic is in effect only for conflicts | G.raud | 2018-02-06 | 1 | -2/+3 |
| | | |||||
* | | Globals: warn that the preference atomic does not apply to backupcurr | G.raud | 2018-02-06 | 1 | -1/+2 |
| | | |||||
* | | Globals: document that the preference atomic applies to backups | G.raud | 2018-02-06 | 1 | -2/+3 |
| | | |||||
* | | Stasher: document that the preference backup does not apply to directories | G.raud | 2018-02-06 | 1 | -1/+2 |
| | | |||||
* | | Globals: improve the description of the preference merge | G.raud | 2018-02-06 | 1 | -2/+2 |
| | | |||||
* | | Fix documentation: merge paths are not backed up | G.raud | 2018-02-06 | 2 | -7/+1 |
|/ | | | | | | | | | | | | Fix the documentation string of the preference 'merge'. Remove an old comment added when the the backup was (last) disabled. Note that the backup of merge paths was documented but inactive at initial commit b043e4c ("Initial import", 2005-02-07); it has been activated at commit d166158 ("* Fixed some problems in the backup and merging code, for better...", 2006-06-05) and disabled again at commit 2c898cc ("* Propagage changes from 2.27 branch.", 2008-01-01). | ||||
* | Merge pull request #142 from g-raud/dumbtty-fix-newline | Benjamin Pierce | 2018-01-29 | 1 | -3/+5 |
|\ | | | | | Uitext.interact: fix usage of newLine for 'dumbtty' mode | ||||
| * | Uitext.newLine: add a descriptive comment | G.raud | 2018-01-28 | 1 | -0/+2 |
| | | |||||
| * | Uitext.interact: fix usage of newLine for dumbtty mode | G.raud | 2018-01-28 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #140 from g-raud/uitext-sort | Benjamin Pierce | 2018-01-29 | 4 | -37/+61 |
|\ \ | | | | | | | Uitext: add sort commands | ||||
| * | | Sortri: update the documentation of the parameter 'sortbysize' | G.raud | 2018-01-28 | 1 | -2/+2 |
| | | | |||||
| * | | Uigtk2: display in the menu that "sort new first" is a toggle | G.raud | 2018-01-28 | 1 | -1/+1 |
| | | | |||||
| * | | Uitext: add a "reverse sort" command | G.raud | 2018-01-28 | 1 | -0/+3 |
| | | | |||||
| * | | Uitext: do not restart the selection after sorting | G.raud | 2018-01-28 | 1 | -48/+52 |
| | | | |||||
| * | | Uitext: add sort commands to the "proceed" prompt | G.raud | 2018-01-28 | 1 | -0/+17 |
| | | | |||||
| * | | sortri.mli: mention that sortReconItems is a stable sort | G.raud | 2018-01-28 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #139 from g-raud/eintr-stdin-read-restart | Benjamin Pierce | 2018-01-29 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Uitext: reprint the whole prompt line when getInput fails with EINTR | ||||
| * | | | Uitext: reprint the whole prompt line when getInput fails with EINTR | G.raud | 2018-01-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #138 from g-raud/proceed-goback | Benjamin Pierce | 2018-01-29 | 1 | -11/+24 |
|\ \ \ \ | | |/ / | |/| | | Uitext: add commands to "stop" to "proceed" and "go back" to "reconcile" selection | ||||
| * | | | Uitext.selectAction: indentation fixup | G.raud | 2018-01-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | Uitext: add a "stop" option to the "selection" prompt | G.raud | 2018-01-28 | 1 | -0/+5 |
| | | | | |||||
| * | | | Uitext.interact: match against wildcard when unused (no functional changes) | G.raud | 2018-01-28 | 1 | -1/+1 |
| | | | |