Make release scripts more robust.

Make release scripts more robust.

Remembering the current branch is a relic from the past
where no work-dir checkout was used. Now this doesn't give
much benefit and screws up the script if it was left in
a bad state (e.g. after a master restart).

TBR=tandrii@chromium.org
NOTRY=true

Committed: https://crrev.com/db7e074d92d53d3e43364ca8766f4927aa6e16c9
Cr-Commit-Position: refs/heads/master@{#27196}

[Michael Achenbach, 2015-03-14 01:19:50]

machenbach@chromium.org changed reviewers:
+ tandrii@chromium.org

[Michael Achenbach, 2015-03-14 01:20:20]

PTAL

[Michael Achenbach, 2015-03-14 01:20:22]

The CQ bit was checked by machenbach@chromium.org

[commit-bot: I haz the power, 2015-03-14 01:20:38]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1002383002/1

[commit-bot: I haz the power, 2015-03-14 01:20:49]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2015-03-14 01:21:03]

Patchset 1 (id:??) landed as
https://crrev.com/db7e074d92d53d3e43364ca8766f4927aa6e16c9
Cr-Commit-Position: refs/heads/master@{#27196}

[tandrii(chromium), 2015-03-15 10:50:18]

lgtm % one inconsistency, I think.

https://codereview.chromium.org/1002383002/diff/1/tools/release/common_includ...
File tools/release/common_includes.py (right):

https://codereview.chromium.org/1002383002/diff/1/tools/release/common_includ...
tools/release/common_includes.py:549:
self.DeleteBranch(self._config["BRANCHNAME"])
this seems to be safer against weird branch names.

https://codereview.chromium.org/1002383002/diff/1/tools/release/common_includ...
tools/release/common_includes.py:553:
self.GitDeleteBranch(self._config["BRANCHNAME"])
seems inconsistent from above.

[Michael Achenbach, 2015-03-18 22:33:45]

https://codereview.chromium.org/1002383002/diff/1/tools/release/common_includ...
File tools/release/common_includes.py (right):

https://codereview.chromium.org/1002383002/diff/1/tools/release/common_includ...
tools/release/common_includes.py:553:
self.GitDeleteBranch(self._config["BRANCHNAME"])
On 2015/03/15 10:50:18, tandrii(chromium) wrote:
> seems inconsistent from above.

I don't follow. PrepareBranch is always called in the beginning of the scripts,
CommonCleanup in the end. In all cases the workbranch self._config["BRANCHNAME"]
is deleted if it exists.

[tandrii(chromium), 2015-03-25 23:12:01]

https://codereview.chromium.org/1002383002/diff/1/tools/release/common_includ...
File tools/release/common_includes.py (right):

https://codereview.chromium.org/1002383002/diff/1/tools/release/common_includ...
tools/release/common_includes.py:553:
self.GitDeleteBranch(self._config["BRANCHNAME"])
On 2015/03/18 22:33:45, Michael Achenbach (travelling) wrote:
> On 2015/03/15 10:50:18, tandrii(chromium) wrote:
> > seems inconsistent from above.
> 
> I don't follow. PrepareBranch is always called in the beginning of the
scripts,
> CommonCleanup in the end. In all cases the workbranch
self._config["BRANCHNAME"]
> is deleted if it exists.

I meant that I didn't quite understand why you call different function
DeleteBranch vs GitDeleteBranch .