← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Vincent Ladeuil
  • Date: 2011-07-06 09:22:00 UTC
  • mfrom: (6008 +trunk)
  • mto: (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110706092200-7iai2mwzc0sqdsvf
Merging in trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
194
194
                    prefix = 'C  '
195
195
                else:
196
196
                    prefix = ' '
197
 
                to_file.write("%s %s\n" % (prefix, conflict))
 
197
                to_file.write("%s %s\n" % (prefix, unicode(conflict)))
198
198
            # Show files that were requested but don't exist (and are
199
199
            # not versioned).  We don't involve delta in this; these
200
200
            # paths are really the province of just the status
379
379
        These are all empty initially, because by default nothing should get
380
380
        notified.
381
381
        """
382
 
        _mod_hooks.Hooks.__init__(self)
383
 
        self.create_hook(_mod_hooks.HookPoint('post_status',
 
382
        _mod_hooks.Hooks.__init__(self, "bzrlib.status", "hooks")
 
383
        self.add_hook('post_status',
384
384
            "Called with argument StatusHookParams after Bazaar has "
385
385
            "displayed the status. StatusHookParams has the attributes "
386
386
            "(old_tree, new_tree, to_file, versioned, show_ids, short, "
387
387
            "verbose). The last four arguments correspond to the command "
388
388
            "line options specified by the user for the status command. "
389
389
            "to_file is the output stream for writing.",
390
 
            (2, 3), None))
391
 
        self.create_hook(_mod_hooks.HookPoint('pre_status',
 
390
            (2, 3))
 
391
        self.add_hook('pre_status',
392
392
            "Called with argument StatusHookParams before Bazaar "
393
393
            "displays the status. StatusHookParams has the attributes "
394
394
            "(old_tree, new_tree, to_file, versioned, show_ids, short, "
395
395
            "verbose). The last four arguments correspond to the command "
396
396
            "line options specified by the user for the status command. "
397
397
            "to_file is the output stream for writing.",
398
 
            (2, 3), None))
 
398
            (2, 3))
399
399
 
400
400
 
401
401
class StatusHookParams(object):