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

stable sync: do not use --bookmark argument for target in in/out commands (refs #901)

Changeset 50c4edcc5ab1…

Parent b3a56b2e952d…

by Steve Borho

Changes to one file · Browse files at 50c4edcc5ab1 Showing diff from parent b3a56b2e952d Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
332
333
334
335
336
337
338
339
340
341
342
343
344
 
619
620
621
622
 
 
 
 
 
 
 
623
624
625
 
774
775
776
777
 
778
779
780
 
875
876
877
878
 
879
880
881
 
332
333
334
 
 
 
 
 
 
 
335
336
337
 
612
613
614
 
615
616
617
618
619
620
621
622
623
624
 
773
774
775
 
776
777
778
779
 
874
875
876
 
877
878
879
880
@@ -332,13 +332,6 @@
  index = 0   self.targetcombo.setCurrentIndex(index)   - def applyTargetOption(self, cmdline): - if self.embedded and self.targetcheckbox.isChecked(): - idx = self.targetcombo.currentIndex() - if idx != -1 and idx < len(self.targetargs): - cmdline += self.targetargs[idx] - return cmdline -   def configChanged(self):   'Repository is reporting its config files have changed'   self.reload() @@ -619,7 +612,13 @@
  cmdline.append(val)     if 'rev' in details and '--rev' not in cmdline: - cmdline = self.applyTargetOption(cmdline) + if self.embedded and self.targetcheckbox.isChecked(): + idx = self.targetcombo.currentIndex() + if idx != -1 and idx < len(self.targetargs): + args = self.targetargs[idx] + if args[0][2:] not in details: + args[0] = '--rev' + cmdline += args   if self.opts.get('noproxy'):   cmdline += ['--config', 'http_proxy.host=']   if self.opts.get('debug'): @@ -774,7 +773,7 @@
  cmdline += ['--update', '--config', uimerge]   elif self.cachedpp == 'fetch':   cmdline[2] = 'fetch' - self.run(cmdline, ('force', 'branch', 'rev')) + self.run(cmdline, ('force', 'branch', 'rev', 'bookmark'))     def outclicked(self):   url = self.currentUrl(True) @@ -875,7 +874,7 @@
  cmdline.extend(['--rev', str(rev)])   if branch:   cmdline.extend(['--branch', branch]) - self.run(cmdline, ('force', 'new-branch', 'branch', 'rev')) + self.run(cmdline, ('force', 'new-branch', 'branch', 'rev', 'bookmark'))     def postpullclicked(self):   dlg = PostPullDialog(self.repo, self)