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 e3274375e7be…

Parents 33509cc2f440…

Parents 309de148cd73…

by Steve Borho

Changes to 3 files · Browse files at e3274375e7be Showing diff from parent 33509cc2f440 309de148cd73 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​qtlib.py Stacked
 
39
40
41
42
43
44
 
 
 
 
45
46
47
 
39
40
41
 
 
 
42
43
44
45
46
47
48
@@ -39,9 +39,10 @@
 def gettempdir():   global tmproot   def cleanup(): - def writeable(arg, dirname, fnames): - for fname in fnames: - os.chmod(os.path.join(dirname, fname), stat.S_IWUSR) + def writeable(arg, dirname, names): + for name in names: + fullname = os.path.join(dirname, name) + os.chmod(fullname, os.stat(fullname).st_mode | stat.S_IWUSR)   try:   os.path.walk(tmproot, writeable, None)   shutil.rmtree(tmproot)
Change 1 of 4 Show Entire File tortoisehg/​hgqt/​update.py Stacked
 
7
8
9
10
11
12
13
 
14
15
16
17
18
 
 
 
19
20
21
 
144
145
146
147
148
149
150
 
152
153
154
 
 
155
156
157
 
318
319
320
321
322
323
324
 
7
8
9
 
 
 
 
10
11
12
13
14
15
16
17
18
19
20
21
 
144
145
146
 
147
148
149
 
151
152
153
154
155
156
157
158
 
319
320
321
 
322
323
324
@@ -7,15 +7,15 @@
 # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.   -from PyQt4.QtCore import * -from PyQt4.QtGui import * - -from mercurial import error, merge as mergemod +from mercurial import error    from tortoisehg.util import hglib, paths  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import cmdui, csinfo, qtlib, thgrepo, resolve   +from PyQt4.QtCore import * +from PyQt4.QtGui import * +  class UpdateDialog(QDialog):     output = pyqtSignal(QString, QString) @@ -144,7 +144,6 @@
  self.setWindowIcon(qtlib.geticon('hg-update'))     # prepare to show - self.rev_combo.lineEdit().selectAll()   self.cmd.setHidden(True)   self.cancel_btn.setHidden(True)   self.detail_btn.setHidden(True) @@ -152,6 +151,8 @@
  self.autoresolve_chk.setHidden(True)   self.showlog_chk.setHidden(True)   self.update_info() + if not self.update_btn.isEnabled(): + self.rev_combo.lineEdit().selectAll() # need to change rev     ### Private Methods ###   @@ -318,7 +319,6 @@
  self.cancel_btn.setDisabled(True)    def run(ui, *pats, **opts): - from tortoisehg.util import paths   repo = thgrepo.repository(ui, path=paths.find_root())   rev = None   if opts.get('rev'):
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​visdiff.py Stacked
 
83
84
85
 
86
87
 
88
89
90
 
83
84
85
86
87
 
88
89
90
91
@@ -83,8 +83,9 @@
 def snapshot(repo, files, ctx):   '''snapshot files as of some revision'''   dirname = os.path.basename(repo.root) or 'root' + dirname += '.%d' % _diffCount   if ctx.rev() is not None: - dirname = '%s.%d.%d' % (dirname, _diffCount, ctx.rev()) + dirname += '.%d' % ctx.rev()   base = os.path.join(qtlib.gettempdir(), dirname)   fns_and_mtime = []   if not os.path.exists(base):