search

nschum / Gitifier

Git commit notifier for MacOSX
http://psionides.github.com/Gitifier/
Eclipse Public License 1.0
314 stars 15 forks source link

Errors after update to Lion #30

Closed chrissearle closed 12 years ago

chrissearle commented 13 years ago

After upgrade to Lion I am getting lots of errors from Gitifier - they all say:

Cached copy was deleted and can't be restored

Is there any way to avoid delete/add/clone for each watched repo?

Also wondering why they were deleted - but then - could well be the Lion upgrade itself ;)

mackuba commented 13 years ago

The clones are kept in ~/Library/Caches, which is intended as a directory for temporary caches which are normally ignored by the system, but can be deleted e.g. if the disk is full, so it's possible that clearing them is a normal procedure during a system upgrade. Why the re-cloning fails - that I don't know... Either I haven't tested this case well enough (it did work at some point), or Lion keeps the caches in a different form than the Leopards. I'll check this when I have some time (I'm back from holiday and need to catch up with everything ;).

Can you check if you have a ~/Library/Caches directory containing various domain-named directories, if there is a net.psionides.Gitifier subdirectory in it, and what's inside it?

chrissearle commented 13 years ago

Interesting.

I see 4 cache repo dirs there.

Two have local changes (by whom I have no idea at all - not me) - see output below.

I'll force them back to match master.

Where the fifth repo has got too - I'm not sure - but removing/adding should solve that.

~/Library/Caches/net.psionides.Gitifier chris$ for D in 5F0DDF72A9F669AA84EB5BC58BEBF00B 7211E2D9671F6D8AABC5B14E2529BB1B 7A707B10DA3A0618CBB056A6AD418945 B4D41810BD94D904005E6C3ADFDF2A34; do

cd $D git pull cd .. done Already up-to-date. Already up-to-date. Updating 03e9105..1f8c10e error: Your local changes to the following files would be overwritten by merge: Contents/Resources/Common/VideoFiles.py Contents/Resources/Music/Plex Music Scanner.py Please, commit your changes or stash them before you can merge. Aborting Updating 2fa7284..1e8d34c error: Your local changes to the following files would be overwritten by merge: docs/source/userguide/listings/facebook/dashboard_all_facebook_posts.rst docs/source/userguide/listings/facebook/dashboard_listings.rst docs/source/userguide/listings/facebook/dashboard_questions.rst docs/source/userguide/listings/facebook/post_listings.rst docs/source/userguide/listings/twitter/dashboard_ftweets-all.rst docs/source/userguide/listings/twitter/dashboard_links-favorites.rst docs/source/userguide/listings/twitter/dashboard_links-friends.rst docs/source/userguide/listings/twitter/dashboard_links-photos.rst docs/source/userguide/listings/twitter/dashboard_listings.rst docs/source/userguide/listings/twitter/dashboard_tweets-all.rst docs/source/userguide/settings/plugins/facebook.rst tests/TestOfAccountConfigurationController.php tests/TestOfAppConfigController.php tests/TestOfConfig.php tests/TestOfCrawlerAuthController.php tests/TestOfDashboardController.php tests/TestOfExportController.php tests/TestOfExportServiceUserDataController.php tests/TestOfFavoritePostMySQLDAO.php tests/TestOfForgotPasswordController.php tests/TestOfInstallerController.php tests/TestOfLinkMySQLDAO.php tests/TestOfLoginController.php tests/TestOfOptionMySQLDAO.php tests/TestOfOwnerInstanceMySQLDAO.php tests/TestOfOwnerMySQLDAO.php tests/TestOfPasswordResetController.php tests/TestOfPluginMySQLDAO.php tests/TestOfPluginOptionController.php tests/TestOfPluginOptionMySQLDAO.php tests/TestOfPostAPIController.php tests/TestOfPostController.php tests/TestOfPostIterator.php tests/TestOfPostMySQLDAO.php tests/TestOfRegisterController.php tests/TestOfSession.php tests/TestOfStreamerAuthController.php tests/TestOfUpdateNowController.php tests/TestOfUpgradeController.php tests/TestOfWebapp.php tests/WebTestOfDashboard.php tests/WebTestOfInstallation.php tests/WebTestOfLogin.php tests/WebTestOfPostDetailPage.php tests/WebTestOfTwitterDashboard.php tests/WebTestOfUpgradeDatabase.php tests/all_model_tests.php tests/all_plugin_tests.php tests/classes/class.ThinkUpUnitTestCase.php tests/classes/class.ThinkUpWebTestCase.php tests/migration-assertions.php webapp/_lib/controller/class.AccountConfigurationController.php webapp/_lib/controller/class.CrawlerAuthController.php webapp/_lib/controller/class.DashboardController.php webapp/_lib/controller/class.ExportController.php webapp/_lib/controller/class.InstallerController.php webapp/_lib/controller/class.LoginController.php webapp/_lib/controller/class.PasswordResetController.php webapp/_lib/controller/class.PluginOptionController.php webapp/_lib/controller/class.RegisterController.php webapp/_lib/controller/class.StreamerAuthController.php webapp/_lib/controller/class.UpdateNowController.php webapp/_lib/model/class.Config.php webapp/_lib/model/class.FavoritePostMySQLDAO.php webapp/_lib/model/class.InstallerMySQLDAO.php webapp/_lib/model/class.Link.php webapp/_lib/model/class.LinkMySQLDAO.php webapp/_lib/model/class.OwnerMySQLDAO.php webapp/_lib/model/class.PluginHook.php webapp/_lib/model/class.Post.php webapp/_lib/model/class.PostMySQLDAO.php webapp/_lib/model/class.Session.php webapp/_lib/model/interface.LinkDAO.php webapp/_lib/model/interface.OwnerDAO.php webapp/_lib/model/interface.PostDAO.php webapp/_lib/view/_link.tpl webapp/_lib/view/_plugin.options.tpl webapp/_lib/view/_post.author_no_counts.tpl webapp/_lib/view/_post.counts_no_author.tpl webapp/_lib/view/_post.qa.tpl webapp/_lib/view/_post.tpl webapp/_lib/view/_user.tpl webapp/_lib/view/_usermessage.tpl webapp/_lib/view/account.appconfig.tpl webapp/_lib/view/account.index.tpl webapp/_lib/view/crawler.updatenow.tpl webapp/_lib/view/dashboard.tpl webapp/_lib/view/install.repair.tpl webapp/_lib/view/install.step1.tpl webapp/_lib/view/install.step3.tpl webapp/_lib/view/install.upgrade.tpl webapp/_lib/view/plugins/modifier.filter_xss.php webapp/_lib/view/post.index.tpl webapp/_lib/view/session.forgot.tpl webapp/_lib/view/user.index.tpl webapp/assets/css/base.css webapp/assets/css Aborting

chrissearle commented 13 years ago

Followup - in both the cases with changes - all files in the working dir had been git rm'd. So the fix of git reset HEAD; git checkout . brings back the working dir and then allows update to re-run.

The other two repo's have no files visible in their working dirs

BTW - is there any reason that these couldn't be stored in git's bare format - we don't actually need a working dir copy do we?

mackuba commented 13 years ago

I've just checked re-cloning on my machine (Snow Leopard) after deleting some subdirectories or entire Gitifier cache directory, and it worked fine. I'll check again after I upgrade to Lion, but I think the problem was that something was wrong with your cache directories, and I'm not sure why...

The thing is, the caches are stored in the bare format - Gitifier does "git clone -n" which only creates a .git subdirectory but doesn't check out a working copy, that's why two repos didn't have any visible files in them. Why the other two did have files and had working copy modifications - I don't know. Either you've done that by accident, or some other program did that, or there's some other factor that I'm not aware of...