Permalink
Browse files

merge default to production, and remove .hgtags.orig

--HG--
branch : production-0.8
  • Loading branch information...
2 parents 029be28 + 9b48881 commit 4075ef24ef5abf5b7a2a20024404b0c789c64abb @djmitche djmitche committed Jan 10, 2011
Showing with 18 additions and 126 deletions.
  1. +0 −120 .hgtags.orig
  2. +16 −4 misc.py
  3. +2 −2 misc_scheduler.py
View
120 .hgtags.orig
@@ -1,120 +0,0 @@
-637a48dd9b6b118094a07868435633e0b0df4aa4 FIREFOX_3_5_3_RELEASE
-32d7e0c9436057f3f7f7f9bcde079ef368172691 FIREFOX_3_5_4_RELEASE
-b55b599f5f14c7cef4d06347e2529c563e928d85 FIREFOX_3_6b1_RELEASE
-32d7e0c9436057f3f7f7f9bcde079ef368172691 FIREFOX_3_5_4_RELEASE
-b55b599f5f14c7cef4d06347e2529c563e928d85 FIREFOX_3_5_4_RELEASE
-b55b599f5f14c7cef4d06347e2529c563e928d85 FIREFOX_3_5_4_RELEASE
-0563c9b1b567a448e8c355ff65de89adb48dea4a FIREFOX_3_5_4_RELEASE
-b55b599f5f14c7cef4d06347e2529c563e928d85 FIREFOX_3_6b1_RELEASE
-12aeee9b434f7c3ecf9553bbc42b3f9e972c028d FIREFOX_3_6b1_RELEASE
-12aeee9b434f7c3ecf9553bbc42b3f9e972c028d FIREFOX_3_6b1_BUILD2
-20342354dc878ef2d169b967a8300cddd76ed67b FIREFOX_3_6b1_BUILD3
-12aeee9b434f7c3ecf9553bbc42b3f9e972c028d FIREFOX_3_6b1_RELEASE
-03b3f77e4a20c665543dc4bacf34c25c3f3a4b16 FIREFOX_3_6b1_RELEASE
-f2a9d86c5479d0fcae7cc92cc8e62e304246c86d FIREFOX_3_5_5_RELEASE
-db5d3d010d676136e88f07b55ec0cd6367628af0 FIREFOX_3_6b2_RELEASE
-1545d31b5e92642d394eef03d5952e567856596f FIREFOX_3_6b3_RELEASE
-18df53580c863336ac23a767eaab8007b54e4b47 FIREFOX_3_6b4_RELEASE
-bf18fb42ade4a95576399b6c1273fd27ade828d5 FIREFOX_3_6b5_RELEASE
-685fd4d1d94031f8cfc8c2b169f820a8751b727f FIREFOX_3_5_7_RELEASE
-dfa7408e2bd92137102c7cb40987d6d0fb8b5ab4 FIREFOX_3_6rc1_RELEASE
-b07228f9f682cc625a29f674a0fff4961faf35a4 FIREFOX_3_6rc2_RELEASE
-7ad8012e2926ad6a92389c0ec75a5daba21bf0f7 FIREFOX_3_5_8_RELEASE
-7ad8012e2926ad6a92389c0ec75a5daba21bf0f7 FIREFOX_3_5_8_BUILD1
-3bdb7f53d5c3a290c818b56bf08d1f2ba0d60b3a FIREFOX_3_7a1_RELEASE
-5e5c12c1e83ae5a3f3a0e7d722678df023f79819 FIREFOX_3_6_2_RELEASE
-5e5c12c1e83ae5a3f3a0e7d722678df023f79819 FIREFOX_3_6_2_BUILD1
-5b24dd7ca36fc8f1cf5c11e491a039ce02909282 FIREFOX_3_5_9_RELEASE
-5b24dd7ca36fc8f1cf5c11e491a039ce02909282 FIREFOX_3_5_9_BUILD1
-5b24dd7ca36fc8f1cf5c11e491a039ce02909282 FIREFOX_3_7a3_RELEASE
-5b24dd7ca36fc8f1cf5c11e491a039ce02909282 FIREFOX_3_7a3_BUILD1
-5e5c12c1e83ae5a3f3a0e7d722678df023f79819 FIREFOX_3_6_2_RELEASE
-5b24dd7ca36fc8f1cf5c11e491a039ce02909282 FIREFOX_3_6_2_RELEASE
-5b24dd7ca36fc8f1cf5c11e491a039ce02909282 FIREFOX_3_6_2_BUILD3
-967f68af5ac7e5e9638ff2bd0725cbc07e212e05 FIREFOX_3_6_3plugin1_BUILD1
-967f68af5ac7e5e9638ff2bd0725cbc07e212e05 FIREFOX_3_6_3plugin1_RELEASE
-e35cdf3012ae6c4ae9d9caaa714f13d689d65992 FIREFOX_3_6_3_BUILD1
-e35cdf3012ae6c4ae9d9caaa714f13d689d65992 FIREFOX_3_6_3_RELEASE
-d7f7fcb082301d9914a79bb106b34af9eef7be5c FIREFOX_3_6_3plugin1_BUILD2
-967f68af5ac7e5e9638ff2bd0725cbc07e212e05 FIREFOX_3_6_3plugin1_RELEASE
-d7f7fcb082301d9914a79bb106b34af9eef7be5c FIREFOX_3_6_3plugin1_RELEASE
-9726abec8642acc9be7ea61431b15ff8615c6a15 FIREFOX_3_7a4_BUILD1
-9726abec8642acc9be7ea61431b15ff8615c6a15 FIREFOX_3_7a4_RELEASE
-9cb48082972aef10cd93e71637814f5ecd6148c7 FIREFOX_3_6_4_BUILD1
-9cb48082972aef10cd93e71637814f5ecd6148c7 FIREFOX_3_6_4_RELEASE
-b97482cf0ba0c5cb6d9f341cb30e5d75058e4dfc FIREFOX_3_6_4_BUILD2
-9cb48082972aef10cd93e71637814f5ecd6148c7 FIREFOX_3_6_4_RELEASE
-b97482cf0ba0c5cb6d9f341cb30e5d75058e4dfc FIREFOX_3_6_4_RELEASE
-9a76896c8c10985fd62424e9ebef7af54f28280e FIREFOX_3_6_4_BUILD3
-b97482cf0ba0c5cb6d9f341cb30e5d75058e4dfc FIREFOX_3_6_4_RELEASE
-9a76896c8c10985fd62424e9ebef7af54f28280e FIREFOX_3_6_4_RELEASE
-6490ead4317f5e323ff1a0a19442fed7ec0802bc FIREFOX_3_5_10_RELEASE
-6490ead4317f5e323ff1a0a19442fed7ec0802bc FIREFOX_3_5_10_BUILD1
-c7705d122890973bb00a8602ac66fe8930e9058c 20100504_TRYSERVER
-c7a0781ae36f47c86dc52fbec00219cd46653a24 FIREFOX_3_6_4_BUILD4
-9a76896c8c10985fd62424e9ebef7af54f28280e FIREFOX_3_6_4_RELEASE
-c7a0781ae36f47c86dc52fbec00219cd46653a24 FIREFOX_3_6_4_RELEASE
-01941b42d5bf4d75a59750685f66a204457ddbd1 FIREFOX_3_6_4_BUILD5
-c7a0781ae36f47c86dc52fbec00219cd46653a24 FIREFOX_3_6_4_RELEASE
-01941b42d5bf4d75a59750685f66a204457ddbd1 FIREFOX_3_6_4_RELEASE
-733870c48b772e677205357b4f30541152e9e9d2 FIREFOX_3_7a5_BUILD1
-733870c48b772e677205357b4f30541152e9e9d2 FIREFOX_3_7a5_RELEASE
-4dbf9815b1a705d264e53f3e71bfdfa2a8be66bf FIREFOX_3_6_4_BUILD7
-01941b42d5bf4d75a59750685f66a204457ddbd1 FIREFOX_3_6_4_RELEASE
-4dbf9815b1a705d264e53f3e71bfdfa2a8be66bf FIREFOX_3_6_4_RELEASE
-89b96e8163d4d56c0812206763d82875f921eccc FIREFOX_3_6_6_RELEASE
-9f3b1ec76bb809ea07d0acb6ed46f84c7d161dff FIREFOX_3_6_6_BUILD1
-ac6c1173e82e8511a95793e2b9e1d729a4844d32 FIREFOX_4_0b1_RELEASE
-9bf6790fd3cb512607e4ecc498131dcd8b1940cf FIREFOX_4_0b1_BUILD1
-e34f1d3d2477b0e312d95c156e72ab348c2b7a41 FIREFOX_3_5_11_BUILD1
-e34f1d3d2477b0e312d95c156e72ab348c2b7a41 FIREFOX_3_5_11_RELEASE
-e34f1d3d2477b0e312d95c156e72ab348c2b7a41 FIREFOX_3_6_7_RELEASE
-e34f1d3d2477b0e312d95c156e72ab348c2b7a41 FIREFOX_3_6_7_BUILD1
-aaecd78c01087a63c2c5d62db304518ed980b8d4 FIREFOX_3_6_7_BUILD2
-e34f1d3d2477b0e312d95c156e72ab348c2b7a41 FIREFOX_3_6_7_RELEASE
-aaecd78c01087a63c2c5d62db304518ed980b8d4 FIREFOX_3_6_7_RELEASE
-f406be13afb672ddc913290fab5a0dde0efc1391 FIREFOX_4_0b2_BUILD1
-f406be13afb672ddc913290fab5a0dde0efc1391 FIREFOX_4_0b2_RELEASE
-bc11ecd4ea7905026cf18175cb8d46d25187a8f6 FIREFOX_3_6_8_BUILD1
-bc11ecd4ea7905026cf18175cb8d46d25187a8f6 FIREFOX_3_6_8_RELEASE
-d94b2b27d220a445efc8d2cd11121d4e7f5837c7 FIREFOX_4_0b3_BUILD2
-d94b2b27d220a445efc8d2cd11121d4e7f5837c7 FIREFOX_4_0b3_RELEASE
-5a52ac1ad69f993b50f9affb64535dfb58c7f8ad FIREFOX_4_0b3_BUILD3
-d94b2b27d220a445efc8d2cd11121d4e7f5837c7 FIREFOX_4_0b3_RELEASE
-5a52ac1ad69f993b50f9affb64535dfb58c7f8ad FIREFOX_4_0b3_RELEASE
-6eabd31d645a04b2aa248a5090eb9326fcc89d5a FIREFOX_4_0b4_RELEASE
-2bcf2c8ea58f253fe714c08f3a75088e37824569 FIREFOX_4_0b4_BUILD1
-ead272d9c5f77852d41c341fc0b7501824284c38 FIREFOX_4_0b4_BUILD2
-8bd67d9b34ca03a2d63c6dc9943182be93a3693c FIREFOX_4_0b4_BUILD3
-6eabd31d645a04b2aa248a5090eb9326fcc89d5a FIREFOX_4_0b4_RELEASE
-76001a83224393180f1d8d6b3ac4a39c706e5e25 FIREFOX_4_0b4_RELEASE
-76001a83224393180f1d8d6b3ac4a39c706e5e25 FIREFOX_4_0b4_RELEASE
-8bd67d9b34ca03a2d63c6dc9943182be93a3693c FIREFOX_4_0b4_RELEASE
-df8c105142f7e2cd0ced8513e46cd2fb78451d0c FIREFOX_3_6_9_BUILD1
-df8c105142f7e2cd0ced8513e46cd2fb78451d0c FIREFOX_3_6_9_RELEASE
-be46325d78e4c9cf1f1a70b116f3096c32976337 FENNEC_2_0a1_BUILD3
-91ac624a5d75585ff5233fb770f8e1fa9991153a FENNEC_2_0a1_RELEASE
-d7b9341b1150d264ef4cfc4a4f26bf5b446c8aa6 FIREFOX_4_0b5_BUILD1,FIREFOX_4_0b5_RELEASE
-d7b9341b1150d264ef4cfc4a4f26bf5b446c8aa6 FIREFOX_4_0b5_RELEASE
-d7b9341b1150d264ef4cfc4a4f26bf5b446c8aa6 FIREFOX_4_0b5_BUILD1
-d7b9341b1150d264ef4cfc4a4f26bf5b446c8aa6 FIREFOX_4_0b5_BUILD1,FIREFOX_4_0b5_RELEASE
-0000000000000000000000000000000000000000 FIREFOX_4_0b5_BUILD1,FIREFOX_4_0b5_RELEASE
-a442292ead200dbb682e2f86404a137e05720ed9 FIREFOX_3_6_10_RELEASE
-a442292ead200dbb682e2f86404a137e05720ed9 FIREFOX_3_6_10_BUILD1
-6ab5b3c00526daca941efc6690255908641d1c46 FIREFOX_3_5_14_RELEASE
-6ab5b3c00526daca941efc6690255908641d1c46 FIREFOX_3_5_14_BUILD1
-a442292ead200dbb682e2f86404a137e05720ed9 FIREFOX_3_6_11_BUILD1
-a442292ead200dbb682e2f86404a137e05720ed9 FIREFOX_3_6_11_RELEASE
-6ab5b3c00526daca941efc6690255908641d1c46 FIREFOX_3_5_14_RELEASE
-6119150005678f77e28e11108012cde451b59a31 FIREFOX_3_5_14_RELEASE
-6119150005678f77e28e11108012cde451b59a31 FIREFOX_3_5_14_BUILD2
-6119150005678f77e28e11108012cde451b59a31 FIREFOX_3_5_14_RELEASE
-cdec96e45fd507d1d427451bcbfeab63738b5478 FIREFOX_3_5_14_RELEASE
-cdec96e45fd507d1d427451bcbfeab63738b5478 FIREFOX_3_5_14_BUILD3
-dadaef9623c8c0f21c0a37b65bab0c95da06f6ed FENNEC_4_0b1_BUILD1
-6780070401b8630d4ca71deab596c37f5908d293 FENNEC_4_0b1_RELEASE
-2bb90ca4849bf0d748e0220d4938d33b8facd998 FENNEC_4_0b1_BUILD2
-c521a2a73c6dfeef1ab53df3abf0a0dd9c77a2ac FENNEC_4_0b1_RELEASE
-5e88d9565da27f14f6250d8558a22211df1529a2 FENNEC_4_0b1_BUILD3
-c521a2a73c6dfeef1ab53df3abf0a0dd9c77a2ac FENNEC_4_0b1_RELEASE
-5e88d9565da27f14f6250d8558a22211df1529a2 FENNEC_4_0b1_RELEASE
View
20 misc.py
@@ -595,7 +595,10 @@ def generateBranchObjects(config, name):
# Debug unittests
if pf.get('enable_unittests'):
test_builders = []
- base_name = config['platforms'][platform.replace("-debug", "")]['base_name']
+ if 'opt_base_name' in config['platforms'][platform]:
+ base_name = config['platforms'][platform]['opt_base_name']
+ else:
+ base_name = config['platforms'][platform.replace("-debug", "")]['base_name']
for suites_name, suites in config['unittest_suites']:
unittestPrettyNames[platform] = '%s debug test' % base_name
test_builders.extend(generateTestBuilderNames('%s debug test' % base_name, suites_name, suites))
@@ -1024,7 +1027,10 @@ def generateBranchObjects(config, name):
suites = suites[:]
suites.remove('mochitest-a11y')
- base_name = config['platforms'][platform.replace("-debug", "")]['base_name']
+ if 'opt_base_name' in config['platforms'][platform]:
+ base_name = config['platforms'][platform]['opt_base_name']
+ else:
+ base_name = config['platforms'][platform.replace("-debug", "")]['base_name']
branchObjects['builders'].extend(generateTestBuilder(
config, name, platform, "%s debug test" % base_name,
@@ -1499,7 +1505,10 @@ def generateCCBranchObjects(config, name):
# Debug unittests
if pf.get('enable_unittests'):
test_builders = []
- base_name = config['platforms'][platform.replace("-debug", "")]['base_name']
+ if 'opt_base_name' in config['platforms'][platform]:
+ base_name = config['platforms'][platform]['opt_base_name']
+ else:
+ base_name = config['platforms'][platform.replace("-debug", "")]['base_name']
for suites_name, suites in config['unittest_suites']:
unittestPrettyNames[platform] = '%s debug test' % base_name
test_builders.extend(generateTestBuilderNames('%s debug test' % base_name, suites_name, suites))
@@ -1902,7 +1911,10 @@ def generateCCBranchObjects(config, name):
suites = suites[:]
suites.remove('mochitest-a11y')
- base_name = config['platforms'][platform.replace("-debug", "")]['base_name']
+ if 'opt_base_name' in config['platforms'][platform]:
+ base_name = config['platforms'][platform]['opt_base_name']
+ else:
+ base_name = config['platforms'][platform.replace("-debug", "")]['base_name']
branchObjects['builders'].extend(generateCCTestBuilder(
config, name, platform, "%s debug test" % base_name,
View
4 misc_scheduler.py
@@ -128,8 +128,8 @@ def changeEventGeneratorInTransaction(dbconn, t, branches=[],
pieces.append("when_timestamp > %d" % minTime)
q += " AND ".join(pieces)
q += " ORDER BY changeid DESC"
- rows = t.execute(q, tuple(args))
- for (changeid,) in rows:
+ t.execute(q, tuple(args))
+ for (changeid,) in t.fetchall():
yield dbconn._txn_getChangeNumberedNow(t, changeid)
def lastChangeset(db, t, branch):

0 comments on commit 4075ef2

Please sign in to comment.