← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin Pool
  • Date: 2005-10-06 06:52:09 UTC
  • mfrom: (1415)
  • mto: (1185.13.3)
  • mto: This revision was merged to the branch mainline in revision 1418.
  • Revision ID: mbp@sourcefrog.net-20051006065209-3e4d5db3b006981d
[merge] from robert, get ancestry from inventory weave 
rather than storing separately

The ancestry weave is now strictly redundant and doesn't need 
to be stored.

You should ugprade again after taking this.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1006
1006
        if selected_list:
1007
1007
            selected_list = [b.relpath(s) for s in selected_list]
1008
1008
            
1009
 
        if not message and not file:
 
1009
        if message is None and not file:
1010
1010
            catcher = StringIO()
1011
1011
            show_status(b, specific_files=selected_list,
1012
1012
                        to_file=catcher)
1013
1013
            message = edit_commit_message(catcher.getvalue())
1014
 
            
 
1014
 
1015
1015
            if message is None:
1016
1016
                raise BzrCommandError("please specify a commit message"
1017
1017
                                      " with either --message or --file")
1022
1022
            import codecs
1023
1023
            message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1024
1024
 
 
1025
        if message == "":
 
1026
                raise BzrCommandError("empty commit message specified")
 
1027
            
1025
1028
        try:
1026
1029
            b.commit(message,
1027
1030
                     specific_files=selected_list,