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

Merge with stable

Changeset f45355ac4720…

Parents 13a918fd2aa2…

Parents f2374c2cdcb8…

by Steve Borho

Changes to 2 files · Browse files at f45355ac4720 Showing diff from parent 13a918fd2aa2 f2374c2cdcb8 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
713
714
715
716
 
717
718
719
 
713
714
715
 
716
717
718
719
@@ -713,7 +713,7 @@
  bfile = bfile.replace('/', '_')   bfile = tempfile.mktemp('.hg', bfile+'_', qtlib.gettempdir())   self.finishfunc = finished - cmdline = ['--repository', self.repo.root, 'incoming', + cmdline = ['--repository', self.repo.root, 'incoming', '--quiet',   '--bundle', bfile]   self.run(cmdline, ('force', 'branch', 'rev'))   else:
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​thgrepo.py Stacked
 
81
82
83
84
 
 
 
 
85
86
87
 
81
82
83
 
84
85
86
87
88
89
90
@@ -81,7 +81,10 @@
  freq = max(100, int(freq))   except:   freq = 500 - self._timerevent = self.startTimer(freq) + if isinstance(repo, bundlerepo.bundlerepository): + dbgoutput('not starting timer for bundle repository') + else: + self._timerevent = self.startTimer(freq)     def timerEvent(self, event):   if not os.path.exists(self.repo.path):