/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to annotate/gannotate.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-07 11:48:03 UTC
  • Revision ID: v.ladeuil+lp@free.fr-20090507114803-sxykmkuzrkdj2pr3
Fix bug #373157 by properly setting the default values.

* tests/test_annotate_config.py:
(TestConfig.test_create_initial_config): Urgh, remove pdb breakpoint.

* annotate/config.py:
(gannotate_configspec): Deleted, can't be used for default values
and not used for validation: useless.
(gannotate_config_filename): Turned into a function so that tests
get proper isolated result (evaluating the path at load time
forbids the test framework overriding).
(GAnnotateConfig.__init__): Add default values *only* if the
'window' section doesn't exist. Assigning them unconditionally
defeats the config file purpose... Also delete the 'spans' section
since nobody use it.
(GAnnotateConfig.apply): Coerce config values when we use them.
(Gannotateconfig._save_custom_spans): Deleted (dead code).

Show diffs side-by-side

added added

removed removed

Lines of Context:
annotate/gannotate.py
139
139
        current_revision.timestamp = time.time()
140
140
        current_revision.message = '[Not yet committed]'
141
141
        current_revision.parent_ids = tree.get_parent_ids()
142
 
        current_revision.properties['branch-nick'] = self.branch.nick
 
142
        current_revision.properties['branch-nick'] = self.branch._get_nick(local=True)
143
143
        current_revno = '%d?' % (self.branch.revno() + 1)
144
144
        repository = self.branch.repository
145
145
        if self.revision_id == CURRENT_REVISION: