Fix issues landing remote patches using rbt land.

Review Request #6715 — Created Dec. 31, 2014 and submitted

Information

RBTools
master
2dca2af...

Reviewers

rbt land made some assumptions that resulted in problems with landing
remote branches. Certain operations, such as comparing the current and
destination branches, and merging branches, assumed we were landing
local branches in all cases, but this wasn't so with remote patches.
We now only execute some of that logic if we're landing local branches.

Patching was also broken, as it was only patching to the index and not
to a commit. We now pass -C to fix this.

Landed a remote change successfully.

Landed a local branch successfully.

Description From Last Updated

undefined name 'confirm'

reviewbotreviewbot
reviewbot
  1. Tool: Pyflakes
    Processed Files:
        rbtools/commands/land.py
    
    
    
    Tool: PEP8 Style Checker
    Processed Files:
        rbtools/commands/land.py
    
    
  2. rbtools/commands/land.py (Diff revision 1)
     
     
    Show all issues
     undefined name 'confirm'
    
  3. 
      
david
  1. Ship It!
  2. 
      
chipx86
Review request changed
Status:
Completed
Change Summary:
Pushed to master (98f7cb1)