Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

thgrepo: use a QFileSystemWatcher to replace the QTimer

Temporarily add more debugging statements in case there are refresh problems.
These should be backed out later, along with the poll timer configurable.

Changeset b9dfd5b5867f…

Parent f45355ac4720…

by Steve Borho

Changes to one file · Browse files at b9dfd5b5867f Showing diff from parent f45355ac4720 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​thgrepo.py Stacked
 
65
66
67
 
68
69
70
 
73
74
75
 
 
76
77
78
79
80
81
82
83
84
85
 
86
87
 
 
 
 
 
88
89
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
90
91
92
93
94
95
96
97
98
99
100
101
102
 
 
 
 
 
 
103
104
 
105
106
107
 
131
132
133
134
135
 
136
137
138
 
141
142
143
 
 
 
 
144
145
146
 
 
147
148
149
 
65
66
67
68
69
70
71
 
74
75
76
77
78
79
 
80
 
 
 
 
 
81
 
82
83
 
84
85
86
87
88
89
 
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
 
115
116
 
 
 
 
 
 
 
117
118
119
120
121
122
123
124
125
126
127
128
 
152
153
154
 
 
155
156
157
158
 
161
162
163
164
165
166
167
168
 
 
169
170
171
172
173
@@ -65,6 +65,7 @@
  configChanged = pyqtSignal()   repositoryChanged = pyqtSignal()   repositoryDestroyed = pyqtSignal() + workingDirectoryChanged = pyqtSignal()   workingBranchChanged = pyqtSignal()     def __init__(self, repo): @@ -73,35 +74,55 @@
  self.busycount = 0   repo.configChanged = self.configChanged   repo.repositoryChanged = self.repositoryChanged + repo.repositoryDestroyed = self.repositoryDestroyed + repo.workingDirectoryChanged = self.workingDirectoryChanged   repo.workingBranchChanged = self.workingBranchChanged - repo.repositoryDestroyed = self.repositoryDestroyed   self.recordState() - try: - freq = repo.ui.config('tortoisehg', 'pollfreq', '500') - freq = max(100, int(freq)) - except: - freq = 500   if isinstance(repo, bundlerepo.bundlerepository): - dbgoutput('not starting timer for bundle repository') + dbgoutput('not watching F/S events for bundle repository')   else: - self._timerevent = self.startTimer(freq) + self.watcher = QFileSystemWatcher(self) + self.watcher.addPath(repo.path) + self.addMissingPaths() + self.watcher.directoryChanged.connect(self.onDirChange) + self.watcher.fileChanged.connect(self.onFileChange)   - def timerEvent(self, event): + @pyqtSlot(QString) + def onDirChange(self, directory): + 'Catch any writes to .hg/ folder, most importantly lock files' + self.pollStatus() + self.addMissingPaths() + + @pyqtSlot(QString) + def onFileChange(self, file): + 'Catch writes or deletions of files we are interested in' + self.pollStatus() + self.addMissingPaths() + + def addMissingPaths(self): + 'Add files to watcher that may have been added or replaced' + existing = [f for f in self._getwatchedfiles() if os.path.isfile(f)] + files = [unicode(f) for f in self.watcher.files()] + for f in existing: + if hglib.tounicode(f) not in files: + dbgoutput('add file to watcher:', f) + self.watcher.addPath(f) + + def pollStatus(self):   if not os.path.exists(self.repo.path):   dbgoutput('Repository destroyed', self.repo.root)   self.repositoryDestroyed.emit() - self.killTimer(self._timerevent)   if self.repo.root in _repocache:   del _repocache[self.repo.root] - elif self.busycount == 0: - self.pollStatus() - else: - dbgoutput('no poll, busy', self.busycount) - - def pollStatus(self): - if not os.path.exists(self.repo.path) or self.locked(): + return + if self.busycount > 0: + dbgoutput('busy, aborting') + return + if self.locked(): + dbgoutput('locked, aborting')   return   if self._checkdirstate(): + dbgoutput('dirstate changed, exiting')   return   self._checkrepotime()   self._checkuimtime() @@ -131,8 +152,7 @@
  except EnvironmentError:   return None   - def _getrepomtime(self): - 'Return the last modification time for the repo' + def _getwatchedfiles(self):   watchedfiles = [self.repo.sjoin('00changelog.i')]   watchedfiles.append(self.repo.join('localtags'))   watchedfiles.append(self.repo.join('bookmarks')) @@ -141,9 +161,13 @@
  watchedfiles.append(self.repo.mq.join('series'))   watchedfiles.append(self.repo.mq.join('guards'))   watchedfiles.append(self.repo.join('patches.queue')) + return watchedfiles + + def _getrepomtime(self): + 'Return the last modification time for the repo'   try: - mtime = [os.path.getmtime(wf) for wf in watchedfiles \ - if os.path.isfile(wf)] + existing = [f for f in self._getwatchedfiles() if os.path.isfile(f)] + mtime = [os.path.getmtime(wf) for wf in existing]   if mtime:   return max(mtime)   except EnvironmentError: