[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 #7 from Ojan Vafai <ojan at chromium.org>  2010-05-17 17:30:36 PST ---
(In reply to comment #4)
> (From update of attachment 56128 [details])
> WebKitTools/Scripts/webkitpy/common/checkout/scm.py:578
>  +          if squash is None:
> Why not "if not squash"?

None, True and False are different valid values. This will go away when we get rid of --squash and replace it with --git-commit=*

> 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.

I'm not changing this logic, just indenting the code. Again, this will change when we get rid of --squash.

> 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. :)

Done.

> 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.

Done.

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