From bea3c017723565723e9b22d9301cbdcbeb737895 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Wed, 14 Mar 2018 14:48:22 +0100 Subject: [PATCH] vendor: github.com/Zillode/notify is now github.com/syncthing/notify (#4813) Given that we've taken on the resposibility of maintaining this forked package I've added it to the Syncthing organization. We still vendor it like an external package, because it's convenient to keep it as a fork of upstream to easier merge and file pull requests towards them. --- lib/fs/basicfs_watch.go | 2 +- lib/fs/basicfs_watch_eventtypes_fen.go | 2 +- lib/fs/basicfs_watch_eventtypes_inotify.go | 2 +- lib/fs/basicfs_watch_eventtypes_kqueue.go | 2 +- lib/fs/basicfs_watch_eventtypes_other.go | 2 +- lib/fs/basicfs_watch_eventtypes_readdcw.go | 2 +- lib/fs/basicfs_watch_test.go | 2 +- .../{Zillode => syncthing}/notify/LICENSE | 0 .../{Zillode => syncthing}/notify/debug.go | 0 .../{Zillode => syncthing}/notify/debug_debug.go | 0 .../notify/debug_nodebug.go | 0 .../{Zillode => syncthing}/notify/doc.go | 0 .../{Zillode => syncthing}/notify/event.go | 0 .../{Zillode => syncthing}/notify/event_fen.go | 0 .../notify/event_fsevents.go | 0 .../notify/event_inotify.go | 0 .../notify/event_kqueue.go | 0 .../notify/event_readdcw.go | 0 .../{Zillode => syncthing}/notify/event_stub.go | 0 .../notify/event_trigger.go | 0 .../{Zillode => syncthing}/notify/node.go | 0 .../{Zillode => syncthing}/notify/notify.go | 0 .../{Zillode => syncthing}/notify/tree.go | 0 .../notify/tree_nonrecursive.go | 0 .../notify/tree_recursive.go | 0 .../{Zillode => syncthing}/notify/util.go | 0 .../{Zillode => syncthing}/notify/watcher.go | 0 .../{Zillode => syncthing}/notify/watcher_fen.go | 0 .../notify/watcher_fen_cgo.go | 0 .../notify/watcher_fsevents.go | 0 .../notify/watcher_fsevents_cgo.go | 0 .../notify/watcher_inotify.go | 0 .../notify/watcher_kqueue.go | 0 .../notify/watcher_readdcw.go | 0 .../notify/watcher_stub.go | 0 .../notify/watcher_trigger.go | 0 .../{Zillode => syncthing}/notify/watchpoint.go | 0 .../notify/watchpoint_other.go | 0 .../notify/watchpoint_readdcw.go | 0 vendor/manifest | 16 ++++++++-------- 40 files changed, 15 insertions(+), 15 deletions(-) rename vendor/github.com/{Zillode => syncthing}/notify/LICENSE (100%) rename vendor/github.com/{Zillode => syncthing}/notify/debug.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/debug_debug.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/debug_nodebug.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/doc.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/event.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/event_fen.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/event_fsevents.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/event_inotify.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/event_kqueue.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/event_readdcw.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/event_stub.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/event_trigger.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/node.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/notify.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/tree.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/tree_nonrecursive.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/tree_recursive.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/util.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/watcher.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/watcher_fen.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/watcher_fen_cgo.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/watcher_fsevents.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/watcher_fsevents_cgo.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/watcher_inotify.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/watcher_kqueue.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/watcher_readdcw.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/watcher_stub.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/watcher_trigger.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/watchpoint.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/watchpoint_other.go (100%) rename vendor/github.com/{Zillode => syncthing}/notify/watchpoint_readdcw.go (100%) diff --git a/lib/fs/basicfs_watch.go b/lib/fs/basicfs_watch.go index 8bac466f2..ff924dc26 100644 --- a/lib/fs/basicfs_watch.go +++ b/lib/fs/basicfs_watch.go @@ -13,7 +13,7 @@ import ( "errors" "path/filepath" - "github.com/Zillode/notify" + "github.com/syncthing/notify" ) // Notify does not block on sending to channel, so the channel must be buffered. diff --git a/lib/fs/basicfs_watch_eventtypes_fen.go b/lib/fs/basicfs_watch_eventtypes_fen.go index c293c81bf..3c3d99b0b 100644 --- a/lib/fs/basicfs_watch_eventtypes_fen.go +++ b/lib/fs/basicfs_watch_eventtypes_fen.go @@ -8,7 +8,7 @@ package fs -import "github.com/Zillode/notify" +import "github.com/syncthing/notify" const ( subEventMask = notify.Create | notify.FileModified | notify.FileRenameFrom | notify.FileDelete | notify.FileRenameTo diff --git a/lib/fs/basicfs_watch_eventtypes_inotify.go b/lib/fs/basicfs_watch_eventtypes_inotify.go index ccae697d3..eb58d2de7 100644 --- a/lib/fs/basicfs_watch_eventtypes_inotify.go +++ b/lib/fs/basicfs_watch_eventtypes_inotify.go @@ -8,7 +8,7 @@ package fs -import "github.com/Zillode/notify" +import "github.com/syncthing/notify" const ( subEventMask = notify.InCreate | notify.InMovedTo | notify.InDelete | notify.InDeleteSelf | notify.InModify | notify.InMovedFrom | notify.InMoveSelf diff --git a/lib/fs/basicfs_watch_eventtypes_kqueue.go b/lib/fs/basicfs_watch_eventtypes_kqueue.go index f5928b078..4b7b10ea7 100644 --- a/lib/fs/basicfs_watch_eventtypes_kqueue.go +++ b/lib/fs/basicfs_watch_eventtypes_kqueue.go @@ -8,7 +8,7 @@ package fs -import "github.com/Zillode/notify" +import "github.com/syncthing/notify" const ( subEventMask = notify.NoteDelete | notify.NoteWrite | notify.NoteRename diff --git a/lib/fs/basicfs_watch_eventtypes_other.go b/lib/fs/basicfs_watch_eventtypes_other.go index 09ccff699..85df0ab9f 100644 --- a/lib/fs/basicfs_watch_eventtypes_other.go +++ b/lib/fs/basicfs_watch_eventtypes_other.go @@ -12,7 +12,7 @@ package fs -import "github.com/Zillode/notify" +import "github.com/syncthing/notify" const ( subEventMask = notify.All diff --git a/lib/fs/basicfs_watch_eventtypes_readdcw.go b/lib/fs/basicfs_watch_eventtypes_readdcw.go index fd98b83fb..72ed87b24 100644 --- a/lib/fs/basicfs_watch_eventtypes_readdcw.go +++ b/lib/fs/basicfs_watch_eventtypes_readdcw.go @@ -8,7 +8,7 @@ package fs -import "github.com/Zillode/notify" +import "github.com/syncthing/notify" const ( subEventMask = notify.FileNotifyChangeFileName | notify.FileNotifyChangeDirName | notify.FileNotifyChangeSize | notify.FileNotifyChangeCreation diff --git a/lib/fs/basicfs_watch_test.go b/lib/fs/basicfs_watch_test.go index 9f9d32f7d..969ac0094 100644 --- a/lib/fs/basicfs_watch_test.go +++ b/lib/fs/basicfs_watch_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/Zillode/notify" + "github.com/syncthing/notify" ) func TestMain(m *testing.M) { diff --git a/vendor/github.com/Zillode/notify/LICENSE b/vendor/github.com/syncthing/notify/LICENSE similarity index 100% rename from vendor/github.com/Zillode/notify/LICENSE rename to vendor/github.com/syncthing/notify/LICENSE diff --git a/vendor/github.com/Zillode/notify/debug.go b/vendor/github.com/syncthing/notify/debug.go similarity index 100% rename from vendor/github.com/Zillode/notify/debug.go rename to vendor/github.com/syncthing/notify/debug.go diff --git a/vendor/github.com/Zillode/notify/debug_debug.go b/vendor/github.com/syncthing/notify/debug_debug.go similarity index 100% rename from vendor/github.com/Zillode/notify/debug_debug.go rename to vendor/github.com/syncthing/notify/debug_debug.go diff --git a/vendor/github.com/Zillode/notify/debug_nodebug.go b/vendor/github.com/syncthing/notify/debug_nodebug.go similarity index 100% rename from vendor/github.com/Zillode/notify/debug_nodebug.go rename to vendor/github.com/syncthing/notify/debug_nodebug.go diff --git a/vendor/github.com/Zillode/notify/doc.go b/vendor/github.com/syncthing/notify/doc.go similarity index 100% rename from vendor/github.com/Zillode/notify/doc.go rename to vendor/github.com/syncthing/notify/doc.go diff --git a/vendor/github.com/Zillode/notify/event.go b/vendor/github.com/syncthing/notify/event.go similarity index 100% rename from vendor/github.com/Zillode/notify/event.go rename to vendor/github.com/syncthing/notify/event.go diff --git a/vendor/github.com/Zillode/notify/event_fen.go b/vendor/github.com/syncthing/notify/event_fen.go similarity index 100% rename from vendor/github.com/Zillode/notify/event_fen.go rename to vendor/github.com/syncthing/notify/event_fen.go diff --git a/vendor/github.com/Zillode/notify/event_fsevents.go b/vendor/github.com/syncthing/notify/event_fsevents.go similarity index 100% rename from vendor/github.com/Zillode/notify/event_fsevents.go rename to vendor/github.com/syncthing/notify/event_fsevents.go diff --git a/vendor/github.com/Zillode/notify/event_inotify.go b/vendor/github.com/syncthing/notify/event_inotify.go similarity index 100% rename from vendor/github.com/Zillode/notify/event_inotify.go rename to vendor/github.com/syncthing/notify/event_inotify.go diff --git a/vendor/github.com/Zillode/notify/event_kqueue.go b/vendor/github.com/syncthing/notify/event_kqueue.go similarity index 100% rename from vendor/github.com/Zillode/notify/event_kqueue.go rename to vendor/github.com/syncthing/notify/event_kqueue.go diff --git a/vendor/github.com/Zillode/notify/event_readdcw.go b/vendor/github.com/syncthing/notify/event_readdcw.go similarity index 100% rename from vendor/github.com/Zillode/notify/event_readdcw.go rename to vendor/github.com/syncthing/notify/event_readdcw.go diff --git a/vendor/github.com/Zillode/notify/event_stub.go b/vendor/github.com/syncthing/notify/event_stub.go similarity index 100% rename from vendor/github.com/Zillode/notify/event_stub.go rename to vendor/github.com/syncthing/notify/event_stub.go diff --git a/vendor/github.com/Zillode/notify/event_trigger.go b/vendor/github.com/syncthing/notify/event_trigger.go similarity index 100% rename from vendor/github.com/Zillode/notify/event_trigger.go rename to vendor/github.com/syncthing/notify/event_trigger.go diff --git a/vendor/github.com/Zillode/notify/node.go b/vendor/github.com/syncthing/notify/node.go similarity index 100% rename from vendor/github.com/Zillode/notify/node.go rename to vendor/github.com/syncthing/notify/node.go diff --git a/vendor/github.com/Zillode/notify/notify.go b/vendor/github.com/syncthing/notify/notify.go similarity index 100% rename from vendor/github.com/Zillode/notify/notify.go rename to vendor/github.com/syncthing/notify/notify.go diff --git a/vendor/github.com/Zillode/notify/tree.go b/vendor/github.com/syncthing/notify/tree.go similarity index 100% rename from vendor/github.com/Zillode/notify/tree.go rename to vendor/github.com/syncthing/notify/tree.go diff --git a/vendor/github.com/Zillode/notify/tree_nonrecursive.go b/vendor/github.com/syncthing/notify/tree_nonrecursive.go similarity index 100% rename from vendor/github.com/Zillode/notify/tree_nonrecursive.go rename to vendor/github.com/syncthing/notify/tree_nonrecursive.go diff --git a/vendor/github.com/Zillode/notify/tree_recursive.go b/vendor/github.com/syncthing/notify/tree_recursive.go similarity index 100% rename from vendor/github.com/Zillode/notify/tree_recursive.go rename to vendor/github.com/syncthing/notify/tree_recursive.go diff --git a/vendor/github.com/Zillode/notify/util.go b/vendor/github.com/syncthing/notify/util.go similarity index 100% rename from vendor/github.com/Zillode/notify/util.go rename to vendor/github.com/syncthing/notify/util.go diff --git a/vendor/github.com/Zillode/notify/watcher.go b/vendor/github.com/syncthing/notify/watcher.go similarity index 100% rename from vendor/github.com/Zillode/notify/watcher.go rename to vendor/github.com/syncthing/notify/watcher.go diff --git a/vendor/github.com/Zillode/notify/watcher_fen.go b/vendor/github.com/syncthing/notify/watcher_fen.go similarity index 100% rename from vendor/github.com/Zillode/notify/watcher_fen.go rename to vendor/github.com/syncthing/notify/watcher_fen.go diff --git a/vendor/github.com/Zillode/notify/watcher_fen_cgo.go b/vendor/github.com/syncthing/notify/watcher_fen_cgo.go similarity index 100% rename from vendor/github.com/Zillode/notify/watcher_fen_cgo.go rename to vendor/github.com/syncthing/notify/watcher_fen_cgo.go diff --git a/vendor/github.com/Zillode/notify/watcher_fsevents.go b/vendor/github.com/syncthing/notify/watcher_fsevents.go similarity index 100% rename from vendor/github.com/Zillode/notify/watcher_fsevents.go rename to vendor/github.com/syncthing/notify/watcher_fsevents.go diff --git a/vendor/github.com/Zillode/notify/watcher_fsevents_cgo.go b/vendor/github.com/syncthing/notify/watcher_fsevents_cgo.go similarity index 100% rename from vendor/github.com/Zillode/notify/watcher_fsevents_cgo.go rename to vendor/github.com/syncthing/notify/watcher_fsevents_cgo.go diff --git a/vendor/github.com/Zillode/notify/watcher_inotify.go b/vendor/github.com/syncthing/notify/watcher_inotify.go similarity index 100% rename from vendor/github.com/Zillode/notify/watcher_inotify.go rename to vendor/github.com/syncthing/notify/watcher_inotify.go diff --git a/vendor/github.com/Zillode/notify/watcher_kqueue.go b/vendor/github.com/syncthing/notify/watcher_kqueue.go similarity index 100% rename from vendor/github.com/Zillode/notify/watcher_kqueue.go rename to vendor/github.com/syncthing/notify/watcher_kqueue.go diff --git a/vendor/github.com/Zillode/notify/watcher_readdcw.go b/vendor/github.com/syncthing/notify/watcher_readdcw.go similarity index 100% rename from vendor/github.com/Zillode/notify/watcher_readdcw.go rename to vendor/github.com/syncthing/notify/watcher_readdcw.go diff --git a/vendor/github.com/Zillode/notify/watcher_stub.go b/vendor/github.com/syncthing/notify/watcher_stub.go similarity index 100% rename from vendor/github.com/Zillode/notify/watcher_stub.go rename to vendor/github.com/syncthing/notify/watcher_stub.go diff --git a/vendor/github.com/Zillode/notify/watcher_trigger.go b/vendor/github.com/syncthing/notify/watcher_trigger.go similarity index 100% rename from vendor/github.com/Zillode/notify/watcher_trigger.go rename to vendor/github.com/syncthing/notify/watcher_trigger.go diff --git a/vendor/github.com/Zillode/notify/watchpoint.go b/vendor/github.com/syncthing/notify/watchpoint.go similarity index 100% rename from vendor/github.com/Zillode/notify/watchpoint.go rename to vendor/github.com/syncthing/notify/watchpoint.go diff --git a/vendor/github.com/Zillode/notify/watchpoint_other.go b/vendor/github.com/syncthing/notify/watchpoint_other.go similarity index 100% rename from vendor/github.com/Zillode/notify/watchpoint_other.go rename to vendor/github.com/syncthing/notify/watchpoint_other.go diff --git a/vendor/github.com/Zillode/notify/watchpoint_readdcw.go b/vendor/github.com/syncthing/notify/watchpoint_readdcw.go similarity index 100% rename from vendor/github.com/Zillode/notify/watchpoint_readdcw.go rename to vendor/github.com/syncthing/notify/watchpoint_readdcw.go diff --git a/vendor/manifest b/vendor/manifest index 7aefb7c83..2314ecbd9 100644 --- a/vendor/manifest +++ b/vendor/manifest @@ -41,14 +41,6 @@ "branch": "master", "notests": true }, - { - "importpath": "github.com/Zillode/notify", - "repository": "https://github.com/calmh/notify", - "vcs": "git", - "revision": "53dd6873a851fc377c87d82f994b1fecdf25aadb", - "branch": "nopanic", - "notests": true - }, { "importpath": "github.com/a8m/mark", "repository": "https://github.com/a8m/mark", @@ -455,6 +447,14 @@ "branch": "master", "notests": true }, + { + "importpath": "github.com/syncthing/notify", + "repository": "https://github.com/syncthing/notify", + "vcs": "git", + "revision": "e6390324ae88de3571a6b29ed1a20aa631b533d9", + "branch": "master", + "notests": true + }, { "importpath": "github.com/syndtr/goleveldb/leveldb", "repository": "https://github.com/syndtr/goleveldb",