← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave_commands.py

  • Committer: John Arbash Meinel
  • Author(s): Mark Hammond
  • Date: 2008-09-09 17:02:21 UTC
  • mto: This revision was merged to the branch mainline in revision 3697.
  • Revision ID: john@arbash-meinel.com-20080909170221-svim3jw2mrz0amp3
An updated transparent icon for bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave_commands.py
25
25
from bzrlib.commands import Command
26
26
from bzrlib.trace import warning
27
27
 
28
 
class cmd_weave_list(Command):
29
 
    """List the revision ids present in a weave, in alphabetical order"""
 
28
class cmd_versionedfile_list(Command):
 
29
    """List the revision ids present in a versionedfile, alphabetically"""
30
30
 
31
31
    hidden = True
32
 
    takes_args = ['weave_filename']
 
32
    takes_args = ['filename']
 
33
    aliases = ['weave-list']
33
34
 
34
 
    def run(self, weave_filename):
 
35
    def run(self, filename):
35
36
        from bzrlib.weavefile import read_weave
36
 
        weave = read_weave(file(weave_filename, 'rb'))
37
 
        names = weave.versions()
 
37
        from bzrlib.transport import get_transport
 
38
        from bzrlib import osutils
 
39
        vf = read_weave(file(filename, 'rb'))
 
40
        names = vf.versions()
38
41
        names.sort()
39
42
        print '\n'.join(names)
40
43
 
41
44
 
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)
59
 
 
60
 
 
61
45
class cmd_weave_plan_merge(Command):
62
46
    """Show the plan for merging two versions within a weave"""
63
47
    hidden = True