~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_version_info.py

  • Committer: James Westby
  • Date: 2008-02-25 23:41:06 UTC
  • mto: This revision was merged to the branch mainline in revision 3246.
  • Revision ID: jw+debian@jameswestby.net-20080225234106-9b4ql42w13ijewp3
Make version-info --custom imply --all.

When using a custom template you can use variables like {clean} which
are not enabled by default. This causes an ugly traceback.

This fixes the issue by implying --all when --custom (or more exactly
--template) is used, so that all variables are available in templates.

This was the easier fix than having the template code report that the
user should pass --check-clean to have {clean} available, but will
have a performance impact on all users of version-info --custom,
regardless of whether they use {clean}.

Show diffs side-by-side

added added

removed removed

Lines of Context:
139
139
        wt = self.make_branch_and_tree('branch')
140
140
        out, err = self.run_bzr('version-info --custom', retcode=3)
141
141
        self.assertContainsRe(err, r'ERROR: No template specified\.')
 
142
 
 
143
    def test_custom_implies_all(self):
 
144
        self.create_tree()
 
145
        out, err = self.run_bzr('version-info --custom --template='
 
146
            '"{revno} {branch_nick} {clean}\n" branch')
 
147
        self.assertEqual("2 branch 1\n", out)
 
148
        self.assertEqual("", err)
 
149
        self.build_tree_contents([('branch/c', 'now unclean\n')])
 
150
        out, err = self.run_bzr('version-info --custom --template='
 
151
            '"{revno} {branch_nick} {clean}\n" branch')
 
152
        self.assertEqual("2 branch 0\n", out)
 
153
        self.assertEqual("", err)