[Webkit-unassigned] [Bug 27847] New: bugzilla-tool post-commits trunk..head errors out

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=27847

           Summary: bugzilla-tool post-commits trunk..head errors out
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: PC
        OS/Version: Mac OS X 10.5
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: eric at webkit.org
                CC: ddkilzer at webkit.org, evan at chromium.org


bugzilla-tool post-commits trunk..head errors out

bugzilla-tool post-commits trunk..head
Skipping fe5ba4cc272372cbd6c14261081e8d0b856cde87: No bug id found in commit
log or specified with --bug-id.
fatal: Not a valid object name ^20daa58114c8c3829861a53d405c117352d9ca4f
Traceback (most recent call last):
  File "/Users/eseidel/Projects/WebKit/WebKitTools/Scripts/bugzilla-tool", line
668, in <module>
    main()
  File "/Users/eseidel/Projects/WebKit/WebKitTools/Scripts/bugzilla-tool", line
665, in main
    return tool.main()
  File "/Users/eseidel/Projects/WebKit/WebKitTools/Scripts/bugzilla-tool", line
660, in main
    return command_object.execute(command_options, command_args, self)
  File "/Users/eseidel/Projects/WebKit/WebKitTools/Scripts/bugzilla-tool", line
431, in execute
    commit_message = tool.scm().commit_message_for_local_commit(commit_id)
  File "/Users/eseidel/Projects/WebKit/WebKitTools/Scripts/modules/scm.py",
line 380, in commit_message_for_local_commit
    commit_lines = self.run_command(['git', 'cat-file', 'commit',
commit_id]).splitlines()
  File "/Users/eseidel/Projects/WebKit/WebKitTools/Scripts/modules/scm.py",
line 108, in run_command
    raise ScriptError('Failed to run "%s"  exit_code: %d  cwd: %s' % (args,
exit_code, cwd))
modules.scm.ScriptError: Failed to run "['git', 'cat-file', 'commit',
'^20daa58114c8c3829861a53d405c117352d9ca4f']"  exit_code: 128  cwd: None

Note this is because of our git rev-parse usage:

git rev-parse --revs-only trunk..HEAD
fe5ba4cc272372cbd6c14261081e8d0b856cde87
^20daa58114c8c3829861a53d405c117352d9ca4f

We really want rev-list (most of the time):

git rev-list trunk..HEAD
fe5ba4cc272372cbd6c14261081e8d0b856cde87
7a3f6b9a5aabf51fe0d54688805d0fd0e9dc657c
4c929dac07dd08bf2328b755a1054189e158478f



I propose that we define our bugzilla-tool post-commits behavior as follows:

1.  0 args means "rev-list trunk..HEAD"
2.  1 arg, "COMMIT" means cherry pick, aka "rev-list COMMIT^..COMMIT"
3.  2 args "A B" means cherry-pick those 2
4.  a ".." range arg "A..B" means "rev-list A..B" (theoretically we could
support multiple ranges, but that seems gratuitous)
5.  a "..." range arg is an error (never really makes sense for post-commits"


This mostly means replacing our current rev-parse usage with rev-list, and
adding a default case for 0 args, and making ... and error.  Also, we have to
detect the lack of .. and modify what we pass to rev-list a little.

Does this sound sane?

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.