~bzr-pqm/bzr/bzr.dev

1616.1.7 by Martin Pool
New developer commands 'weave-list' and 'weave-join'.
1
# Copyright (C) 2006 by Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1616.1.7 by Martin Pool
New developer commands 'weave-list' and 'weave-join'.
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1616.1.7 by Martin Pool
New developer commands 'weave-list' and 'weave-join'.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1616.1.7 by Martin Pool
New developer commands 'weave-list' and 'weave-join'.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""builtin bzr commands relating to individual weave files
18
19
These should never normally need to be used by end users, but might be
20
of interest in debugging or data recovery.
21
"""
22
23
import sys
24
25
from bzrlib.commands import Command
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
26
from bzrlib.trace import warning
1616.1.7 by Martin Pool
New developer commands 'weave-list' and 'weave-join'.
27
28
class cmd_weave_list(Command):
29
    """List the revision ids present in a weave, in alphabetical order"""
30
31
    hidden = True
32
    takes_args = ['weave_filename']
33
34
    def run(self, weave_filename):
35
        from bzrlib.weavefile import read_weave
36
        weave = read_weave(file(weave_filename, 'rb'))
37
        names = weave.versions()
38
        names.sort()
39
        print '\n'.join(names)
40
41
42
class cmd_weave_join(Command):
43
    """Join the contents of two weave files.
44
45
    The resulting weave is sent to stdout.
46
47
    This command is only intended for bzr developer use.
48
    """
49
50
    hidden = True
51
    takes_args = ['weave1', 'weave2']
52
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'))
57
        w1.join(w2)
58
        write_weave(w1, sys.stdout)
1616.1.17 by Martin Pool
New 'weave-plan-merge' and 'weave-merge-text' commands lifted from weave.py
59
60
61
class cmd_weave_plan_merge(Command):
62
    """Show the plan for merging two versions within a weave"""
63
    hidden = True
64
    takes_args = ['weave_file', 'revision_a', 'revision_b']
65
66
    def run(self, weave_file, revision_a, revision_b):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
67
        from bzrlib.weavefile import read_weave
1616.1.17 by Martin Pool
New 'weave-plan-merge' and 'weave-merge-text' commands lifted from weave.py
68
        w = read_weave(file(weave_file, 'rb'))
69
        for state, line in w.plan_merge(revision_a, revision_b):
70
            # make sure to print every line with a newline, even if it doesn't
71
            # really have one
72
            if not line:
73
                continue
74
            if line[-1] != '\n':
75
                state += '!eol'
76
                line += '\n'
77
            if '\n' in line[:-1]:
78
                warning("line in weave contains embedded newline: %r" % line)
79
            print '%15s | %s' % (state, line),
80
81
class cmd_weave_merge_text(Command):
82
    """Debugging command to merge two texts of a weave"""
83
    hidden = True
84
    takes_args = ['weave_file', 'revision_a', 'revision_b']
85
86
    def run(self, weave_file, revision_a, revision_b):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
87
        from bzrlib.weavefile import read_weave
1616.1.17 by Martin Pool
New 'weave-plan-merge' and 'weave-merge-text' commands lifted from weave.py
88
        w = read_weave(file(weave_file, 'rb'))
89
        p = w.plan_merge(revision_a, revision_b)
90
        sys.stdout.writelines(w.weave_merge(p))