/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: John Arbash Meinel
  • Date: 2005-07-10 15:51:12 UTC
  • mto: (0.5.85) (1185.82.1 bzr-w-changeset)
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: john@arbash-meinel.com-20050710155112-ba043ee80b7a2a1d
Cleaning up code for latest bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
81
81
        if target is None:
82
82
            target = './@'
83
83
        b_target_path, target_revno = parse_spec(target)
84
 
        b_target = find_branch(b_target_path)
 
84
        target_branch = find_branch(b_target_path)
85
85
        if target_revno is None or target_revno == -1:
86
 
            target_rev_id = b_target.last_patch()
 
86
            target_rev_id = target_branch.last_patch()
87
87
        else:
88
 
            target_rev_id = b_target.lookup_revision(target_revno)
 
88
            target_rev_id = target_branch.lookup_revision(target_revno)
89
89
 
90
90
        if base is None:
91
 
            b_base = b_target
92
 
            target_rev = b_target.get_revision(target_rev_id)
93
 
            base_rev_id = target_rev_id.parents[0].revision_id
 
91
            base_branch = target_branch
 
92
            target_rev = target_branch.get_revision(target_rev_id)
 
93
            base_rev_id = target_rev.parents[0].revision_id
94
94
        else:
95
95
            base_path, base_revno = parse_spec(base)
96
 
            b_base = find_branch(base_path)
 
96
            base_branch = find_branch(base_path)
97
97
            if base_revno is None or base_revno == -1:
98
98
                base_rev_id = base_branch.last_patch()
99
99
            else:
144
144
 
145
145
    """
146
146
    takes_args = ['filename?']
147
 
    takes_options = []
 
147
    takes_options = ['reverse', 'auto-commit']
148
148
 
149
149
    def run(self, filename=None, reverse=False, auto_commit=False):
150
150
        from bzrlib import find_branch
179
179
 
180
180
bzrlib.commands.OPTIONS['reverse'] = None
181
181
bzrlib.commands.OPTIONS['auto-commit'] = None
182
 
cmd_apply_changeset.takes_options.append('reverse')
183
 
cmd_apply_changeset.takes_options.append('auto-commit')