Implement git cl upload -b BUG --bug=BUG.

tests/git_cl_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for git_cl.py."""
 
 import os
 import StringIO
 import stat
@@ skipping 190 matching lines @@
     test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
     # Rietveld.
     test('https://codereview.source.com/123',
          123, None, 'codereview.source.com')
     test('https://codereview.source.com/www123', fail=True)
     # Gerrrit.
     test('https://chrome-review.source.com/c/123/4',
          123, 4, 'chrome-review.source.com')
     test('https://chrome-review.source.com/bad/123/4', fail=True)
 
+  def test_get_bug_line_value(self):
+    self.assertEqual(git_cl._get_bug_line_value('', ''), '')
+    self.assertEqual(git_cl._get_bug_line_value('', '123,v8:456'), '123,v8:456')
+    self.assertEqual(git_cl._get_bug_line_value('v8', '456'), 'v8:456')
+    self.assertEqual(git_cl._get_bug_line_value('v8', 'chromium:123,456'),
+                     'chromium:123,v8:456')
+
 
 class TestGitCl(TestCase):
   def setUp(self):
     super(TestGitCl, self).setUp()
     self.calls = []
     self._calls_done = []
     self.mock(subprocess2, 'call', self._mocked_call)
     self.mock(subprocess2, 'check_call', self._mocked_call)
     self.mock(subprocess2, 'check_output', self._mocked_call)
     self.mock(subprocess2, 'communicate', self._mocked_call)
@@ skipping 460 matching lines @@
       git_cl.main(['upload', '--send-mail'])
       self.fail()
     except SystemExit:
       self.assertEqual(
           'Using 50% similarity for rename/copy detection. Override with '
           '--similarity.\n',
           stdout.getvalue())
       self.assertEqual(
           'Must specify reviewers to send email.\n', stderr.getvalue())
 
+  def test_bug_on_cmd(self):
+    self._run_reviewer_test(
+        ['--bug=500658,proj:123'],
+        'desc\n\nBUG=500658,proj:123',
+        '# Blah blah comment.\ndesc\n\nBUG=500658,proj:1234',
+        'desc\n\nBUG=500658,proj:1234',
+        [])
+
   def test_dcommit(self):
     self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
     self.calls = (
         self._dcommit_calls_1() +
         self._git_sanity_checks('fake_ancestor_sha', 'working') +
         self._dcommit_calls_normal() +
         self._dcommit_calls_3())
     git_cl.main(['dcommit'])
 
   def test_dcommit_bypass_hooks(self):
@@ skipping 994 matching lines @@
         ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
          ''),
     ]
     cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
 
 
 if __name__ == '__main__':
   git_cl.logging.basicConfig(
       level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
   unittest.main()