Show More
@@ -944,7 +944,7 b' class localrepository(object):' | |||||
944 | return None |
|
944 | return None | |
945 |
|
945 | |||
946 | def transaction(self, desc, report=None): |
|
946 | def transaction(self, desc, report=None): | |
947 | if (self.ui.configbool('devel', 'all') |
|
947 | if (self.ui.configbool('devel', 'all-warnings') | |
948 | or self.ui.configbool('devel', 'check-locks')): |
|
948 | or self.ui.configbool('devel', 'check-locks')): | |
949 | l = self._lockref and self._lockref() |
|
949 | l = self._lockref and self._lockref() | |
950 | if l is None or not l.held: |
|
950 | if l is None or not l.held: | |
@@ -1249,7 +1249,7 b' class localrepository(object):' | |||||
1249 |
|
1249 | |||
1250 | # We do not need to check for non-waiting lock aquisition. Such |
|
1250 | # We do not need to check for non-waiting lock aquisition. Such | |
1251 | # acquisition would not cause dead-lock as they would just fail. |
|
1251 | # acquisition would not cause dead-lock as they would just fail. | |
1252 | if wait and (self.ui.configbool('devel', 'all') |
|
1252 | if wait and (self.ui.configbool('devel', 'all-warnings') | |
1253 | or self.ui.configbool('devel', 'check-locks')): |
|
1253 | or self.ui.configbool('devel', 'check-locks')): | |
1254 | l = self._lockref and self._lockref() |
|
1254 | l = self._lockref and self._lockref() | |
1255 | if l is not None and l.held: |
|
1255 | if l is not None and l.held: |
@@ -758,7 +758,7 b' class Test(unittest.TestCase):' | |||||
758 | hgrc.write(b'shelve = --date "0 0"\n') |
|
758 | hgrc.write(b'shelve = --date "0 0"\n') | |
759 | hgrc.write(b'tag = -d "0 0"\n') |
|
759 | hgrc.write(b'tag = -d "0 0"\n') | |
760 | hgrc.write(b'[devel]\n') |
|
760 | hgrc.write(b'[devel]\n') | |
761 | hgrc.write(b'all = true\n') |
|
761 | hgrc.write(b'all-warnings = true\n') | |
762 | hgrc.write(b'[largefiles]\n') |
|
762 | hgrc.write(b'[largefiles]\n') | |
763 | hgrc.write(b'usercache = %s\n' % |
|
763 | hgrc.write(b'usercache = %s\n' % | |
764 | (os.path.join(self._testtmp, b'.cache/largefiles'))) |
|
764 | (os.path.join(self._testtmp, b'.cache/largefiles'))) |
@@ -5,7 +5,7 b' Create a repository:' | |||||
5 | defaults.commit=-d "0 0" |
|
5 | defaults.commit=-d "0 0" | |
6 | defaults.shelve=--date "0 0" |
|
6 | defaults.shelve=--date "0 0" | |
7 | defaults.tag=-d "0 0" |
|
7 | defaults.tag=-d "0 0" | |
8 | devel.all=true |
|
8 | devel.all-warnings=true | |
9 | largefiles.usercache=$TESTTMP/.cache/largefiles (glob) |
|
9 | largefiles.usercache=$TESTTMP/.cache/largefiles (glob) | |
10 | ui.slash=True |
|
10 | ui.slash=True | |
11 | ui.interactive=False |
|
11 | ui.interactive=False |
@@ -178,7 +178,7 b' check that local configs for the cached ' | |||||
178 | defaults.commit=-d "0 0" |
|
178 | defaults.commit=-d "0 0" | |
179 | defaults.shelve=--date "0 0" |
|
179 | defaults.shelve=--date "0 0" | |
180 | defaults.tag=-d "0 0" |
|
180 | defaults.tag=-d "0 0" | |
181 | devel.all=true |
|
181 | devel.all-warnings=true | |
182 | largefiles.usercache=$TESTTMP/.cache/largefiles |
|
182 | largefiles.usercache=$TESTTMP/.cache/largefiles | |
183 | ui.slash=True |
|
183 | ui.slash=True | |
184 | ui.interactive=False |
|
184 | ui.interactive=False |
General Comments 0
You need to be logged in to leave comments.
Login now