summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix for lablgtk >= 2.18.6daviddavid2018-02-261-2/+2
|
* Merge pull request #152 from g-raud/uitext-tweak-actionsBenjamin Pierce2018-02-091-2/+6
|\ | | | | Uitext: some more actions and tweaks
| * Uitext: print the number of items skipped for "forward" and "backward"G.raud2018-02-061-2/+6
| |
* | Merge pull request #158 from bcpierce00/update-docsBenjamin Pierce2018-02-091-0/+17
|\ \ | | | | | | Add some recent improvements
| * | Add some recent improvementsBenjamin Pierce2018-02-091-0/+17
| | |
* | | Merge pull request #157 from g-raud/better-server-failureBenjamin Pierce2018-02-091-4/+6
|\ \ \ | | | | | | | | Improve server failure message
| * | | Main: catch and transform exception IllegalValue from the server into FatalG.raud2018-02-081-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 failsG.raud2018-02-081-1/+1
| | | |
* | | | Merge pull request #148 from g-raud/uarg-fix-parse-cli-optionsBenjamin Pierce2018-02-094-15/+26
|\ \ \ \ | |_|/ / |/| | | Uarg: fix the parsing of command line options' arguments
| * | | Prefs.parseLines: factorize by calling Util.splitAtFirstCharG.raud2018-02-051-10/+9
| | | |
| * | | Uarg: do not discard an empty value following the optionG.raud2018-02-021-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 typeG.raud2018-02-021-3/+6
| | | |
| * | | Uarg: fix parsing of equal sign '=' following command line option namesG.raud2018-02-021-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 functionG.raud2018-02-012-0/+9
| |/ /
* | | Merge pull request #149 from g-raud/logfile-relative-to-homeBenjamin Pierce2018-02-093-2/+9
|\ \ \ | | | | | | | | 'logfile': when relative path then root to home
| * | | Update trace.mlBenjamin Pierce2018-02-091-1/+1
| | | |
| * | | Trace: root a relative logfile parameter to home and not to cwdG.raud2018-02-011-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 functionG.raud2018-02-012-0/+6
| |/ /
* | | Merge pull request #154 from g-raud/uitext-matching-boolean-rpnBenjamin Pierce2018-02-091-115/+325
|\ \ \ | | | | | | | | Uitext: add RPN boolean operations on matching conditions
| * | | Uitext: new action "pop" to pop a matching conditionG.raud2018-02-051-2/+8
| | | |
| * | | Uitext: new actions "and" and "or" taking last 2 match in RPN styleG.raud2018-02-051-0/+12
| | | |
| * | | Uitext.interact: enable setripred to also unset and modify ripredG.raud2018-02-051-27/+25
| | | |
| * | | Uitest.interact: save previous ripred when setting a new oneG.raud2018-02-051-4/+3
| | | |
| * | | Uitext.interact: make !ripred a list instead of an optionG.raud2018-02-051-11/+11
| | |/ | |/|
| * | Uitext: new action "backward"G.raud2018-02-051-4/+10
| | |
| * | Uitext: new action "forward"G.raud2018-02-051-0/+11
| | |
| * | Uitext: add some shortcuts to actions that matchG.raud2018-02-051-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 matchG.raud2018-02-051-7/+13
| | |
| * | Uitext: new action "changed" to resolve to the detriment of props changesG.raud2018-02-041-0/+6
| | |
| * | Uitext.interact: new subfunction setdirchangedG.raud2018-02-041-0/+9
| | |
| * | Uitext: make action "invert" print an message if change impossibleG.raud2018-02-031-1/+3
| | |
| * | Uitext.interact: in actOnMatching replace option discard with failG.raud2018-02-031-4/+7
| | |
| * | Uitext: prevent action "invert" from going next if direction not invertedG.raud2018-02-031-0/+1
| | |
| * | Uitext.interact: in actOnMatching let returned bool decide whether to go nextG.raud2018-02-031-3/+6
| | |
| * | Uitext.interact: add an option discard to actOnMatchingG.raud2018-02-031-4/+4
| | |
| * | Uitext: new action "invert" to invert the propagation directionG.raud2018-02-031-0/+4
| | |
| * | Uitext.interact: new subfunction invertdirG.raud2018-02-031-0/+6
| | |
| * | Uitext: add a few vi-like keybindingsG.raud2018-02-031-3/+3
| | |
| * | Uitext: new action to match PropsChangedG.raud2018-02-031-0/+5
| | |
| * | Uitext.interact: new subfunction ispropschangedG.raud2018-02-031-0/+7
| | |
| * | Uitext: fix for actions "details" and "diff" (do not go next and print newline)G.raud2018-02-031-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 displayG.raud2018-02-031-4/+13
| | |
| * | Uitext: new action "not" to invert the match conditionG.raud2018-02-031-0/+7
| | |
| * | Uitext: new actions "start" and "end" to go to start or end of listG.raud2018-02-031-0/+10
| | |
| * | Uitext: let list actions list only matching itemsG.raud2018-02-021-4/+7
| | |
| * | Uitext.interact: document which actions operate on matching itemsG.raud2018-02-021-9/+9
| | |
| * | Uitext: new actions "1" and "2" to match according to directionG.raud2018-02-021-0/+16
| | |
| * | Uitext: let "skip" and "discard" operate on matching itemsG.raud2018-02-021-9/+8
| | |
| * | Uitext: let "newer" and "older" operate on matching itemsG.raud2018-02-021-9/+6
| | |
| * | Uitext: let setting of direction operate on matching itemsG.raud2018-02-021-9/+5
| | |
| * | Uitext: let "revert" and "merge" operate on matching itemsG.raud2018-02-021-5/+6
| | |
| * | Uitext: let "diff" and "details" operate on matching itemsG.raud2018-02-021-7/+6
| | |
| * | Uitext: new actions to match against following itemsG.raud2018-02-021-0/+26
| | |
| * | Uitext.interact: new subfunction actOnMatchingG.raud2018-02-021-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.raud2018-02-021-11/+11
| | |
| * | Uitext.interact: improve menu order (list edit towards the end)G.raud2018-02-021-23/+23
| | |
| * | Uitext.interact: improve menu order (moving at the top)G.raud2018-02-021-14/+14
| | |
| * | Uitext.interact: improve menu order (info at the top)G.raud2018-02-021-25/+25
| | |
| * | Uitext.interact: improve menu order (quitting at the end)G.raud2018-02-021-13/+13
| | |
| * | Uitext.selectAction: improve menu descriptions (be consistent with interact)G.raud2018-02-021-2/+2
| | |
| * | Uitext.interact: improve menu descriptionsG.raud2018-02-021-4/+4
| | |
| * | Uitext: new action to revert then go backG.raud2018-02-021-0/+7
| | |
| * | Uitext: new action "revert" (as in Uigtk2)G.raud2018-02-021-0/+5
| | |
| * | Uitext: new action "next"G.raud2018-02-021-1/+5
| | | | | | | | | | | | Remove the shortcut "n" from the "stop" action.
| * | Uitext: new actions to skip or discard all followingG.raud2018-02-021-0/+9
| | |
| * | Uitext.interact: define a setskip subfunction to factorizeG.raud2018-02-021-2/+7
| | |
| * | Uitext: new shortcut to "skip"G.raud2018-02-021-1/+1
| | | | | | | | | | | | The ':' is easier to type than '/' on a french keyboard.
| * | Uitext: new action "reverse" (at the "reconcile" prompt)G.raud2018-02-021-0/+4
| | |
| * | Uitext: new action "discard"G.raud2018-02-021-0/+4
| | |
| * | Uitext: apply "newer" and "older" also to files that have been skippedG.raud2018-02-021-2/+5
| | |
| * | Uitext: new actions "newer" and "older" as in Uigtk2G.raud2018-02-021-0/+12
| | |
| * | Uitext.interact: define the diff display in a subfunction showdiffsG.raud2018-01-291-13/+15
| | |
| * | Uitext.interact: fix indentation and newlines of output of "l" and "L"G.raud2018-01-291-4/+2
| | |
| * | Uitext: place newLine as the first command in args to selectActionG.raud2018-01-291-21/+19
| | |
| * | Uitext: more style consitency in args to selectActionG.raud2018-01-291-48/+47
| | |
| * | Uitext: add missing newLine for cbreak modeG.raud2018-01-291-2/+3
| |/
* | Recon: warn that the preference merge overrides preferG.raud2018-02-081-1/+2
| |
* | Fix documentation: backupnot is not like ignorenotG.raud2018-02-081-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 conflictsG.raud2018-02-061-2/+3
| |
* | Globals: warn that the preference atomic does not apply to backupcurrG.raud2018-02-061-1/+2
| |
* | Globals: document that the preference atomic applies to backupsG.raud2018-02-061-2/+3
| |
* | Stasher: document that the preference backup does not apply to directoriesG.raud2018-02-061-1/+2
| |
* | Globals: improve the description of the preference mergeG.raud2018-02-061-2/+2
| |
* | Fix documentation: merge paths are not backed upG.raud2018-02-062-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-newlineBenjamin Pierce2018-01-291-3/+5
|\ | | | | Uitext.interact: fix usage of newLine for 'dumbtty' mode
| * Uitext.newLine: add a descriptive commentG.raud2018-01-281-0/+2
| |
| * Uitext.interact: fix usage of newLine for dumbtty modeG.raud2018-01-281-3/+3
| |
* | Merge pull request #140 from g-raud/uitext-sortBenjamin Pierce2018-01-294-37/+61
|\ \ | | | | | | Uitext: add sort commands
| * | Sortri: update the documentation of the parameter 'sortbysize'G.raud2018-01-281-2/+2
| | |
| * | Uigtk2: display in the menu that "sort new first" is a toggleG.raud2018-01-281-1/+1
| | |
| * | Uitext: add a "reverse sort" commandG.raud2018-01-281-0/+3
| | |
| * | Uitext: do not restart the selection after sortingG.raud2018-01-281-48/+52
| | |
| * | Uitext: add sort commands to the "proceed" promptG.raud2018-01-281-0/+17
| | |
| * | sortri.mli: mention that sortReconItems is a stable sortG.raud2018-01-281-3/+3
| | |
* | | Merge pull request #139 from g-raud/eintr-stdin-read-restartBenjamin Pierce2018-01-291-1/+1
|\ \ \ | | | | | | | | Uitext: reprint the whole prompt line when getInput fails with EINTR
| * | | Uitext: reprint the whole prompt line when getInput fails with EINTRG.raud2018-01-281-1/+1
| | | |
* | | | Merge pull request #138 from g-raud/proceed-gobackBenjamin Pierce2018-01-291-11/+24
|\ \ \ \ | | |/ / | |/| | Uitext: add commands to "stop" to "proceed" and "go back" to "reconcile" selection
| * | | Uitext.selectAction: indentation fixupG.raud2018-01-281-1/+1
| | | |
| * | | Uitext: add a "stop" option to the "selection" promptG.raud2018-01-281-0/+5
| | | |
| * | | Uitext.interact: match against wildcard when unused (no functional changes)G.raud2018-01-281-1/+1
| | | |