gcl: add a new flag '-c' that stands for 'contributor'....

gcl: add a new flag '-c' that stands for 'contributor'.

This flag adds a single line 'Patch from' into the commit message. This can help the committer when he is
committing a change for an external contributor.

git cl already has this option with 'git cl dcommit -c contributor-name'

BUG=None
TEST=None

[M-A Ruel, 2009-11-27 16:17:51]

http://codereview.chromium.org/434061/diff/5001/5002
File gcl.py (right):

http://codereview.chromium.org/434061/diff/5001/5002#newcode925
gcl.py:925: parser.add_option('-c', dest='contributor',
parser.add_option('-c', '--contributor',

is more useful.

http://codereview.chromium.org/434061/diff/5001/5003
File tests/gcl_unittest.py (right):

http://codereview.chromium.org/434061/diff/5001/5003#newcode140
tests/gcl_unittest.py:140: def testCommitWithContributor(self):
Ok, I'll give you some pseudo code to start with:

expected_text = """Blah blah\nPatch from john\n"""

self.mox.StubOutWithMock(gcl, 'OptionallyDoPresubmitChecks')
self.mox.StubOutWithMock(gcl, 'GetIssueDescription')
self.mox.StubOutWithMock(gcl, 'GetCodeReviewSetting')
self.mox.StubOutWithMock(gcl.ChangeInfo, 'GetLocalRoot')
self.mox.StubOutWithMock(gcl.ChangeInfo, 'Delete')
self.mox.StubOutWithMock(gcl.tempfile, 'mkstemp')

root_dir1 = self.Dir()
root_dir2 = self.Dir()

change_info = gcl.ChangeInfo('test-commit-contributor', 0, 0, 'testing', [('A',
'aa'), ('B', 'bb')], self.fake_root_dir)

# Call sequence
gcl.OptionallyDoPresubmitChecks(change_info, True, args).AndReturn(True)
file_handle = 42
file_name = "foo"
gcl.tempfile.mkstemp(text=True).AndReturn((file_handle, file_name))
gcl.os.write(file_handle, expected_text)
gcl.os.close(file_handle)
gcl.os.getcwd().AndReturn(root_dir1)
change_info.GetLocalRoot().AndReturn(root_dir2)
gcl.os.chdir(root_dir2)
gcl.os.remove(file_name)
gcl.RunShell([''svn', 'commit', '--file=..',
'--targets=..').AndReturn("Committed revision")

The rest is left as an exercise to the reader. :)

# Now time to actually run the test:
self.ReplayAll()
gcl.Commit(change_info, args)

[M-A Ruel, 2009-12-02 20:58:58]

On 2009/11/27 16:17:51, Marc-Antoine Ruel wrote:
> The rest is left as an exercise to the reader. :)

Did you figure out the mocked function call order?

[tfarina (gmail-do not use), 2009-12-02 23:14:38]

On 2009/12/02 20:58:58, Marc-Antoine Ruel wrote:
> On 2009/11/27 16:17:51, Marc-Antoine Ruel wrote:
> > The rest is left as an exercise to the reader. :)
> 
> Did you figure out the mocked function call order?

I didn't try running it yet, but following your pseudo-code, I think it is:
OptionallyDoPresubmitChecks
mkstemp
GetCodeReviewSetting
GetLocalRoot
GetIssueDescription
Delete