[gedit-plugins] Fix issues when a repository is symlinked
- From: Garrett Regier <gregier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit-plugins] Fix issues when a repository is symlinked
- Date: Sun, 17 Aug 2014 22:45:03 +0000 (UTC)
commit f829e96d211c66bcb06e61539091091696d3a573
Author: Garrett Regier <garrettregier gmail com>
Date: Sun Jun 29 14:15:52 2014 -0700
Fix issues when a repository is symlinked
plugins/git/git/appactivatable.py | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/plugins/git/git/appactivatable.py b/plugins/git/git/appactivatable.py
index 7c41e68..6dc4cde 100644
--- a/plugins/git/git/appactivatable.py
+++ b/plugins/git/git/appactivatable.py
@@ -74,6 +74,7 @@ class GitAppActivatable(GObject.Object, Gedit.AppActivatable):
except KeyError:
repo = Ggit.Repository.open(repo_file)
+ repo_workdir_uri = repo.get_workdir().get_uri()
# TODO: this was around even when not used, on purpose?
head = repo.get_head()
@@ -81,10 +82,15 @@ class GitAppActivatable(GObject.Object, Gedit.AppActivatable):
tree = commit.get_tree()
self.__repos[repo_uri] = repo
- self.__repos[repo.get_workdir().get_uri()] = repo
+ self.__repos[repo_workdir_uri] = repo
- while dir_uri not in self.__repos:
+ else:
+ repo_workdir_uri = repo.get_workdir().get_uri()
+
+ # Avoid trouble with symbolic links
+ while dir_uri.startswith(repo_workdir_uri):
self.__repos[dir_uri] = repo
+
dir_location = dir_location.get_parent()
dir_uri = dir_location.get_uri()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]