1
# Copyright (C) 2006 Canonical Ltd
1
# Copyright (C) 2006 by Canonical Ltd
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.
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.
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
25
25
from bzrlib.commands import Command
26
from bzrlib.trace import warning
26
from bzrlib.trace import mutter, warning
28
class cmd_versionedfile_list(Command):
29
"""List the revision ids present in a versionedfile, alphabetically"""
28
class cmd_weave_list(Command):
29
"""List the revision ids present in a weave, in alphabetical order"""
32
takes_args = ['filename']
33
aliases = ['weave-list']
32
takes_args = ['weave_filename']
35
def run(self, filename):
34
def run(self, weave_filename):
36
35
from bzrlib.weavefile import read_weave
37
from bzrlib.transport import get_transport
38
from bzrlib import osutils
39
vf = read_weave(file(filename, 'rb'))
36
weave = read_weave(file(weave_filename, 'rb'))
37
names = weave.versions()
42
39
print '\n'.join(names)
42
class cmd_weave_join(Command):
43
"""Join the contents of two weave files.
45
The resulting weave is sent to stdout.
47
This command is only intended for bzr developer use.
51
takes_args = ['weave1', 'weave2']
53
def run(self, weave1, weave2):
54
from bzrlib.weavefile import read_weave, write_weave
55
w1 = read_weave(file(weave1, 'rb'))
56
w2 = read_weave(file(weave2, 'rb'))
58
write_weave(w1, sys.stdout)
45
61
class cmd_weave_plan_merge(Command):
46
62
"""Show the plan for merging two versions within a weave"""
48
64
takes_args = ['weave_file', 'revision_a', 'revision_b']
50
66
def run(self, weave_file, revision_a, revision_b):
51
from bzrlib.weavefile import read_weave
67
from bzrlib.weavefile import read_weave, write_weave
52
68
w = read_weave(file(weave_file, 'rb'))
53
69
for state, line in w.plan_merge(revision_a, revision_b):
54
70
# make sure to print every line with a newline, even if it doesn't
68
84
takes_args = ['weave_file', 'revision_a', 'revision_b']
70
86
def run(self, weave_file, revision_a, revision_b):
71
from bzrlib.weavefile import read_weave
87
from bzrlib.weavefile import read_weave, write_weave
72
88
w = read_weave(file(weave_file, 'rb'))
73
89
p = w.plan_merge(revision_a, revision_b)
74
90
sys.stdout.writelines(w.weave_merge(p))