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

mercurial.util.user_rcpath was moved to scmutil

Changeset 1511f7d15aa2…

Parent ac09a28c919f…

by Adrian Buehlmann

Changes to 3 files · Browse files at 1511f7d15aa2 Showing diff from parent ac09a28c919f Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
7
8
9
10
 
11
12
13
 
817
818
819
820
 
821
822
823
 
7
8
9
 
10
11
12
13
 
817
818
819
 
820
821
822
823
@@ -7,7 +7,7 @@
   import os   -from mercurial import ui, util, error +from mercurial import ui, scmutil, util, error    from PyQt4.QtCore import *  from PyQt4.QtGui import * @@ -817,7 +817,7 @@
  self.saveToPath([fn])     def saveGlobal(self): - self.saveToPath(util.user_rcpath()) + self.saveToPath(scmutil.user_rcpath())     def saveToPath(self, path):   fn, cfg = qtlib.loadIniFile(path, self)
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​settings.py Stacked
 
7
8
9
10
 
11
12
13
 
703
704
705
706
 
707
708
709
 
974
975
976
977
 
978
979
980
 
7
8
9
 
10
11
12
13
 
703
704
705
 
706
707
708
709
 
974
975
976
 
977
978
979
980
@@ -7,7 +7,7 @@
   import os   -from mercurial import ui, util, error +from mercurial import ui, scmutil, util, error    from tortoisehg.util import hglib, settings, paths, wconfig, i18n, bugtraq  from tortoisehg.hgqt.i18n import _ @@ -703,7 +703,7 @@
    self.conftabs = QTabWidget()   layout.addWidget(self.conftabs) - utab = SettingsForm(rcpath=util.user_rcpath(), focus=focus) + utab = SettingsForm(rcpath=scmutil.user_rcpath(), focus=focus)   self.conftabs.addTab(utab, qtlib.geticon('settings_user'),   _("%s's global settings") % username())   utab.restartRequested.connect(self._pushRestartRequest) @@ -974,7 +974,7 @@
  w = func(opts)   w.installEventFilter(self)   if e.globalonly: - w.setEnabled(self.rcpath == util.user_rcpath()) + w.setEnabled(self.rcpath == scmutil.user_rcpath())   lbl = QLabel(e.label)   lbl.installEventFilter(self)   lbl.setToolTip(e.tooltip)
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
14
15
16
17
 
18
19
20
 
1212
1213
1214
1215
 
1216
1217
1218
 
14
15
16
 
17
18
19
20
 
1212
1213
1214
 
1215
1216
1217
1218
@@ -14,7 +14,7 @@
 from PyQt4.QtCore import *  from PyQt4.QtGui import *   -from mercurial import hg, ui, url, util, error, demandimport +from mercurial import hg, ui, url, scmutil, util, error, demandimport  from mercurial import merge as mergemod    from tortoisehg.util import hglib, wconfig @@ -1212,7 +1212,7 @@
  qtlib.openhelpcontents('sync.html#security')     def accept(self): - path = util.user_rcpath() + path = scmutil.user_rcpath()   fn, cfg = qtlib.loadIniFile(path, self)   if not hasattr(cfg, 'write'):   qtlib.WarningMsgBox(_('Unable to save authentication'),