Update upload.py @827fa087f74d, which includes support for svn 1.7

Update upload.py @827fa087f74d, which includes support for svn 1.7

It also removes the need of manually creating a subject argument.

Other related changes in this CL:
- Reenable the prompt for patchset title in gcl. I'm not sure why it was disabled.
- Remove git cl upload --desc_from_logs flag. --force is already meaningful.

R=cmp@chromium.org
BUG=
TEST=

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=119066

[cmp, 2012-01-23 21:03:54]

lgtm

[commit-bot: I haz the power, 2012-01-24 18:06:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/maruel@chromium.org/9193023/4001

[commit-bot: I haz the power, 2012-01-24 18:12:46]

Presubmit check for 9193023-4001 failed and returned exit status 1.

Running presubmit commit checks ...
Checking out rietveld...
Running push-basic.sh
Running save-description-on-failure.sh
Running basic.sh
Running upload-stale.sh
Running upload-local-tracking-branch.sh
Running patch.sh
Running submit-from-new-dir.sh
Running post-dcommit-hook-test.sh
Running hooks.sh
Running abandon.sh
Running upstream.sh

** Presubmit Messages **
You should install python 2.5 and run ln -s $(which python2.5) python.
A great place to put this symlink is in depot_tools.
Otherwise, you break depot_tools on python 2.5, you get to keep the pieces.

** Presubmit ERRORS **
push-basic.sh failed
Command /mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/push-basic.sh
returned non-zero exit status 1 in
/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests
Setting up test upstream git repo...
Setting up test git repo...
Branch work set up to track remote branch master from origin.
TESTING: git-cl upload wants a server
TESTING: git-cl status has no issue
TESTING: upload succeeds (needs a server running on localhost)
Traceback (most recent call last):
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1428, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1413, in main
    return command(parser, argv[1:])
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 972, in CMDupload
    issue, patchset = upload.RealMain(['upload'] + upload_args + args)
  File
"/mnt/data/b/commit-queue/workdir/tools/depot_tools/third_party/upload.py", line
2338, in RealMain
    payload=payload)
  File
"/mnt/data/b/commit-queue/workdir/tools/depot_tools/third_party/upload.py", line
394, in Send
    f = self.opener.open(req)
  File "/usr/lib/python2.6/urllib2.py", line 397, in open
    response = meth(req, response)
  File "/usr/lib/python2.6/urllib2.py", line 510, in http_response
    'http', request, response, code, msg, hdrs)
  File "/usr/lib/python2.6/urllib2.py", line 435, in error
    return self._call_chain(*args)
  File "/usr/lib/python2.6/urllib2.py", line 369, in _call_chain
    result = func(*args)
  File "/usr/lib/python2.6/urllib2.py", line 518, in http_error_default
    raise HTTPError(req.get_full_url(), code, msg, hdrs, fp)
urllib2.HTTPError: HTTP Error 404: NOT FOUND
TESTING: git-cl status now knows the issue
FAILURE: git-cl status now knows the issue


basic.sh failed
Command /mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/basic.sh
returned non-zero exit status 1 in
/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests
Setting up test SVN repo...
Setting up test git-svn repo...
TESTING: git-cl upload wants a server
TESTING: git-cl status has no issue
TESTING: upload succeeds (needs a server running on localhost)
Traceback (most recent call last):
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1428, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1413, in main
    return command(parser, argv[1:])
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 972, in CMDupload
    issue, patchset = upload.RealMain(['upload'] + upload_args + args)
  File
"/mnt/data/b/commit-queue/workdir/tools/depot_tools/third_party/upload.py", line
2338, in RealMain
    payload=payload)
  File
"/mnt/data/b/commit-queue/workdir/tools/depot_tools/third_party/upload.py", line
394, in Send
    f = self.opener.open(req)
  File "/usr/lib/python2.6/urllib2.py", line 397, in open
    response = meth(req, response)
  File "/usr/lib/python2.6/urllib2.py", line 510, in http_response
    'http', request, response, code, msg, hdrs)
  File "/usr/lib/python2.6/urllib2.py", line 435, in error
    return self._call_chain(*args)
  File "/usr/lib/python2.6/urllib2.py", line 369, in _call_chain
    result = func(*args)
  File "/usr/lib/python2.6/urllib2.py", line 518, in http_error_default
    raise HTTPError(req.get_full_url(), code, msg, hdrs, fp)
urllib2.HTTPError: HTTP Error 404: NOT FOUND
TESTING: git-cl status now knows the issue
FAILURE: git-cl status now knows the issue


patch.sh failed
Command /mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/patch.sh
returned non-zero exit status 1 in
/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests
Setting up test SVN repo...
Setting up test git-svn repo...
TESTING: upload succeeds (needs a server running on localhost)
Traceback (most recent call last):
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1428, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1413, in main
    return command(parser, argv[1:])
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 972, in CMDupload
    issue, patchset = upload.RealMain(['upload'] + upload_args + args)
  File
"/mnt/data/b/commit-queue/workdir/tools/depot_tools/third_party/upload.py", line
2338, in RealMain
    payload=payload)
  File
"/mnt/data/b/commit-queue/workdir/tools/depot_tools/third_party/upload.py", line
394, in Send
    f = self.opener.open(req)
  File "/usr/lib/python2.6/urllib2.py", line 397, in open
    response = meth(req, response)
  File "/usr/lib/python2.6/urllib2.py", line 510, in http_response
    'http', request, response, code, msg, hdrs)
  File "/usr/lib/python2.6/urllib2.py", line 435, in error
    return self._call_chain(*args)
  File "/usr/lib/python2.6/urllib2.py", line 369, in _call_chain
    result = func(*args)
  File "/usr/lib/python2.6/urllib2.py", line 518, in http_error_default
    raise HTTPError(req.get_full_url(), code, msg, hdrs, fp)
urllib2.HTTPError: HTTP Error 404: NOT FOUND
TESTING: git-cl status now knows the issue
FAILURE: git-cl status now knows the issue


submit-from-new-dir.sh failed
Command
/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/submit-from-new-dir.sh
returned non-zero exit status 1 in
/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests
Setting up test SVN repo...
Setting up test git-svn repo...
TESTING: upload succeeds
Traceback (most recent call last):
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1428, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1413, in main
    return command(parser, argv[1:])
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 972, in CMDupload
    issue, patchset = upload.RealMain(['upload'] + upload_args + args)
  File
"/mnt/data/b/commit-queue/workdir/tools/depot_tools/third_party/upload.py", line
2338, in RealMain
    payload=payload)
  File
"/mnt/data/b/commit-queue/workdir/tools/depot_tools/third_party/upload.py", line
394, in Send
    f = self.opener.open(req)
  File "/usr/lib/python2.6/urllib2.py", line 397, in open
    response = meth(req, response)
  File "/usr/lib/python2.6/urllib2.py", line 510, in http_response
    'http', request, response, code, msg, hdrs)
  File "/usr/lib/python2.6/urllib2.py", line 435, in error
    return self._call_chain(*args)
  File "/usr/lib/python2.6/urllib2.py", line 369, in _call_chain
    result = func(*args)
  File "/usr/lib/python2.6/urllib2.py", line 518, in http_error_default
    raise HTTPError(req.get_full_url(), code, msg, hdrs, fp)
urllib2.HTTPError: HTTP Error 404: NOT FOUND
TESTING: git-cl dcommits ok
Loaded authentication cookies from /home/chrome-bot/.codereview_upload_cookies
Running presubmit commit checks ...

Presubmit checks passed.
No description set.
Visit http://localhost:8080/None/edit to set it.
FAILURE: git-cl dcommits ok


Presubmit checks took 366.7s to calculate.

[commit-bot: I haz the power, 2012-01-25 14:27:39]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/maruel@chromium.org/9193023/7004

[commit-bot: I haz the power, 2012-01-25 14:33:40]

Change committed as 119066

[jam, 2012-01-26 16:57:17]

On 2012/01/25 14:33:40, I haz the power (commit-bot) wrote:
> Change committed as 119066

why did you remove the code in gcl.py that adds an empty subject if it's not
supplied? this now asks the user for a subject each time on upload

[M-A Ruel, 2012-01-26 18:59:45]

On 2012/01/26 16:57:17, John Abd-El-Malek wrote:
> On 2012/01/25 14:33:40, I haz the power (commit-bot) wrote:
> > Change committed as 119066
> 
> why did you remove the code in gcl.py that adds an empty subject if it's not
> supplied? this now asks the user for a subject each time on upload

Yep, so it is coherent with git-cl *and* upload.py. That's towards the Grand
Unification Of Tools Behavior.

[jam, 2012-01-26 19:06:28]

On Thu, Jan 26, 2012 at 10:59 AM, <maruel@chromium.org> wrote:

> On 2012/01/26 16:57:17, John Abd-El-Malek wrote:
>
>> On 2012/01/25 14:33:40, I haz the power (commit-bot) wrote:
>> > Change committed as 119066
>>
>
>  why did you remove the code in gcl.py that adds an empty subject if it's
>> not
>> supplied? this now asks the user for a subject each time on upload
>>
>
> Yep, so it is coherent with git-cl *and* upload.py. That's towards the
> Grand
> Unification Of Tools Behavior.
>

why make gcl less useful though (see the cr-dev thread). we should make
git-cl do what gcl does. i wrote gcl specifically to not require a title if
it wasn't provided, and this regresses it.


>
>
http://codereview.chromium.**org/9193023/<http://codereview.chromium.org/9193...
>

[jam, 2012-01-26 19:53:15]

ping: this is really annoying me and other develoepers. can you either fix
this, or revert this, until we get an agreement?  i don't
think unilateral changes like this to tools used by all developers is the
right model.

On Thu, Jan 26, 2012 at 11:06 AM, John Abd-El-Malek <jam@chromium.org>wrote:

>
>
> On Thu, Jan 26, 2012 at 10:59 AM, <maruel@chromium.org> wrote:
>
>> On 2012/01/26 16:57:17, John Abd-El-Malek wrote:
>>
>>> On 2012/01/25 14:33:40, I haz the power (commit-bot) wrote:
>>> > Change committed as 119066
>>>
>>
>>  why did you remove the code in gcl.py that adds an empty subject if it's
>>> not
>>> supplied? this now asks the user for a subject each time on upload
>>>
>>
>> Yep, so it is coherent with git-cl *and* upload.py. That's towards the
>> Grand
>> Unification Of Tools Behavior.
>>
>
> why make gcl less useful though (see the cr-dev thread). we should make
> git-cl do what gcl does. i wrote gcl specifically to not require a title if
> it wasn't provided, and this regresses it.
>
>
>>
>>
http://codereview.chromium.**org/9193023/<http://codereview.chromium.org/9193...
>>
>
>

[Ben Goodger (Google), 2012-01-26 23:26:01]

On 2012/01/26 19:53:15, John Abd-El-Malek wrote:
> ping: this is really annoying me and other develoepers. can you either fix
> this, or revert this, until we get an agreement?  i don't
> think unilateral changes like this to tools used by all developers is the
> right model.

+1.

[cmp, 2012-01-27 03:39:43]

+nsylvain

Thanks for the feedback everyone.  M-A outlined a technical approach on
chromium-dev that would likely resolve this prompting issue.  The fastest path
would be to revert this CL so all devs go back to pre-yesterday behavior and
then M-A will follow-up when he has cycles by adapting this change with his
proposed fix in a new CL.

M-A, I know you landed this to add support for svn 1.7, but I presume no systems
require this CL to continue working.  Please let me know if reverting your CL
will break some other system that may have a new dependency on it.  I will take
a look at that either tonight or tomorrow morning (unless you beat me to it). 
Thanks.