← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Jelmer Vernooij
  • Date: 2011-08-24 09:28:57 UTC
  • mto: This revision was merged to the branch mainline in revision 6094.
  • Revision ID: jelmer@samba.org-20110824092857-7vwavstxz5jphcdc
Add keywords at the end.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
4990
4990
    aliases = []
4991
4991
    encoding_type = 'replace'
4992
4992
 
4993
 
    def run(self, location=None,
4994
 
            dry_run=False, verbose=False, keep_tags=False,
4995
 
            revision=None, force=False, local=False):
 
4993
    def run(self, location=None, dry_run=False, verbose=False,
 
4994
            revision=None, force=False, local=False, keep_tags=False):
4996
4995
        if location is None:
4997
4996
            location = u'.'
4998
4997
        control, relpath = bzrdir.BzrDir.open_containing(location)
5008
5007
        else:
5009
5008
            self.add_cleanup(b.lock_write().unlock)
5010
5009
        return self._run(b, tree, dry_run, verbose, revision, force,
5011
 
                         keep_tags, local=local)
 
5010
                         local, keep_tags)
5012
5011
 
5013
 
    def _run(self, b, tree, dry_run, verbose, revision, force, keep_tags,
5014
 
             local=False):
 
5012
    def _run(self, b, tree, dry_run, verbose, revision, force, local,
 
5013
             keep_tags):
5015
5014
        from bzrlib.log import log_formatter, show_log
5016
5015
        from bzrlib.uncommit import uncommit
5017
5016