Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph

Merge with stable

Changeset e26e488fb5d3…

Parents 9b0f60e4448b…

Parents 1ce23abfe5cc…

by Adrian Buehlmann

Changes to 2 files · Browse files at e26e488fb5d3 Showing diff from parent 9b0f60e4448b 1ce23abfe5cc Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
1437
1438
1439
1440
 
1441
1442
1443
 
1485
1486
1487
1488
1489
 
 
1490
1491
1492
1493
1494
1495
1496
1497
 
 
1498
1499
1500
 
1437
1438
1439
 
1440
1441
1442
1443
 
1485
1486
1487
 
 
1488
1489
1490
1491
1492
1493
1494
1495
 
 
1496
1497
1498
1499
1500
@@ -1437,7 +1437,7 @@
  QMessageBox.warning(self,   _('Cannot export revision'),   (_('Cannot export revision %s into the file named:' - '\n\n%s\n') % (rev, epath % rev)) + \ + '\n\n%s\n') % (rev, hglib.tounicode(epath % rev))) + \   _('There is already an existing folder '   'with that same name.'))   return @@ -1485,16 +1485,16 @@
  '<a href="file:///%s">%s</a>%s'   '<a href="file:///%s">%s</a>') \   % (rev, str(self.repo[rev]), - patchdirname, patchdirname, os.path.sep, - patchfilename, patchshortname)) + hglib.tounicode(patchdirname), hglib.tounicode(patchdirname), os.path.sep, + hglib.tounicode(patchfilename), hglib.tounicode(patchshortname)))   else:   # Show a message box with a link to the export folder   qtlib.InfoMsgBox(_('Patches exported'),   _('%d patches were exported to:<p>'   '<a href="file:///%s">%s</a>') \   % (len(revisions), - strdir, - strdir)) + hglib.tounicode(strdir), + hglib.tounicode(strdir)))     def visualDiffRevision(self):   opts = dict(change=self.rev)
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​thgrepo.py Stacked
 
88
89
90
91
 
92
93
94
 
112
113
114
115
116
117
 
 
118
119
120
 
121
122
123
 
88
89
90
 
91
92
93
94
 
112
113
114
 
 
 
115
116
117
118
 
119
120
121
122
@@ -88,7 +88,7 @@
  dbgoutput('not watching F/S events for network drive')   else:   self.watcher = QFileSystemWatcher(self) - self.watcher.addPath(repo.path) + self.watcher.addPath(hglib.tounicode(repo.path))   self.watcher.directoryChanged.connect(self.onDirChange)   self.watcher.fileChanged.connect(self.onFileChange)   self.addMissingPaths() @@ -112,12 +112,11 @@
  for f in existing:   if hglib.tounicode(f) not in files:   dbgoutput('add file to watcher:', f) - self.watcher.addPath(f) - _, files = self.repo.uifiles() - for f in files: + self.watcher.addPath(hglib.tounicode(f)) + for f in self.repo.uifiles()[1]:   if f and os.path.exists(f) and hglib.tounicode(f) not in files:   dbgoutput('add ui file to watcher:', f) - self.watcher.addPath(f) + self.watcher.addPath(hglib.tounicode(f))     def pollStatus(self):   if not os.path.exists(self.repo.path):