What's the most efficient way to fill a rectangle with water?

Given a 1-deep n by m rectangular pit, what is the smallest number of bucket loads that can be used to completely fill it with water source blocks? Given the way water propagates, what's the most efficient sequence to fill the rectangle with? Is this sequence different if trying to fill a square?

Solution 1:

A water block becomes a source block when there's at least 2 other source blocks next to it (not counting diagonally). You start with the very edge and place two water blocks like so. This will give you a 2×2 square of water sources.

__________
|Wo      |
|oW      |
|        |
|        |
|        |

W = water source placed by you
o = water source generated by the water mechanics

Now, simply scoop up any source block (it will refill), and dump it diagonally from the outermost block.

__________
|Woo     |
|oWo     |
|ooW     |
|        |
|        |

Repeat until you hit an edge. Which source block you take doesn't matter, they are all infinite (as in, will refill instantly) at this point.

__________
|Woooo   |
|oWooo   |
|ooWoo   |
|oooWo   |
|ooooW   |

As you can see, to fill an n-long square, you need n bucket loads (actually, only 2, since after that, you can refill from the pool).

To fill the entire rectangle, dump a bucket every other row on one side. The very edge block always has to be filled.

__________
|Wooooooo|
|oWoooooo|
|ooWooooo|
|oooWoooo|
|ooooWWoW|

So to fill an n×m block rectangle, you need n + ceil((m - n) / 2) water sources, with m being the longer side. Again, only 2 if you're talking resources, because after that, you're drawing from an infinite pool.

Here's a video of a guy using this technique on a square:

(Note that he always refills from the still source blocks for some reason, but as noted above, any source block will do.)

Solution 2:

This might be slightly easier: You can also fill two adjacent sides with source blocks:

+-------+
|WWWWWWW|
|Woooooo|
|Woooooo|
|Woooooo|
|Woooooo|
|Woooooo|
+-------+

...without having to enter the pool and tread water. You can do it by traversing just two sides. It can be as efficient as @lunboks's excellent answer:

+-------+
|1 2 3 4|
|       |
|5      |
|       |
|6      |
|7      |
+-------+

...and has the additional benefit that if you place the corner block (1) last, you can watch the whole thing turn in one smooth motion! :)