code review 2072041: codereview: Fix uploading for Mercurial 1.6.3

codereview: Fix uploading for Mercurial 1.6.3

See:
http://selenic.com/repo/hg/rev/32b213b9b22c
http://selenic.com/repo/hg/rev/2096496b40ec

[eds, 2010-08-29 17:23:47]

Hello rsc (cc: golang-dev@googlegroups.com),

I'd like you to review this change.

[adg1, 2010-08-29 23:59:44]

What was wrong with it?

On 30 August 2010 03:23,  <chickencha@gmail.com> wrote:
> Reviewers: rsc,
>
> Message:
> Hello rsc (cc: golang-dev@googlegroups.com),
>
> I'd like you to review this change.
>
>
> Description:
> codereview: Fix uploading
>
> Please review this at http://codereview.appspot.com/2072041/
>
> Affected files:
>  M lib/codereview/codereview.py
>
>
> Index: lib/codereview/codereview.py
> ===================================================================
> --- a/lib/codereview/codereview.py
> +++ b/lib/codereview/codereview.py
> @@ -2494,7 +2494,7 @@
>                self.quiet = True
>                self.output = ''
>
> -       def write(self, s):
> +       def write(self, s, label=''):
>                self.output += s
>
>  use_hg_shell = False   # set to True to shell out to hg always; slower
>
>
>

[rsc, 2010-08-30 02:54:15]

I have a guess what was wrong, but please update the
CL description to at least say which version of Mercurial
this is fixing.  It worked for me on at least one version.

Russ

[eds, 2010-08-30 02:56:03]

Hello rsc, adg1 (cc: golang-dev@googlegroups.com),

Please take another look.

[eds, 2010-08-30 02:56:13]

When running hg change (version 1.6.3), I got:
** unknown exception encountered, details follow
** report bug details to http://mercurial.selenic.com/bts/
** or mercurial@selenic.com
** Python 2.6.5 (r265:79063, Apr  1 2010, 05:28:39) [GCC 4.4.3
20100316 (prerelease)]
** Mercurial Distributed SCM (version 1.6.3)
** Extensions loaded: bookmarks, churn, hgk, hggit, mq, codereview
Traceback (most recent call last):
  File "/usr/bin/hg", line 27, in <module>
    mercurial.dispatch.run()
  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line 16, in run
    sys.exit(dispatch(sys.argv[1:]))
  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line
34, in dispatch
    return _runcatch(u, args)
  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line
54, in _runcatch
    return _dispatch(ui, args)
  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line
494, in _dispatch
    cmdpats, cmdoptions)
  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line
355, in runcommand
    ret = _runcommand(ui, options, cmd, d)
  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line
545, in _runcommand
    return checkargs()
  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line
499, in checkargs
    return cmdfunc()
  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line
492, in <lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File "/usr/lib/python2.6/site-packages/mercurial/util.py", line 420, in check
    return func(*args, **kwargs)
  File "/home/shawev/go/lib/codereview/codereview.py", line 868, in change
    d.Flush(ui, repo)
  File "/home/shawev/go/lib/codereview/codereview.py", line 197, in Flush
    self.Upload(ui, repo, gofmt_just_warn=True)
  File "/home/shawev/go/lib/codereview/codereview.py", line 246, in Upload
    files = vcs.GetBaseFiles(data)
  File "/home/shawev/go/lib/codereview/codereview.py", line 2385, in
GetBaseFiles
    files[filename] = self.GetBaseFile(filename)
  File "/home/shawev/go/lib/codereview/codereview.py", line 2581, in GetBaseFile
    ret = commands.status(fui, self.repo, *[relpath], **{'rev':
[self.base_rev], 'copies': True})
  File "/usr/lib/python2.6/site-packages/mercurial/commands.py", line
3484, in status
    label='status.' + state)
TypeError: write() got an unexpected keyword argument 'label'

On Sun, Aug 29, 2010 at 6:59 PM, Andrew Gerrand <adg@google.com> wrote:
> What was wrong with it?
>
> On 30 August 2010 03:23,  <chickencha@gmail.com> wrote:
>> Reviewers: rsc,
>>
>> Message:
>> Hello rsc (cc: golang-dev@googlegroups.com),
>>
>> I'd like you to review this change.
>>
>>
>> Description:
>> codereview: Fix uploading
>>
>> Please review this at http://codereview.appspot.com/2072041/
>>
>> Affected files:
>>  M lib/codereview/codereview.py
>>
>>
>> Index: lib/codereview/codereview.py
>> ===================================================================
>> --- a/lib/codereview/codereview.py
>> +++ b/lib/codereview/codereview.py
>> @@ -2494,7 +2494,7 @@
>>                self.quiet = True
>>                self.output = ''
>>
>> -       def write(self, s):
>> +       def write(self, s, label=''):
>>                self.output += s
>>
>>  use_hg_shell = False   # set to True to shell out to hg always; slower
>>
>>
>>
>

[rsc, 2010-08-30 03:02:36]

Thanks.  Please add "for Mercurial 1.6.3" to the CL description.

On Sun, Aug 29, 2010 at 19:56, Evan Shaw <chickencha@gmail.com> wrote:
> When running hg change (version 1.6.3), I got:
> ** unknown exception encountered, details follow
> ** report bug details to http://mercurial.selenic.com/bts/
> ** or mercurial@selenic.com
> ** Python 2.6.5 (r265:79063, Apr  1 2010, 05:28:39) [GCC 4.4.3
> 20100316 (prerelease)]
> ** Mercurial Distributed SCM (version 1.6.3)
> ** Extensions loaded: bookmarks, churn, hgk, hggit, mq, codereview
> Traceback (most recent call last):
>  File "/usr/bin/hg", line 27, in <module>
>    mercurial.dispatch.run()
>  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line 16, in
run
>    sys.exit(dispatch(sys.argv[1:]))
>  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line
> 34, in dispatch
>    return _runcatch(u, args)
>  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line
> 54, in _runcatch
>    return _dispatch(ui, args)
>  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line
> 494, in _dispatch
>    cmdpats, cmdoptions)
>  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line
> 355, in runcommand
>    ret = _runcommand(ui, options, cmd, d)
>  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line
> 545, in _runcommand
>    return checkargs()
>  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line
> 499, in checkargs
>    return cmdfunc()
>  File "/usr/lib/python2.6/site-packages/mercurial/dispatch.py", line
> 492, in <lambda>
>    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
>  File "/usr/lib/python2.6/site-packages/mercurial/util.py", line 420, in check
>    return func(*args, **kwargs)
>  File "/home/shawev/go/lib/codereview/codereview.py", line 868, in change
>    d.Flush(ui, repo)
>  File "/home/shawev/go/lib/codereview/codereview.py", line 197, in Flush
>    self.Upload(ui, repo, gofmt_just_warn=True)
>  File "/home/shawev/go/lib/codereview/codereview.py", line 246, in Upload
>    files = vcs.GetBaseFiles(data)
>  File "/home/shawev/go/lib/codereview/codereview.py", line 2385, in
> GetBaseFiles
>    files[filename] = self.GetBaseFile(filename)
>  File "/home/shawev/go/lib/codereview/codereview.py", line 2581, in
GetBaseFile
>    ret = commands.status(fui, self.repo, *[relpath], **{'rev':
> [self.base_rev], 'copies': True})
>  File "/usr/lib/python2.6/site-packages/mercurial/commands.py", line
> 3484, in status
>    label='status.' + state)
> TypeError: write() got an unexpected keyword argument 'label'
>
> On Sun, Aug 29, 2010 at 6:59 PM, Andrew Gerrand <adg@google.com> wrote:
>> What was wrong with it?
>>
>> On 30 August 2010 03:23,  <chickencha@gmail.com> wrote:
>>> Reviewers: rsc,
>>>
>>> Message:
>>> Hello rsc (cc: golang-dev@googlegroups.com),
>>>
>>> I'd like you to review this change.
>>>
>>>
>>> Description:
>>> codereview: Fix uploading
>>>
>>> Please review this at http://codereview.appspot.com/2072041/
>>>
>>> Affected files:
>>>  M lib/codereview/codereview.py
>>>
>>>
>>> Index: lib/codereview/codereview.py
>>> ===================================================================
>>> --- a/lib/codereview/codereview.py
>>> +++ b/lib/codereview/codereview.py
>>> @@ -2494,7 +2494,7 @@
>>>                self.quiet = True
>>>                self.output = ''
>>>
>>> -       def write(self, s):
>>> +       def write(self, s, label=''):
>>>                self.output += s
>>>
>>>  use_hg_shell = False   # set to True to shell out to hg always; slower
>>>
>>>
>>>
>>
>

[rsc1, 2010-08-30 03:03:27]

LGTM

[rsc, 2010-08-30 03:04:12]

*** Submitted as http://code.google.com/p/go/source/detail?r=64e693919acd ***

codereview: Fix uploading for Mercurial 1.6.3

See:
http://selenic.com/repo/hg/rev/32b213b9b22c
http://selenic.com/repo/hg/rev/2096496b40ec

R=rsc, adg
CC=golang-dev
http://codereview.appspot.com/2072041

Committer: Russ Cox <rsc@golang.org>