Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge with master.

  • Loading branch information...
commit 0ed9886c8bd11f8961b704249eeacaaec90de77d 2 parents 8dcbc93 + 5e20672
Mounir Lamouri mounirlamouri authored

Showing 1 changed file with 14 additions and 13 deletions. Show diff stats Hide diff stats

  1. +14 13 trychooser
27 trychooser
@@ -39,7 +39,6 @@ p_any = NoPrompt (" -p ")
39 39 p_linux = N ("Linux", "Build on i386 (32-bit) linux", 'linux,')
40 40 p_linux64 = N ("linux64", "Build on x86-64 (64-bit) linux", 'linux64,')
41 41 p_linuxqt = N ("linuxqt", "Build on Qt linux", 'linuxqt,')
42   -p_macosx = N ("macosx", "Build on Mac OSX 10.5 (i386, 32-bit, part of a universal binary)", 'macosx,')
43 42 p_macosx64 = N ("macosx64", "Build on Mac OSX 10.6 (x86-64, 64-bit, part of a universal binary)", 'macosx64,')
44 43 p_win32 = N ("win32", "Build on Windows", 'win32,')
45 44 p_win64 = N ("win32", "Build on Windows", 'win64,')
@@ -135,10 +134,8 @@ p_all.n = p_any
135 134 p_any.next = p_linux
136 135 p_linux.y = p_linux64
137 136 p_linux.n = p_linux64
138   -p_linux64.y = p_macosx
139   -p_linux64.n = p_macosx
140   -p_macosx.y = p_macosx64
141   -p_macosx.n = p_macosx64
  137 +p_linux64.y = p_macosx64
  138 +p_linux64.n = p_macosx64
142 139 p_macosx64.y = p_win32
143 140 p_macosx64.n = p_win32
144 141 p_win32.y = p_android
@@ -458,13 +455,14 @@ For all questions, choosing Y means adding something to the TryChooser string. C
458 455 ui.write(_("Creates the trychooser mq entry...\n"))
459 456 mq.new(ui, repo, 'trychooser', message=msg)
460 457
461   - ui.write(_("View the results of your push at http://tbpl.mozilla.org/?tree=Try&rev=%s\n") % (repo[None].p1()))
462   -
463   - ui.write(_("Push to try server...\n"))
464   - try:
465   - commands.push(ui, repo, "ssh://hg.mozilla.org/try", force=True)
466   - except:
467   - ui.write("ERROR: failed to push to try server!\n");
  458 + if opts.get('dry_run'):
  459 + ui.write(_("Pretending to push to try server...\n"))
  460 + else:
  461 + ui.write(_("Push to try server...\n"))
  462 + try:
  463 + commands.push(ui, repo, "ssh://hg.mozilla.org/try", force=True)
  464 + except:
  465 + ui.write("ERROR: failed to push to try server!\n");
468 466
469 467 # In Mercurial 2.1 phases support was added, and until Mozilla updates to
470 468 # this version and configures the try repository to be non-publishing, we
@@ -481,7 +479,10 @@ For all questions, choosing Y means adding something to the TryChooser string. C
481 479 cmdtable = {
482 480 "trychooser":
483 481 (run_mercurial_command,
484   - [('m', 'message', '', _('use text as try message'))],
  482 + [
  483 + ('n', 'dry-run', False, _('do not perform actions, just print output')),
  484 + ('m', 'message', '', _('use text as try message'))
  485 + ],
485 486 _('hg trychooser [-m TEXT]')
486 487 )
487 488 }

0 comments on commit 0ed9886

Please sign in to comment.
Something went wrong with that request. Please try again.