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

sync, repowidget: fixed track back when using incoming and accept

- sync: refreshTargets was trying to change ctx to a rev that did not exist
- repowidget: re added pullBundle for accepting incoming changesets

Changeset a83e583b0fab…

Parent 61b452e3fae2…

by Michael De Wildt

Changes to one file · Browse files at a83e583b0fab Showing diff from parent 61b452e3fae2 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
223
224
225
 
 
 
 
226
227
228
 
559
560
561
 
 
 
 
 
 
 
 
 
 
 
 
 
 
562
563
564
 
223
224
225
226
227
228
229
230
231
232
 
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
@@ -223,6 +223,10 @@
  def refreshTargets(self, rev):   if type(rev) is not int:   return + + if rev >= len(self.repo): + return +   self.loadTargets(rev)   ctx = self.repo.changectx(rev)   @@ -559,6 +563,20 @@
  else:   self.pushclicked()   + def pullBundle(self, bundle, rev): + 'accept bundle changesets' + if self.cmd.core.is_running(): + self.output.emit(_('sync command already running'), 'control') + return + save = self.currentUrl(False) + orev = self.opts.get('rev') + self.setUrl(bundle) + if rev is not None: + self.opts['rev'] = str(rev) + self.pullclicked() + self.setUrl(save) + self.opts['rev'] = orev +   ##   ## Sync dialog buttons   ##