New issue
Advanced search Search tips

Issue 603175 link

Starred by 1 user

Issue metadata

Status: WontFix
Owner: ----
Closed: Apr 2016
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: Windows
Pri: ----
Type: ----



Sign in to add a comment

git cl upload --squash is broken

Project Member Reported by scottmg@chromium.org, Apr 13 2016

Issue description

Upload with --squash is still broken on Windows, per previously filed bugs.

I'd been working around it with --no-squash, but after "[chromium-dev] PSA: important changes in git cl upload for Gerrit users", I thought I'd better file another in case something gets more broken. :)




 
Here's a log of two uploads, the first shouldn't have uploaded a new change, the issue already had a Change-Id and a review at https://chromium-review.googlesource.com/c/337663/, but it made a new one at https://chromium-review.googlesource.com/338872.

The second attempt... well, shouldn't raise TypeError(). :)


[dump-arbitrary-target]d:\src\crashpad\crashpad>git cl upload --squash
Using 50% similarity for rename/copy detection. Override with --similarity.
Running presubmit upload checks ...

Presubmit checks passed.
 client/crashpad_client.h                           |  13 +++
 client/crashpad_client_win.cc                      |  53 +++++++--
 handler/handler.gyp                                |  20 ++++
 handler/win/crash_other_program.cc                 | 109 ++++++++++++++++++
 handler/win/crash_report_exception_handler.cc      |  48 ++++++--
 handler/win/crash_report_exception_handler.h       |   9 +-
 .../win/hanging_program.cc                         |  33 ++++--
 snapshot/win/end_to_end_test.py                    |  16 +++
 snapshot/win/exception_snapshot_win.cc             |  83 +++++++++++---
 snapshot/win/exception_snapshot_win.h              |  27 +++++
 snapshot/win/exception_snapshot_win_test.cc        |  14 +++
 snapshot/win/process_snapshot_win.cc               |  16 +++
 snapshot/win/process_snapshot_win.h                |  20 ++++
 util/win/exception_handler_server.cc               | 127 ++++++++++++++++-----
 util/win/exception_handler_server.h                |  16 +++
 util/win/exception_handler_server_test.cc          |   6 +
 util/win/registration_protocol_win.h               |  40 ++++++-
 17 files changed, 567 insertions(+), 83 deletions(-)
remote: Processing changes: new: 1, done
remote:
remote: New Changes:
remote:   https://chromium-review.googlesource.com/338872 win: Add dump-and-crash for arbitrary target
remote:
To https://chromium.googlesource.com/a/crashpad/crashpad
 * [new branch]      78f1232274d3a6b66df21f3906c0792437ec4c4a -> refs/for/refs/heads/master

[dump-arbitrary-target]d:\src\crashpad\crashpad>git cl upload --squash
Using 50% similarity for rename/copy detection. Override with --similarity.
Traceback (most recent call last):
  File "d:\src\depot_tools\git_cl.py", line 4657, in <module>
    sys.exit(main(sys.argv[1:]))
  File "d:\src\depot_tools\git_cl.py", line 4639, in main
    return dispatcher.execute(OptionParser(), argv)
  File "d:\src\depot_tools\subcommand.py", line 252, in execute
    return command(parser, args[1:])
  File "d:\src\depot_tools\git_cl.py", line 3394, in CMDupload
    return cl.CMDUpload(options, args, orig_args)
  File "d:\src\depot_tools\git_cl.py", line 1335, in CMDUpload
    change = self.GetChange(base_branch, None)
  File "d:\src\depot_tools\git_cl.py", line 1266, in GetChange
    description = self.GetDescription()
  File "d:\src\depot_tools\git_cl.py", line 1195, in GetDescription
    self.description = self._codereview_impl.FetchDescription()
  File "d:\src\depot_tools\git_cl.py", line 2065, in FetchDescription
    data = self._GetChangeDetail(['COMMIT_FOOTERS', 'CURRENT_REVISION'])
  File "d:\src\depot_tools\git_cl.py", line 2083, in _GetChangeDetail
    return gerrit_util.GetChangeDetail(self._GetGerritHost(), options, issue)
  File "d:\src\depot_tools\gerrit_util.py", line 452, in GetChangeDetail
    path += '?%s' % '&'.join(['o=%s' % p for p in o_params])
TypeError: 'int' object is not iterable


Status: WontFix (was: Untriaged)
Resolved with offline discussion.

--no-squash auto-installs a hook in .git\hooks\commit-msg: that should be deleted.

and there was a recent fix to the script. After that, I did some quick tests and all seems to be well on Windows now.

Thanks!

Comment 3 by aga...@chromium.org, Apr 27 2016

Components: Infra>Codereview
Labels: -Infra-Codereview

Comment 4 by benhenry@google.com, Apr 27 2016

Components: Infra>Git
Labels: -Infra-Git

Sign in to add a comment