Show More
@@ -907,7 +907,7 b' def help_(' | |||
|
907 | 907 | if missing_order: |
|
908 | 908 | ui.develwarn( |
|
909 | 909 | b'help categories missing from CATEGORY_ORDER: %s' |
|
910 | % missing_order | |
|
910 | % stringutil.forcebytestr(missing_order) | |
|
911 | 911 | ) |
|
912 | 912 | |
|
913 | 913 | # List per category. |
@@ -940,7 +940,7 b' def help_(' | |||
|
940 | 940 | if missing_order: |
|
941 | 941 | ui.develwarn( |
|
942 | 942 | b'help categories missing from TOPIC_CATEGORY_ORDER: %s' |
|
943 | % missing_order | |
|
943 | % stringutil.forcebytestr(missing_order) | |
|
944 | 944 | ) |
|
945 | 945 | |
|
946 | 946 | # Output topics per category. |
@@ -1323,7 +1323,7 b' def _globre(pat):' | |||
|
1323 | 1323 | return res |
|
1324 | 1324 | |
|
1325 | 1325 | |
|
1326 | FLAG_RE = util.re.compile(b'^\(\?([aiLmsux]+)\)(.*)') | |
|
1326 | FLAG_RE = util.re.compile(br'^\(\?([aiLmsux]+)\)(.*)') | |
|
1327 | 1327 | |
|
1328 | 1328 | |
|
1329 | 1329 | def _regex(kind, pat, globsuffix): |
@@ -99,9 +99,9 b' def _limitsample(sample, desiredlen, ran' | |||
|
99 | 99 | """ |
|
100 | 100 | if len(sample) <= desiredlen: |
|
101 | 101 | return sample |
|
102 | sample = list(sample) | |
|
102 | 103 | if randomize: |
|
103 | 104 | return set(random.sample(sample, desiredlen)) |
|
104 | sample = list(sample) | |
|
105 | 105 | sample.sort() |
|
106 | 106 | return set(sample[:desiredlen]) |
|
107 | 107 |
@@ -48,6 +48,14 b' A set of extension and shell functions e' | |||
|
48 | 48 | > if watchpath is not None: |
|
49 | 49 | > ui.status(b'waiting on: %s\n' % watchpath) |
|
50 | 50 | > limit = 100 |
|
51 | > test_default_timeout = os.environ.get('HGTEST_TIMEOUT_DEFAULT') | |
|
52 | > test_timeout = os.environ.get('HGTEST_TIMEOUT') | |
|
53 | > if ( | |
|
54 | > test_default_timeout is not None | |
|
55 | > and test_timeout is not None | |
|
56 | > and test_default_timeout < test_timeout | |
|
57 | > ): | |
|
58 | > limit = int(limit * (test_timeout / test_default_timeout)) | |
|
51 | 59 | > while 0 < limit and not os.path.exists(watchpath): |
|
52 | 60 | > limit -= 1 |
|
53 | 61 | > time.sleep(0.1) |
General Comments 0
You need to be logged in to leave comments.
Login now