~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Committer: Patch Queue Manager
Date: 2012-09-05 19:29:59 UTC
mfrom: (6437.69.1 2.5_2.4_integration)
mto: (6549.3.1 dev_2.5_integration) (6437.77.1 2.5) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6558.
Revision ID: pqm@pqm.ubuntu.com-20120905192959-r312gx2awcoitph0

(gz) Merge 2.4 into 2.5 (Martin Packman)

files modified:
INSTALL

bzrlib/builtins.py

bzrlib/tests/blackbox/test_testament.py

doc/developers/code-style.txt

doc/en/admin-guide/introduction.txt

doc/en/release-notes/bzr-2.4.txt

Show diffs side-by-side

added added

removed removed

bzrlib/builtins.py

5114

Option('strict',

5115

help='Produce a strict-format testament.')]

5116

takes_args = ['branch?']

5117

encoding_type = 'exact'

5117

5118

@display_command

5118

5119

def run(self, branch=u'.', revision=None, long=False, strict=False):

5119

5120

from bzrlib.testament import Testament, StrictTestament

5132

5133

rev_id = revision[0].as_revision_id(b)

5133

5134

t = testament_class.from_revision(b.repository, rev_id)

5134

5135

if long:

5135

sys.stdout.writelines(t.as_text_lines())

5136

self.outf.writelines(t.as_text_lines())

5136

5137

else:

5137

sys.stdout.write(t.as_short_text())

5138

self.outf.write(t.as_short_text())

5138

5139

5140

5141

class cmd_annotate(Command):

Older »