← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave_commands.py

  • Committer: Robert Collins
  • Date: 2007-03-08 04:06:06 UTC
  • mfrom: (2323.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2442.
  • Revision ID: robertc@robertcollins.net-20070308040606-84gsniv56huiyjt4
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave_commands.py
1
 
# Copyright (C) 2006 by Canonical Ltd
2
 
 
 
1
# Copyright (C) 2006 Canonical Ltd
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23
23
import sys
24
24
 
25
25
from bzrlib.commands import Command
26
 
from bzrlib.trace import mutter, warning
 
26
from bzrlib.trace import warning
27
27
 
28
28
class cmd_weave_list(Command):
29
29
    """List the revision ids present in a weave, in alphabetical order"""
64
64
    takes_args = ['weave_file', 'revision_a', 'revision_b']
65
65
 
66
66
    def run(self, weave_file, revision_a, revision_b):
67
 
        from bzrlib.weavefile import read_weave, write_weave
 
67
        from bzrlib.weavefile import read_weave
68
68
        w = read_weave(file(weave_file, 'rb'))
69
69
        for state, line in w.plan_merge(revision_a, revision_b):
70
70
            # make sure to print every line with a newline, even if it doesn't
84
84
    takes_args = ['weave_file', 'revision_a', 'revision_b']
85
85
 
86
86
    def run(self, weave_file, revision_a, revision_b):
87
 
        from bzrlib.weavefile import read_weave, write_weave
 
87
        from bzrlib.weavefile import read_weave
88
88
        w = read_weave(file(weave_file, 'rb'))
89
89
        p = w.plan_merge(revision_a, revision_b)
90
90
        sys.stdout.writelines(w.weave_merge(p))