Make --output and --sha1_filename work well together.

Make --output and --sha1_filename work well together.

--sha1_filename unnecessarily forces the output to have
the same filename and be in the same directory. The code
in main already correctly sets the file name to the
sha1_filename minus the .sha1, so the only change is
to actually use the --output path the same way the
rest of the code does.

R=iannucci@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=293251

[ojan, 2014-12-02 22:46:57]

ojan@chromium.org changed reviewers:
+ hinoka@chromium.org

[ojan, 2014-12-03 21:02:46]

ping

[ojan, 2014-12-03 21:06:39]

ojan@chromium.org changed reviewers:
+ agable@chromium.org
- hinoka@chromium.org

[ojan, 2014-12-03 21:06:39]

Looks like ryan is OOO. agable?

[ojan, 2014-12-04 20:10:27]

ojan@chromium.org changed reviewers:
+ iannucci@chromium.org

[ojan, 2014-12-04 20:10:28]

iannucci, since you review my other patch to this file, maybe you want to do
this one as well? :)

[iannucci, 2014-12-04 20:20:39]

ugh... the lack of tests on this code makes me nervous :(

'lgtm', though I would definitely alert the sheriffs for possible breakage.

[ojan, 2014-12-04 21:45:57]

The CQ bit was checked by ojan@chromium.org

[commit-bot: I haz the power, 2014-12-04 21:46:14]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/752803003/1

[commit-bot: I haz the power, 2014-12-04 21:47:55]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-12-04 21:47:58]

Presubmit check for 752803003-1 failed and returned exit status 1.

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

** Presubmit ERRORS **
Pylint (110 files) (62.18s) failed
/b/depot_tools/third_party/logilab/astroid/modutils.py:520: UserWarning: Module
six was already imported from /b/depot_tools/third_party/six/__init__.py, but
/usr/local/lib/python2.7/dist-packages is being added to sys.path
  import pkg_resources
Problem importing module .svn: No module named .svn
Problem importing module .svn: No module named .svn
************* Module fix_encoding
E:232, 0: Slice index is not an int, None, or instance with __index__
(invalid-slice-index)
************* Module gclient_scm
E:301,18: No value for argument 'print_func' in constructor call
(no-value-for-parameter)
E:1191,18: No value for argument 'print_func' in constructor call
(no-value-for-parameter)


post-dcommit-hook-test.sh failed
Command
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests/post-dcommit-hook-test.sh
returned non-zero exit status 1 in
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests
Setting up test SVN repo...
Setting up test git-svn repo...
TESTING: dcommitted code
Using 50% similarity for rename/copy detection. Override with --similarity.
Description:
dcommit
TESTING: post-cl-dcommit hook executed
FAILURE: post-cl-dcommit hook executed


Presubmit checks took 97.4s to calculate.

[ojan, 2014-12-04 21:49:56]

On 2014/12/04 at 20:20:39, iannucci wrote:
> ugh... the lack of tests on this code makes me nervous :(

Yeah. Me too. I'm not a fan. I tested manually of course, but I didn't test
every combination.

> 'lgtm', though I would definitely alert the sheriffs for possible breakage.

sgtm.

[ojan, 2014-12-04 21:56:43]

The CQ bit was checked by ojan@chromium.org

[commit-bot: I haz the power, 2014-12-04 21:57:49]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/752803003/1

[commit-bot: I haz the power, 2014-12-04 21:59:30]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-12-04 21:59:31]

Presubmit check for 752803003-1 failed and returned exit status 1.

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

** Presubmit ERRORS **
Pylint (110 files) (60.83s) failed
/b/depot_tools/third_party/logilab/astroid/modutils.py:520: UserWarning: Module
six was already imported from /b/depot_tools/third_party/six/__init__.py, but
/usr/local/lib/python2.7/dist-packages is being added to sys.path
  import pkg_resources
Problem importing module .svn: No module named .svn
Problem importing module .svn: No module named .svn
************* Module fix_encoding
E:232, 0: Slice index is not an int, None, or instance with __index__
(invalid-slice-index)
************* Module gclient_scm
E:301,18: No value for argument 'print_func' in constructor call
(no-value-for-parameter)
E:1191,18: No value for argument 'print_func' in constructor call
(no-value-for-parameter)


post-dcommit-hook-test.sh failed
Command
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests/post-dcommit-hook-test.sh
returned non-zero exit status 1 in
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests
Setting up test SVN repo...
Setting up test git-svn repo...
TESTING: dcommitted code
Using 50% similarity for rename/copy detection. Override with --similarity.
Description:
dcommit
TESTING: post-cl-dcommit hook executed
FAILURE: post-cl-dcommit hook executed


Presubmit checks took 97.6s to calculate.

[ojan, 2014-12-04 21:59:49]

The CQ bit was checked by ojan@chromium.org

[commit-bot: I haz the power, 2014-12-04 22:01:15]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/752803003/1

[commit-bot: I haz the power, 2014-12-04 22:03:06]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-12-04 22:03:07]

Presubmit check for 752803003-1 failed and returned exit status 1.

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

** Presubmit ERRORS **
Pylint (110 files) (59.92s) failed
/b/depot_tools/third_party/logilab/astroid/modutils.py:520: UserWarning: Module
six was already imported from /b/depot_tools/third_party/six/__init__.py, but
/usr/local/lib/python2.7/dist-packages is being added to sys.path
  import pkg_resources
Problem importing module .svn: No module named .svn
Problem importing module .svn: No module named .svn
************* Module fix_encoding
E:232, 0: Slice index is not an int, None, or instance with __index__
(invalid-slice-index)
************* Module gclient_scm
E:301,18: No value for argument 'print_func' in constructor call
(no-value-for-parameter)
E:1191,18: No value for argument 'print_func' in constructor call
(no-value-for-parameter)


post-dcommit-hook-test.sh failed
Command
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests/post-dcommit-hook-test.sh
returned non-zero exit status 1 in
/b/infra_internal/commit_queue/workdir/tools/depot_tools/tests
Setting up test SVN repo...
Setting up test git-svn repo...
TESTING: dcommitted code
Using 50% similarity for rename/copy detection. Override with --similarity.
Description:
dcommit
TESTING: post-cl-dcommit hook executed
FAILURE: post-cl-dcommit hook executed


Presubmit checks took 96.5s to calculate.

[ojan, 2014-12-04 22:18:41]

Committed patchset #1 (id:1) manually as 293251.