Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: bcpierce00/unison
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.53.3
Choose a base ref
...
head repository: bcpierce00/unison
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 4,142 additions and 3,242 deletions.
  1. +8 −0 .github/ISSUE_TEMPLATE/config.yml
  2. +49 −0 .github/ISSUE_TEMPLATE/defect.md
  3. +56 −0 .github/ISSUE_TEMPLATE/feature.md
  4. +404 −482 .github/workflows/CI.yml
  5. +1 −0 .gitignore
  6. +118 −0 CONTRIBUTING.md
  7. +178 −61 INSTALL.md
  8. +26 −36 Makefile
  9. +61 −3 NEWS.md
  10. +33 −75 README.md
  11. +24 −0 dev/README.md
  12. +213 −0 dev/check-memory
  13. +49 −0 dev/ktrace-netbsd
  14. +36 −0 dev/test-limits.c
  15. +100 −74 doc/Makefile
  16. +0 −27 doc/contactsbody.tex
  17. +4 −6 doc/docs.ml
  18. +6 −4 doc/local.tex
  19. +0 −17 doc/postproc.mll
  20. +8 −29 doc/short.tex
  21. +59 −150 doc/unison-manual.tex
  22. +0 −71 dune-project
  23. +0 −22 man/Makefile
  24. +2 −4 man/unison.1.in
  25. +27 −27 src/.depend
  26. +0 −66 src/CONTRIB
  27. +0 −13 src/INSTALL.win32
  28. +0 −252 src/INSTALL.win32-cygwin-gnuc
  29. +0 −512 src/INSTALL.win32-msvc
  30. +39 −183 src/Makefile
  31. +172 −345 src/Makefile.OCaml
  32. +1 −1 src/Makefile.ProjectInfo
  33. +1 −30 src/TODO.txt
  34. +2 −2 src/clroot.ml
  35. +106 −6 src/copy.ml
  36. +445 −0 src/copy_stubs.c
  37. +5 −5 src/dune
  38. +3 −3 src/external.ml
  39. +1 −1 src/fileinfo.ml
  40. +23 −12 src/files.ml
  41. +10 −3 src/fingerprint.ml
  42. +0 −2 src/fingerprint.mli
  43. +6 −2 src/fs.ml
  44. +1 −1 src/fsmonitor.py
  45. +7 −0 src/fsmonitor/inotify/Makefile
  46. +1 −1 src/fsmonitor/{linux → inotify}/dune
  47. 0 src/fsmonitor/{linux → inotify}/inotify.ml
  48. 0 src/fsmonitor/{linux → inotify}/inotify.mli
  49. 0 src/fsmonitor/{linux → inotify}/inotify_stubs.c
  50. 0 src/fsmonitor/{linux → inotify}/lwt_inotify.ml
  51. 0 src/fsmonitor/{linux → inotify}/lwt_inotify.mli
  52. +6 −1 src/fsmonitor/{linux → inotify}/watcher.ml
  53. +0 −29 src/fsmonitor/linux/Makefile
  54. +2 −24 src/fsmonitor/solaris/Makefile
  55. +1 −1 src/fsmonitor/solaris/dune
  56. +1 −1 src/fsmonitor/watchercommon.ml
  57. +5 −23 src/fsmonitor/windows/Makefile
  58. +7 −5 src/fspath.ml
  59. +2 −2 src/fswatch.ml
  60. +1 −1 src/globals.ml
  61. +2 −2 src/lock.ml
  62. +1 −1 src/lwt/generic/lwt_unix_impl.ml
  63. +3 −3 src/lwt/lwt_unix_stubs.c
  64. +18 −2 src/main.ml
  65. +622 −0 src/make_tools.ml
  66. +3 −3 src/os.ml
  67. +6 −12 src/osx.ml
  68. +2 −2 src/path.ml
  69. +76 −0 src/pixmaps.ml
  70. +6 −11 src/props.ml
  71. +1 −0 src/props.mli
  72. +3 −0 src/props_xattr.c
  73. +18 −20 src/pty.c
  74. +12 −2 src/recon.ml
  75. +52 −37 src/remote.ml
  76. +105 −204 src/strings.ml
  77. +9 −13 src/system/system_generic.ml
  78. +10 −1 src/system/system_intf.ml
  79. +5 −0 src/system/system_win.ml
  80. +50 −3 src/system/system_win_stubs.c
  81. +26 −24 src/terminal.ml
  82. +1 −1 src/terminal.mli
  83. +2 −2 src/test.ml
  84. +22 −4 src/transfer.ml
  85. +7 −0 src/transfer.mli
  86. +7 −6 src/transport.ml
  87. +1 −1 src/ubase/prefs.ml
  88. +2 −0 src/ubase/proplist.ml
  89. +1 −0 src/ubase/proplist.mli
  90. +1 −1 src/ubase/trace.ml
  91. +43 −19 src/ubase/util.ml
  92. +1 −5 src/ubase/util.mli
  93. +45 −29 src/uicommon.ml
  94. +1 −0 src/uicommon.mli
  95. +300 −92 src/uigtk3.ml
  96. +26 −0 src/uimac/Makefile
  97. +6 −26 src/uimac/uimacnew.xcodeproj/project.pbxproj
  98. +46 −35 src/uitext.ml
  99. +255 −53 src/update.ml
  100. +1 −1 src/uutil.ml
  101. +0 −10 src/winmain.c
  102. +23 −0 unison-gui.opam
  103. +11 −2 unison.opam
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Asking for Help
url: https://github.com/bcpierce00/unison/wiki/Mailing-Lists
about: Please direct questions the unison-users@ list, or unison-hackers@ if reading source code is helpful.
- name: Feature Requests (not fully worked out)
url: https://github.com/bcpierce00/unison/wiki/Mailing-Lists
about: Please bring up feature requests that are not fully designed on a mailing list.
49 changes: 49 additions & 0 deletions .github/ISSUE_TEMPLATE/defect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
---
name: Defect Report
about: Create an issue that argues that there is a bug in unison
title: ''
labels: defect
assignees: ''
---

# Instructions

The issue tracker is not a help system. Before using the issue
tracker, please read the following page thoroughly and follow the
guidelines it expresses:

https://github.com/bcpierce00/unison/wiki/Reporting-Bugs-and-Feature-Requests

Pleaes delete the following dashed line and the text above it, leaving the
statement that you have read the wiki page.
----------------------------------------
I have thoroughly read the [Reporting Bugs and Feature Requests](https://github.com/bcpierce00/unison/wiki/Reporting-Bugs-and-Feature-Requests) wiki page.

# Meta

Bug reports must be about a minimized configuration, as described in the wiki page.

People filing bug reports will be expected to follow up and perhaps
test proposed fixes.

# Environment

- Unison version
- OS, version and CPU
- ocaml version
- TUI or GUI
- local, ssh, socket, or ?
- use of fsmonitor?

# Reproduction Recipe

[Describe how to reproduce the bug. This must be the smallest
configuration you can find that exhibits the bug, and you should
include the largest working configuration also. Generally this means
local sync, TUI, no watcher, unless e.g. the bug is phrased as
"Without the watcher, behavior is correct, but on adding
fsmonitor-foo, ....".]

# Expected behavior vs actual behavior

[Describe the actual behavior. Argue that the behavior is incorrect.]
56 changes: 56 additions & 0 deletions .github/ISSUE_TEMPLATE/feature.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
---
name: Fully-designed Feature Request
about: Create a fully-specified feature request
title: ''
labels: enhancement
assignees: ''
---

# Instructions

Before using the issue tracker, please read the following page
thoroughly and follow the guidelines it expresses:

https://github.com/bcpierce00/unison/wiki/Reporting-Bugs-and-Feature-Requests

If your feature request is not fully formed, please post on
unison-users@ or unison-hackers@ instead.

Pleaes delete the following dashed line and the text above it, leaving the
statement that you have read the wiki page.
----------------------------------------
I have thoroughly read the [Reporting Bugs and Feature Requests](https://github.com/bcpierce00/unison/wiki/Reporting-Bugs-and-Feature-Requests) wiki page.

# Motivation

Explain what you want to do.

# Background

Explain why the documentation and current behavior do not permit
achieving your goals. For near misses, explain.

# Scope

Discuss whether the proposed behavior is aligned with unison's historical scope and why it is a reasonable change.

If there are portability concerns, discuss them.

# Will you write code?

Say whether you intend to implement the feature. (If so, it is
entirely reasonable to ask first if it would be accepted if written,
if you don't want to spend time on a feature that won't be merged).

# Operation of the new feature

Explain how the new feature will behave, enough that someone else (who
is familiar with unison) could implement it.

Discuss problems that will arise and how they should be handled.

# Complexity vs Benefit

Discuss the tradeoff of complexity in the code base and documentation
vs the benefit to users. Generally, proposed features should be of
fairly broad interest.
Loading