summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Uitext.interact: print the hosts when attempting to go back before first itemG.raud2018-01-281-1/+1
| | | |
| * | | Uitext.interact: place the host display at the start (no functional changes)G.raud2018-01-281-1/+1
| | | |
| * | | Uitext.interact: add a short description commentG.raud2018-01-281-0/+1
| | | |
| * | | Uitext: add a "go back" option to the "proceed" promptG.raud2018-01-281-0/+8
| | | | | | | | | | | | | | | | To restart the selection process from the bottom.
| * | | Uitext.selectAction: take an extra accumulator and pass it down to interactG.raud2018-01-281-4/+4
| | | | | | | | | | | | | | | | | | | | The accumulator is still unused but will allow a recursive call to restart the selection not just from the top.
| * | | Uitext.interact: take an extra accumulator and pass it down to loopG.raud2018-01-281-4/+3
| | | |
* | | | Merge pull request #137 from g-raud/uitext-keep-modified-reconlistBenjamin Pierce2018-01-291-1/+1
|\ \ \ \ | |/ / / | | | | Uitext: keep the modified reconList when restarting the selection process
| * | | Uitext: keep the modified reconList when restarting the selection processG.raud2018-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the bug that unignores newly added permanent ignore-patterns when the selection process is restarted from the "proceed" prompt. The change will also make it possible to implement other reconList modifications like sorting.
* | | | eval opam env before building unison-blob.oAlan Schmitt2018-01-291-1/+1
| |_|/ |/| |
* | | Bits of tidying during releaseBenjamin Pierce2018-01-272-67/+230
| | |
* | | Merge pull request #135 from bcpierce00/prepare-beta-releaseBenjamin Pierce2018-01-27106-206/+110
|\ \ \ | | | | | | | | Prepare beta release
| * | | Small improvement to doc stringBenjamin Pierce2018-01-271-2/+3
| | | |
| * | | Update copyright datesBenjamin Pierce2018-01-27106-204/+107
| | | |
| * | | Better fixBenjamin Pierce2018-01-271-2/+8
| | | |
| * | | Fic incorrect check for OCaml versionBenjamin Pierce2018-01-271-2/+2
| | | |
* | | | Fix version check (#134)Benjamin Pierce2018-01-271-1/+7
| |/ / |/| | | | | | | | | | | * Fix incorrect check for OCaml version
* | | Merge pull request #130 from g-raud/eintr-stdin-read-restartBenjamin Pierce2018-01-271-14/+17
|\ \ \ | | |/ | |/| Uitext: Support stopping unison temporarily by SIGTSTP
| * | Uitext.selectAction: reprint a prompt when getInput fails with EINTRG.raud2018-01-231-17/+17
| | |
| * | Uitext: restart getInput when read interrupted (failure with EINTR)G.raud2018-01-231-1/+4
| | | | | | | | | | | | | | | One notable case of an interrupted read is a SIGTSTP signal sent by control-Z in a terminal.
* | | Remove some debugging printing from the OSX GUIBenjamin Pierce2018-01-261-7/+11
| |/ |/|
* | Change major version back to 2.51 (#131)bcpierce002018-01-231-2/+2
|/
* High sierra debugging (#127)bcpierce002018-01-222-13/+30
| | | | | | | | * Add some more debugging in copy.ml, plus a try....with... to prevent fingerprint mismatches from looking like rename errors * Tentative fix for the resource fork issue on OSX High Sierra * Remove early exit, which was just for debugging
* Change major version back to 2.50Benjamin Pierce2018-01-221-2/+2
|
* Merge pull request #119 from g-raud/selection-goback-across-errorsbcpierce002018-01-221-3/+8
|\ | | | | uitext: let "go back" go across errors in the selection
| * uitext: let previous() display the errors as in loop()G.raud2018-01-141-1/+3
| |
| * uitext: [bug] go "back" accross "error" in the "selection" processG.raud2018-01-141-3/+6
| |
* | Merge pull request #120 from g-raud/trimwhitespace-fasterbcpierce002018-01-221-9/+11
|\ \ | | | | | | Util: make trimWhitespace() linear and not quadratic
| * | Util: make trimWhitespace() linear and not quadraticG.raud2018-01-141-9/+11
| |/ | | | | | | | | | | | | For this use int "pointers" because the type of Caml strings is not a list and it is thus probable that any attempt to write a purely functional function would result in an inefficient implementation (since String.sub according to its doc always makes a copy).
* | Merge pull request #121 from g-raud/splitintowords-escape-charbcpierce002018-01-223-10/+22
|\ \ | | | | | | Parse the backslash as whitespace escape in sshargs, rshargs and include
| * | Document the backslash escape introduced in splitIntoWords()G.raud2018-01-181-2/+4
| | |
| * | Util: make splitIntoWords() parse an escape characterG.raud2018-01-142-8/+18
| |/ | | | | | | | | | | | | | | | | | | | | | | splitIntoWords() is called to construct the shell commands (processing the arguments of the parameters 'rshargs' and 'sshargs') and to process the filename of an 'include' directive. The main advantage of the change is that it enables to specify proxy commands (that contain spaces) as arguments to ssh. The escape mechanism is not that of C: any character following the backslash is taken as is.
* | Merge pull request #124 from g-raud/uncaught-unix-errorbcpierce002018-01-221-6/+14
|\ \ | | | | | | Uitext: catch exception while reading stdin and print error
| * | Shorten Uitext.handleException (no functional change)G.raud2018-01-181-5/+1
| | |
| * | Uitext.selectAction: catch some exceptions then raise Util.FatalG.raud2018-01-181-8/+10
| | | | | | | | | | | | | | | | | | This fixes #123. Raising an exception of type Util.Fatal prevents the printing of a backtrace by Uicommon.exn2string and the new error string mentions that it is stdin that cannot be read.
| * | Uitext.selectAction: print error if exception raised while reading stdinG.raud2018-01-171-1/+11
| |/ | | | | | | | | | | | | | | | | | | This change prints an error message in the case (amongst others) of the rare condition that Unison can write to the terminal but fails to read from it. The exceptions are raised only inside Uitext.getInput which is called only by Uitext.selectAction. So catch the exceptions there to print a message then re-raise them (for now).
* | Tiny makefile tweakBenjamin Pierce2018-01-181-2/+3
|/
* Fix detection of lablgtk2 with OPAMErik Martin-Dorel2018-01-021-2/+7
| | | | | | | | | | | | | | There was a bug due to the location of lib dirs, which differs between system-wide and OPAM-based installations of OCaml. Tested on Debian GNU/Linux stable: 1. either using the Debian packages for OCaml and lablgtk2; 2. or using OPAM: $ opam switch 4.05.0 $ eval `opam config env` $ opam install lablgtk ocamlfind $ make text $ make src
* Update for current Mac UI build. Fixes #47Alan Shutko2017-11-271-22/+1
|
* Remove a couple of compiler warningsBenjamin Pierce2017-11-252-3/+3
|
* Fix issue #87 -- a chmod not protected by the dontChmod flagBenjamin Pierce2017-11-251-2/+1
|
* Merge fix from masterBenjamin Pierce2017-11-241-1/+3
|\
| * Add -unsafe-string switch, for compatibility with OCaml >=4.06Benjamin Pierce2017-11-241-1/+1
| |
| * Makefile.OCaml: fswatch.cmi depends on ubase/prefs.cmi.Benda Xu2017-10-261-0/+2
| | | | | | | | | | | | The dependency is needed to build unison in parallel. Reference: https://bugs.gentoo.org/582666
* | Tidy up change log and copyright datesBenjamin Pierce2017-10-15107-111/+110
|/
* Change selftest so that it provokes the bug discussed in issue #96 (before ↵Benjamin Pierce2017-10-151-2/+4
| | | | the fix was applied)
* Merge pull request #46 from dnlopez/masterbcpierce002017-10-151-1/+1
|\ | | | | In GTK interface, show full pathnames in file list
| * In GTK interface, show full pathnames in file listDaniel Lopez2016-11-051-1/+1
| | | | | | | | | | | | | | | | To more clearly see the shape of the directory hierarchy when browsing the file list, compared to the previous behaviour of showing the filename only with some indentation - but the size of that indentation appeared erratic, perhaps due to the file list using a variable width font.
* | Merge pull request #71 from eliemichel/masterbcpierce002017-10-152-7/+20
|\ \ | | | | | | Fix messy props when creating parent directory
| * | Fix messy props when creating parent directoryElie Michel2017-03-012-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a bug reported by Sebastian Elsner on the user mailing list: https://groups.yahoo.com/neo/groups/unison-users/conversations/messages/11740 It seems that `Fs.mkdir` does not correctly apply mode, and anyway file owner and group were never copied. And furthermore the porp list was not built correctly so both mode and owner/group were false. In order to prevent this kind of issue, one should document in which order prop lists in content descriptions are (parent -> child or child -> parent). I do not do it myself because I am actually not sure.
* | | Add fix from mroiBenjamin Pierce2017-10-152-1/+11
| | |
* | | Merge pull request #53 from rbresalier/virus_checker_fixesbcpierce002017-10-045-8/+24
|\ \ \ | | | | | | | | Rename the DANGER.README file just before deleting it because a virus scanner may not have it deleted by the time DANGER.README is created again for the next file.
| * | | Rename the DANGER.README file just before deleting it because a virus ↵Rob Bresalier2016-12-125-8/+24
| | | | | | | | | | | | | | | | scanner may not have it deleted by the time DANGER.README is deleted again for the next file.
* | | | Merge pull request #82 from PeterMosmans/interface-guidelinesbcpierce002017-10-041-0/+1
|\ \ \ \ | | | | | | | | | | Follow OCaml 'interface' rule
| * | | | Follow OCaml 'interface' rulePeter Mosmans2017-06-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the interface guidelines on http://caml.inria.fr/pub/docs/manual-ocaml-4.04/intfc.html Paragraph 19.5.1 states the following: Rule 1 A function that has parameters or local variables of type value must begin with a call to one of the CAMLparam macros and return with CAMLreturn, CAMLreturn0, or CAMLreturnT. In particular, CAMLlocal and CAMLxparam can only be called after CAMLparam. Although this is a callback function, add a call to CAMLparam(0)
* | | | | [make] Pass correct include options to gtk2 build under OPAM env.Emilio Jesus Gallego Arias2017-09-271-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #9. Makefile.OCaml hardcoded the GTK include path, which is incorrect under an OPAM environment. The fix uses `ocamlfind`, if available, to get the proper cmdline options. Works for me (TM).
* | | | | sort the list of profilesMichael Roitzsch2017-08-291-0/+3
|/ / / / | | | | | | | | on APFS file systems, NSFileManager enumerates directories in an unspecified order
* | | | NitBenjamin Pierce2017-04-201-1/+0
| |/ / |/| |
* | | Merge pull request #55 from alexmarkley/48-segfaultbcpierce002016-12-241-1/+5
|\ \ \ | | | | | | | | Fix rare SIGSEGV when transferring large replicas.
| * | | Fix rare SIGSEGV when transferring large replicas.Alex Markley2016-12-211-1/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from here: https://caml.inria.fr/mantis/view.php?id=7431#c17026 Related issue reports: https://github.com/bcpierce00/unison/issues/48 https://caml.inria.fr/mantis/view.php?id=7431 https://bugzilla.redhat.com/show_bug.cgi?id=1401759
* | | Fix a theoretical integer overflow.Alex Markley2016-12-211-1/+1
|/ / | | | | | | | | Patch from: https://caml.inria.fr/mantis/view.php?id=7431#c16962
* | Fix several section-reference titlesEric Siegerman2016-12-072-3/+3
|/ | | | | These were cases where the title in the \sectionref didn't match the section's actual title.
* Doing the revert correctlyAlan Schmitt2016-11-014-38/+103
|
* Partially revert "Avoiding crash when no profile is selected"Alan Schmitt2016-11-013-74/+15
| | | | | This reverts commit ced2484abe650006dbcba0c66f908989819256c1 for the changes to the xib file.
* Avoiding crash when no profile is selectedAlan Schmitt2016-11-014-44/+97
|
* Properly clean up build artefactsPeter Mosmans2016-09-273-2/+4
|
* Correct typoBenjamin Pierce2016-09-141-1/+1
|
* Fixing typo in manual: copyprogpartial -> copyprogrestLucas Cimon2016-09-101-1/+1
|
* Small makefile improvement from Ian KellingBenjamin Pierce2016-05-231-1/+1
|
* Add OCaml compiler version to connection header stringBenjamin Pierce2016-05-234-19/+17
|
* * Makefile fixBenjamin Pierce2016-05-231-0/+7
|
* * Fix description of where the command-line tool will be installedBenjamin Pierce2016-05-232-1/+7
|
* * Improve error report when failing on OCaml compiler version mismatchBenjamin Pierce2016-05-234-5/+15
|
* Merge pull request #13 from AlexSchr/correctionsbcpierce002016-05-141-5/+4
|\ | | | | Corrections
| * Another correction in uigtk2.mlAlex Schreiber2016-04-281-4/+3
| |
| * Correct Menu Entry "Propagate Right to Left"Alex Schreiber2016-04-281-1/+1
| |
* | Fix build for OCaml 4.03.0Benjamin Pierce2016-05-141-1/+2
|/
* Proposed fixBenjamin Pierce2016-04-021-1/+8
|
* Xcode project fix as Makefile.ProjectInfo is statically generatedAlan Schmitt2016-03-181-1/+1
|
* Recover Makefile.ProjectInfo.Paul Phillips2016-03-171-0/+3
| | | | It wasn't added to the repository since it was in .gitignore.
* Tidy away obsolete uimacnew GUI codeBenjamin Pierce2016-03-1785-6731/+0
|
* * Tidy Makefiles for move to GitBenjamin Pierce2016-03-175-87/+48
| | | | * Tidy a bunch of other miscellaneous stuff
* Regenerate depends againPaul Phillips2016-03-011-4/+2
|
* Test pass on linux.Paul Phillips2016-03-011-0/+5
| | | | | | Working around thread races by sleeping 100ms on the sync calls. Obviously it is desirable that it be fixed correctly but I might have to learn ocaml before that's an option.
* Probable source of linux failure.Paul Phillips2016-03-011-2/+2
|
* Update .depend files.Paul Phillips2016-03-012-262/+250
| | | | | | Had to comment out INCLFLAGS to do it, lest -thread be passed to ocamldep, which doesn't understand it. Maybe it's INCFLAGS being used more than one way.
* Include the ocaml version in unison -version.Paul Phillips2016-03-011-1/+1
|
* Learned how to connect strings in ocaml.Paul Phillips2016-03-011-12/+9
|
* Set the logfile pref during self test.Paul Phillips2016-03-011-3/+8
| | | | Otherwise it drops a unison.log file in $HOME, which is not cool.
* Reenable the disabled tests.Paul Phillips2016-03-011-2/+0
| | | | And added a "make test" target.
* Make a proper temporary directory for -selftest.Paul Phillips2016-03-011-2/+11
|
* Consolidated into a single .gitignore file.Paul Phillips2016-03-0113-42/+0
|
* Update xcode project files.Paul Phillips2016-03-012-759/+770
|
* Eliminating deprecation warnings.Paul Phillips2016-03-0121-45/+45
|
* Manually set $Rev$.Paul Phillips2016-03-011-4/+2
| | | | No svn keyword expansion available in git.
* Reapply repository contents with --whitespace=fix.Paul Phillips2016-03-01154-7308/+7187
| | | | Except for Makefiles.
* * Make the installation Makefile a bit more paranoid, to prevent badBenjamin C. Pierce2016-01-273-0/+10
| | | | behavior if the OCaml installation is not present or messed up
* * Update copyright dates to 2016Benjamin C. Pierce2015-12-08111-112/+120
|
* * Small fix to gtk2 UI per suggestion from Daniel Reichelt, to scanBenjamin C. Pierce2015-12-023-1/+10
| | | | | profiles before main window is created. (second try)
* * Small fix to gtk2 UI per suggestion from Daniel Reichelt, to scanBenjamin C. Pierce2015-12-013-1/+15
| | | | | | | | profiles before main window is created. * Small fix to avoid assertion failure on conflicts involving deleted files when using -copyonconflict flag
* * Remove colon from names of files created by the -copyonconflictBenjamin C. Pierce2015-11-023-1/+7
| | | | flag, to avoid unhappiness with some filesystems.
generated by cgit v1.1 at 2025-06-08 01:23:30 +0000