Fix handling of file renames.

Fix handling of file renames.

The patches needs to by applied 'in-order' to not delete source files.

Added more tests.

R=dpranke@chromium.org
BUG=94330
TEST=

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=103309

[M-A Ruel, 2011-09-28 19:39:59]

http://codereview.chromium.org/8038056/diff/1/tests/checkout_test.py
File tests/checkout_test.py (right):

http://codereview.chromium.org/8038056/diff/1/tests/checkout_test.py#newcode123
tests/checkout_test.py:123: patch.FilePatchDiff('new_dir/subdir/new_file',
GIT.NEW_SUBDIR, []),
Make sure ordering stays consistent.

[Dirk Pranke, 2011-09-28 23:39:27]

http://codereview.chromium.org/8038056/diff/1/checkout.py
File checkout.py (right):

http://codereview.chromium.org/8038056/diff/1/checkout.py#newcode147
checkout.py:147: os.path.join(self.project_path, p.source_filename), filepath)
I'm a bit confused by this. Won't the file usually exist (and you'll get the
exception raised)?

http://codereview.chromium.org/8038056/diff/1/checkout.py#newcode310
checkout.py:310: os.path.join(self.project_path, p.source_filename), filepath)
same question.

[M-A Ruel, 2011-09-29 14:15:58]

Be more explicit about it.

http://codereview.chromium.org/8038056/diff/1/checkout.py
File checkout.py (right):

http://codereview.chromium.org/8038056/diff/1/checkout.py#newcode147
checkout.py:147: os.path.join(self.project_path, p.source_filename), filepath)
On 2011/09/28 23:39:27, Dirk Pranke wrote:
> I'm a bit confused by this. Won't the file usually exist (and you'll get the
> exception raised)?

Added a check to be explicit about the consistency of the FilePatchBase
instance. See patch.py line 130 for similar check.

[Dirk Pranke, 2011-09-29 17:28:50]

ok. lgtm.

[commit-bot: I haz the power, 2011-09-29 17:37:59]

CQ is trying tha patch. Follow status at
https://chromium-status.appspot.com/cq/maruel@chromium.org/8038056/6001

[commit-bot: I haz the power, 2011-09-29 17:38:01]

Can't apply patch for file depot_tools/checkout.py.
While running patch -p1 --forward --force;
patching file depot_tools/checkout.py
Hunk #2 FAILED at 93.
Hunk #3 FAILED at 118.
Hunk #4 FAILED at 137.
Hunk #5 FAILED at 262.
Hunk #6 succeeded at 294 (offset 2 lines).
Hunk #7 FAILED at 326.
Hunk #8 FAILED at 430.
Hunk #9 succeeded at 464 (offset 3 lines).
Hunk #10 FAILED at 473.
Hunk #11 FAILED at 705.
Hunk #12 FAILED at 715.
9 out of 12 hunks FAILED -- saving rejects to file depot_tools/checkout.py.rej

[commit-bot: I haz the power, 2011-09-29 18:01:01]

CQ is trying tha patch. Follow status at
https://chromium-status.appspot.com/cq/maruel@chromium.org/8038056/12002

[commit-bot: I haz the power, 2011-09-29 18:07:08]

Change committed as 103309