Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

repowidget: accept/reject bundle buttons

Changeset 6722622ee31b…

Parent 0b871bba2149…

by Steve Borho

Changes to one file · Browse files at 6722622ee31b Showing diff from parent 0b871bba2149 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
86
87
88
 
 
 
 
 
 
 
 
 
 
 
89
90
91
 
230
231
232
 
233
234
235
236
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
237
238
239
 
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
 
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
@@ -86,6 +86,17 @@
  tb.gotoSignal.connect(self.goto)   hbox.addWidget(tb)   + self.bundleAccept = b = QPushButton(_('Accept')) + b.setShown(False) + b.setToolTip(_('Pull incoming changesets into your repository')) + b.clicked.connect(self.acceptBundle) + hbox.addWidget(b) + self.bundleReject = b = QPushButton(_('Reject')) + b.setToolTip(_('Reject incoming changesets')) + b.clicked.connect(self.rejectBundle) + b.setShown(False) + hbox.addWidget(b) +   self.filterbar = RepoFilterBar(self.repo)   self.filterbar.branchChanged.connect(self.setBranch)   self.filterbar.progress.connect(self.progress) @@ -230,10 +241,42 @@
  @pyqtSlot(QString)   def setBundle(self, bfile):   self.bundle = unicode(bfile) + oldlen = len(self.repo)   self.repo = thgrepo.repository(self.repo.ui, self.repo.root,   bundle=self.bundle)   self.repoview.setRepo(self.repo)   self.revDetailsWidget.setRepo(self.repo) + self.bundleAccept.setHidden(False) + self.bundleReject.setHidden(False) + self.filterbar.revsetle.setText('incoming()') + self.filterbar.setEnabled(False) + self.titleChanged.emit(self.title()) + newlen = len(self.repo) + self.revset = [self.repo[n].node() for n in range(oldlen, newlen)] + self.repomodel.revset = self.revset + self.reload() + + def clearBundle(self): + self.bundleAccept.setHidden(True) + self.bundleReject.setHidden(True) + self.filterbar.setEnabled(True) + self.filterbar.revsetle.setText('') + self.revset = [] + self.repomodel.revset = self.revset + self.bundle = None + self.titleChanged.emit(self.title()) + self.repo = thgrepo.repository(self.repo.ui, self.repo.root) + self.repoview.setRepo(self.repo) + self.revDetailsWidget.setRepo(self.repo) + + def acceptBundle(self): + # TODO: sync widget needs pullFromBundle that respects postpullops + cmdline = ['pull', '--repository', self.repo.root, self.bundle] + self.clearBundle() + self.runCommand(_('Pull - TortoiseHg'), cmdline) + + def rejectBundle(self): + self.clearBundle()   self.reload()     def clearSet(self):