← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to push.py

  • Committer: Aaron Bentley
  • Date: 2006-03-01 13:42:15 UTC
  • mfrom: (319 bzrtools)
  • mto: (147.4.30 trunk)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: abentley@panoramicfeedback.com-20060301134215-f343b0751787dfb9
Merge push fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
42
42
        bzrtools.push(cur_branch, location, overwrite=overwrite, 
43
43
                      working_tree=not no_tree)
44
44
        
45
 
    def run_argv(self, argv, alias_argv):
 
45
    def run_argv_aliases(self, argv, alias_argv=None):
46
46
        """Parse command line and run.
47
47
        
48
48
        If the command requests it, run the decorated version.
49
49
        """
50
50
        try:
51
 
            super(cmd_push, self).run_argv(list(argv), alias_argv)
 
51
            super(cmd_push, self).run_argv_aliases(list(argv), alias_argv)
52
52
        except (MustUseDecorated, BzrOptionError):
53
53
            if self._original_command is None:
54
54
                raise
55
 
            self._original_command().run_argv(argv, alias_argv)
 
55
            self._original_command().run_argv_aliases(argv, alias_argv)