##// END OF EJS Templates
branching: merge stable into default
Raphaël Gomès -
r50559:f56873a7 merge default
parent child Browse files
Show More
@@ -907,7 +907,7 b' def help_('
907 if missing_order:
907 if missing_order:
908 ui.develwarn(
908 ui.develwarn(
909 b'help categories missing from CATEGORY_ORDER: %s'
909 b'help categories missing from CATEGORY_ORDER: %s'
910 % missing_order
910 % stringutil.forcebytestr(missing_order)
911 )
911 )
912
912
913 # List per category.
913 # List per category.
@@ -940,7 +940,7 b' def help_('
940 if missing_order:
940 if missing_order:
941 ui.develwarn(
941 ui.develwarn(
942 b'help categories missing from TOPIC_CATEGORY_ORDER: %s'
942 b'help categories missing from TOPIC_CATEGORY_ORDER: %s'
943 % missing_order
943 % stringutil.forcebytestr(missing_order)
944 )
944 )
945
945
946 # Output topics per category.
946 # Output topics per category.
@@ -1323,7 +1323,7 b' def _globre(pat):'
1323 return res
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 def _regex(kind, pat, globsuffix):
1329 def _regex(kind, pat, globsuffix):
@@ -99,9 +99,9 b' def _limitsample(sample, desiredlen, ran'
99 """
99 """
100 if len(sample) <= desiredlen:
100 if len(sample) <= desiredlen:
101 return sample
101 return sample
102 sample = list(sample)
102 if randomize:
103 if randomize:
103 return set(random.sample(sample, desiredlen))
104 return set(random.sample(sample, desiredlen))
104 sample = list(sample)
105 sample.sort()
105 sample.sort()
106 return set(sample[:desiredlen])
106 return set(sample[:desiredlen])
107
107
@@ -48,6 +48,14 b' A set of extension and shell functions e'
48 > if watchpath is not None:
48 > if watchpath is not None:
49 > ui.status(b'waiting on: %s\n' % watchpath)
49 > ui.status(b'waiting on: %s\n' % watchpath)
50 > limit = 100
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 > while 0 < limit and not os.path.exists(watchpath):
59 > while 0 < limit and not os.path.exists(watchpath):
52 > limit -= 1
60 > limit -= 1
53 > time.sleep(0.1)
61 > time.sleep(0.1)
General Comments 0
You need to be logged in to leave comments. Login now