[Webkit-unassigned] [Bug 38852] webkit-patch land --squash commits too much if branch is not up to date

[bugzilla-daemon at webkit.org]

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





--- Comment #4 from Eric Seidel <eric at webkit.org>  2010-05-17 15:08:53 PST ---
(From update of attachment 56128)
WebKitTools/Scripts/webkitpy/common/checkout/scm.py:578
 +          if squash is None:
Why not "if not squash"?

WebKitTools/Scripts/webkitpy/common/checkout/scm.py:579
 +              config_squash = Git.read_git_config('webkit-patch.squash')
Seems like we should have a helper method for this...  One which might even cache the result.

WebKitTools/Scripts/webkitpy/common/checkout/scm.py:580
 +              if (config_squash and config_squash is not ""):
Yes, the helper method would return True/False.

Oh, I guess this sorta is the helper method.  But maybe it would be useful to have a helper which just handled reading from the config.

WebKitTools/Scripts/webkitpy/common/checkout/scm.py:585
 +                  if num_local_commits > 1 or num_local_commits > 0 and not self.working_directory_is_clean():
parens here would help me a lot. :)

WebKitTools/Scripts/webkitpy/common/checkout/scm.py:586
 +                      working_directory_message = "" if self.working_directory_is_clean() else " and working copy changes"
I would have made generating the message its own helper function.

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