[MERGE] cleanup of merge command

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi John,

Thanks for your review.  I have applied the requested changes and submitted.

John Arbash Meinel wrote:
> John Arbash Meinel has voted tweak.
> I know we have to use 'branch' as the parameter from the
> user (because that is what we wanted the help text to show),
> but changing away from that internally would help clarity.

I have changed this to 'location' inside cmd_merge.run

> 
> Especially code like this:
> +        other_loc, branch = self._select_branch(tree, branch, revision,
> -1)
> +        if revision is not None and len(revision) == 2:
> +            base_loc, branch = self._select_branch(tree, branch,
> revision, 0)
> 
> Where I believe the variable we are passing is a path, but the variable
> being returned is a Branch object.

No, even I'm not twisted enough to change a variable from a string to a
Branch.  But I've renamed the method to _select_branch_location

> I didn't see any direct tests for:
> 
> Merger.from_uncommitted, Merger.from_mergeable, Merger.from_revision_ids

Done.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGr21k0F+nu1YWqI0RAhiOAJ40isGusU7c6zPW93xbmJWYKQRFRQCfXt7k
zgnGEcPDH8KVySTIOYnDutA=
=t6iv
-----END PGP SIGNATURE-----