/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.1.1 by Martin Pool
Check in old existing knit code.
1
#! /usr/bin/python
2
3
# Copyright (C) 2005 Canonical Ltd
4
0.1.33 by Martin Pool
add gpl text
5
# This program is free software; you can redistribute it and/or modify
6
# it under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 2 of the License, or
8
# (at your option) any later version.
9
10
# This program is distributed in the hope that it will be useful,
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
# GNU General Public License for more details.
14
15
# You should have received a copy of the GNU General Public License
16
# along with this program; if not, write to the Free Software
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
0.1.1 by Martin Pool
Check in old existing knit code.
18
19
# Author: Martin Pool <mbp@canonical.com>
20
21
0.1.38 by Martin Pool
Rename knit to weave. (I don't think there's an existing module called weave.)
22
"""Weave - storage of related text file versions"""
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
23
928 by Martin Pool
- go back to using plain builtin set()
24
# before intset (r923) 2000 versions in 41.5s
25
# with intset (r926) 2000 versions in 93s !!!
26
# better to just use plain sets.
27
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
28
# making _extract build and return a list, rather than being a generator
29
# takes 37.94s
30
938 by Martin Pool
- various optimizations to weave add code
31
# with python -O, r923 does 2000 versions in 36.87s
32
33
# with optimizations to avoid mutating lists - 35.75!  I guess copying
34
# all the elements every time costs more than the small manipulations.
35
# a surprisingly small change.
36
37
# r931, which avoids using a generator for extract, does 36.98s
38
39
# with memoized inclusions, takes 41.49s; not very good
40
41
# with slots, takes 37.35s; without takes 39.16, a bit surprising
42
43
# with the delta calculation mixed in with the add method, rather than
44
# separated, takes 36.78s
45
46
# with delta folded in and mutation of the list, 36.13s
47
1079 by Martin Pool
- weavefile can just use lists for read-in ancestry, not frozensets
48
# with all this and simplification of add code, 33s
49
50
51
52
938 by Martin Pool
- various optimizations to weave add code
53
0.1.61 by Martin Pool
doc
54
# TODO: Perhaps have copy method for Weave instances?
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
55
0.1.58 by Martin Pool
doc
56
# XXX: If we do weaves this way, will a merge still behave the same
57
# way if it's done in a different order?  That's a pretty desirable
58
# property.
59
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
60
# TODO: Nothing here so far assumes the lines are really \n newlines,
61
# rather than being split up in some other way.  We could accomodate
62
# binaries, perhaps by naively splitting on \n or perhaps using
63
# something like a rolling checksum.
64
0.1.85 by Martin Pool
doc
65
# TODO: End marker for each version so we can stop reading?
0.1.69 by Martin Pool
Simple text-based format for storing weaves, cleaner than
66
67
# TODO: Check that no insertion occurs inside a deletion that was
68
# active in the version of the insertion.
69
912 by Martin Pool
- update todos for weave
70
# TODO: In addition to the SHA-1 check, perhaps have some code that
71
# checks structural constraints of the weave: ie that insertions are
72
# properly nested, that there is no text outside of an insertion, that
73
# insertions or deletions are not repeated, etc.
0.1.85 by Martin Pool
doc
74
918 by Martin Pool
- start doing new weave-merge algorithm
75
# TODO: Parallel-extract that passes back each line along with a
76
# description of which revisions include it.  Nice for checking all
77
# shas in parallel.
78
1082 by Martin Pool
- lift imports
79
# TODO: Using a single _extract routine and then processing the output
80
# is probably inefficient.  It's simple enough that we can afford to
81
# have slight specializations for different ways its used: annotate,
82
# basis for add, get, etc.
83
1083 by Martin Pool
- add space to store revision-id in weave files
84
# TODO: Perhaps the API should work only in names to hide the integer
85
# indexes from the user?
86
87
1082 by Martin Pool
- lift imports
88
89
import sha
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
90
from cStringIO import StringIO
0.1.85 by Martin Pool
doc
91
924 by Martin Pool
- Add IntSet class
92
0.1.47 by Martin Pool
New WeaveError and WeaveFormatError rather than assertions.
93
class WeaveError(Exception):
94
    """Exception in processing weave"""
95
96
97
class WeaveFormatError(WeaveError):
98
    """Weave invariant violated"""
99
    
100
0.1.38 by Martin Pool
Rename knit to weave. (I don't think there's an existing module called weave.)
101
class Weave(object):
102
    """weave - versioned text file storage.
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
103
    
0.1.72 by Martin Pool
Go back to weave lines normally having newlines at the end.
104
    A Weave manages versions of line-based text files, keeping track
105
    of the originating version for each line.
106
107
    To clients the "lines" of the file are represented as a list of strings.
108
    These strings  will typically have terminal newline characters, but
109
    this is not required.  In particular files commonly do not have a newline
110
    at the end of the file.
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
111
0.1.4 by Martin Pool
Start indexing knits by both integer and version string.
112
    Texts can be identified in either of two ways:
113
114
    * a nonnegative index number.
115
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
116
    * a version-id string. (not implemented yet)
0.1.4 by Martin Pool
Start indexing knits by both integer and version string.
117
0.1.38 by Martin Pool
Rename knit to weave. (I don't think there's an existing module called weave.)
118
    Typically the index number will be valid only inside this weave and
0.1.4 by Martin Pool
Start indexing knits by both integer and version string.
119
    the version-id is used to reference it in the larger world.
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
120
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
121
    The weave is represented as a list mixing edit instructions and
944 by Martin Pool
- refactor member names in Weave code
122
    literal text.  Each entry in _weave can be either a string (or
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
123
    unicode), or a tuple.  If a string, it means that the given line
124
    should be output in the currently active revisions.
125
126
    If a tuple, it gives a processing instruction saying in which
127
    revisions the enclosed lines are active.  The tuple has the form
128
    (instruction, version).
129
130
    The instruction can be '{' or '}' for an insertion block, and '['
131
    and ']' for a deletion block respectively.  The version is the
0.1.45 by Martin Pool
doc
132
    integer version index.  There is no replace operator, only deletes
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
133
    and inserts.  For '}', the end of an insertion, there is no
134
    version parameter because it always closes the most recently
135
    opened insertion.
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
136
0.1.41 by Martin Pool
Doc
137
    Constraints/notes:
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
138
139
    * A later version can delete lines that were introduced by any
140
      number of ancestor versions; this implies that deletion
141
      instructions can span insertion blocks without regard to the
142
      insertion block's nesting.
143
0.1.41 by Martin Pool
Doc
144
    * Similarly, deletions need not be properly nested with regard to
145
      each other, because they might have been generated by
146
      independent revisions.
147
0.1.45 by Martin Pool
doc
148
    * Insertions are always made by inserting a new bracketed block
149
      into a single point in the previous weave.  This implies they
150
      can nest but not overlap, and the nesting must always have later
151
      insertions on the inside.
152
0.1.41 by Martin Pool
Doc
153
    * It doesn't seem very useful to have an active insertion
154
      inside an inactive insertion, but it might happen.
0.1.45 by Martin Pool
doc
155
      
0.1.41 by Martin Pool
Doc
156
    * Therefore, all instructions are always"considered"; that
157
      is passed onto and off the stack.  An outer inactive block
158
      doesn't disable an inner block.
159
160
    * Lines are enabled if the most recent enclosing insertion is
161
      active and none of the enclosing deletions are active.
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
162
0.1.49 by Martin Pool
Add another constraint: revisions should not delete text that they
163
    * There is no point having a deletion directly inside its own
164
      insertion; you might as well just not write it.  And there
165
      should be no way to get an earlier version deleting a later
166
      version.
167
944 by Martin Pool
- refactor member names in Weave code
168
    _weave
169
        Text of the weave; list of control instruction tuples and strings.
0.1.4 by Martin Pool
Start indexing knits by both integer and version string.
170
944 by Martin Pool
- refactor member names in Weave code
171
    _parents
892 by Martin Pool
- weave stores only direct parents, and calculates and memoizes expansion as needed
172
        List of parents, indexed by version number.
173
        It is only necessary to store the minimal set of parents for
174
        each version; the parent's parents are implied.
0.1.13 by Martin Pool
Knit structure now allows for versions to include the lines present in other
175
0.1.89 by Martin Pool
Store SHA1 in weave file for later verification
176
    _sha1s
1083 by Martin Pool
- add space to store revision-id in weave files
177
        List of hex SHA-1 of each version.
178
179
    _names
180
        List of symbolic names for each version.  Each should be unique.
181
182
    _name_map
183
        For each name, the version number.
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
184
    """
938 by Martin Pool
- various optimizations to weave add code
185
1083 by Martin Pool
- add space to store revision-id in weave files
186
    __slots__ = ['_weave', '_parents', '_sha1s', '_names', '_name_map']
938 by Martin Pool
- various optimizations to weave add code
187
    
0.1.4 by Martin Pool
Start indexing knits by both integer and version string.
188
    def __init__(self):
944 by Martin Pool
- refactor member names in Weave code
189
        self._weave = []
190
        self._parents = []
0.1.89 by Martin Pool
Store SHA1 in weave file for later verification
191
        self._sha1s = []
1083 by Martin Pool
- add space to store revision-id in weave files
192
        self._names = []
193
        self._name_map = {}
0.1.60 by Martin Pool
Weave eq and ne methods
194
195
196
    def __eq__(self, other):
197
        if not isinstance(other, Weave):
198
            return False
944 by Martin Pool
- refactor member names in Weave code
199
        return self._parents == other._parents \
1083 by Martin Pool
- add space to store revision-id in weave files
200
               and self._weave == other._weave \
201
               and self._sha1s == other._sha1s 
202
0.1.60 by Martin Pool
Weave eq and ne methods
203
    
204
    def __ne__(self, other):
205
        return not self.__eq__(other)
206
1083 by Martin Pool
- add space to store revision-id in weave files
207
208
    def lookup(self, name):
209
        try:
210
            return self._name_map[name]
211
        except KeyError:
212
            raise WeaveError("name %s not present in weave" % name)
213
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
214
        
1083 by Martin Pool
- add space to store revision-id in weave files
215
    def add(self, name, parents, text):
0.1.4 by Martin Pool
Start indexing knits by both integer and version string.
216
        """Add a single text on top of the weave.
0.1.36 by Martin Pool
doc
217
  
0.1.26 by Martin Pool
Refactor parameters to add command
218
        Returns the index number of the newly added version.
219
1083 by Martin Pool
- add space to store revision-id in weave files
220
        name
221
            Symbolic name for this version.
222
            (Typically the revision-id of the revision that added it.)
223
0.1.26 by Martin Pool
Refactor parameters to add command
224
        parents
892 by Martin Pool
- weave stores only direct parents, and calculates and memoizes expansion as needed
225
            List or set of direct parent version numbers.
226
            
0.1.26 by Martin Pool
Refactor parameters to add command
227
        text
228
            Sequence of lines to be added in the new version."""
938 by Martin Pool
- various optimizations to weave add code
229
1083 by Martin Pool
- add space to store revision-id in weave files
230
        assert isinstance(name, basestring)
231
        if name in self._name_map:
232
            raise WeaveError("name %r already present in weave" % name)
233
        
938 by Martin Pool
- various optimizations to weave add code
234
        self._check_versions(parents)
0.1.82 by Martin Pool
Small weave optimizations
235
        ## self._check_lines(text)
944 by Martin Pool
- refactor member names in Weave code
236
        new_version = len(self._parents)
0.1.5 by Martin Pool
Add test for storing two text versions.
237
0.1.89 by Martin Pool
Store SHA1 in weave file for later verification
238
        s = sha.new()
938 by Martin Pool
- various optimizations to weave add code
239
        map(s.update, text)
0.1.89 by Martin Pool
Store SHA1 in weave file for later verification
240
        sha1 = s.hexdigest()
241
        del s
242
1083 by Martin Pool
- add space to store revision-id in weave files
243
        # if we abort after here the (in-memory) weave will be corrupt because only
244
        # some fields are updated
245
        self._parents.append(parents[:])
0.1.89 by Martin Pool
Store SHA1 in weave file for later verification
246
        self._sha1s.append(sha1)
1083 by Martin Pool
- add space to store revision-id in weave files
247
        self._names.append(name)
248
        self._name_map[name] = new_version
938 by Martin Pool
- various optimizations to weave add code
249
250
            
251
        if not parents:
252
            # special case; adding with no parents revision; can do
253
            # this more quickly by just appending unconditionally.
254
            # even more specially, if we're adding an empty text we
255
            # need do nothing at all.
256
            if text:
944 by Martin Pool
- refactor member names in Weave code
257
                self._weave.append(('{', new_version))
258
                self._weave.extend(text)
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
259
                self._weave.append(('}', None))
938 by Martin Pool
- various optimizations to weave add code
260
        
261
            return new_version
262
941 by Martin Pool
- allow for parents specified to Weave.add to be a set
263
        if len(parents) == 1:
264
            pv = list(parents)[0]
265
            if sha1 == self._sha1s[pv]:
266
                # special case: same as the single parent
267
                return new_version
938 by Martin Pool
- various optimizations to weave add code
268
            
269
270
        ancestors = self.inclusions(parents)
271
944 by Martin Pool
- refactor member names in Weave code
272
        l = self._weave
938 by Martin Pool
- various optimizations to weave add code
273
274
        # basis a list of (origin, lineno, line)
275
        basis_lineno = []
276
        basis_lines = []
277
        for origin, lineno, line in self._extract(ancestors):
278
            basis_lineno.append(lineno)
279
            basis_lines.append(line)
280
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
281
        # another small special case: a merge, producing the same text
282
        # as auto-merge
938 by Martin Pool
- various optimizations to weave add code
283
        if text == basis_lines:
284
            return new_version            
285
286
        # add a sentinal, because we can also match against the final line
944 by Martin Pool
- refactor member names in Weave code
287
        basis_lineno.append(len(self._weave))
938 by Martin Pool
- various optimizations to weave add code
288
289
        # XXX: which line of the weave should we really consider
290
        # matches the end of the file?  the current code says it's the
291
        # last line of the weave?
292
293
        #print 'basis_lines:', basis_lines
294
        #print 'new_lines:  ', lines
295
296
        from difflib import SequenceMatcher
297
        s = SequenceMatcher(None, basis_lines, text)
298
299
        # offset gives the number of lines that have been inserted
300
        # into the weave up to the current point; if the original edit instruction
301
        # says to change line A then we actually change (A+offset)
302
        offset = 0
303
304
        for tag, i1, i2, j1, j2 in s.get_opcodes():
305
            # i1,i2 are given in offsets within basis_lines; we need to map them
306
            # back to offsets within the entire weave
307
            #print 'raw match', tag, i1, i2, j1, j2
308
            if tag == 'equal':
309
                continue
310
311
            i1 = basis_lineno[i1]
312
            i2 = basis_lineno[i2]
313
314
            assert 0 <= j1 <= j2 <= len(text)
315
316
            #print tag, i1, i2, j1, j2
317
318
            # the deletion and insertion are handled separately.
319
            # first delete the region.
320
            if i1 != i2:
944 by Martin Pool
- refactor member names in Weave code
321
                self._weave.insert(i1+offset, ('[', new_version))
322
                self._weave.insert(i2+offset+1, (']', new_version))
938 by Martin Pool
- various optimizations to weave add code
323
                offset += 2
324
325
            if j1 != j2:
326
                # there may have been a deletion spanning up to
327
                # i2; we want to insert after this region to make sure
328
                # we don't destroy ourselves
329
                i = i2 + offset
944 by Martin Pool
- refactor member names in Weave code
330
                self._weave[i:i] = ([('{', new_version)] 
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
331
                                    + text[j1:j2] 
332
                                    + [('}', None)])
938 by Martin Pool
- various optimizations to weave add code
333
                offset += 2 + (j2 - j1)
334
335
        return new_version
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
336
0.1.27 by Martin Pool
Check that version numbers passed in are reasonable
337
0.1.78 by Martin Pool
Rename Weave.get_included to inclusions and getiter to get_iter
338
    def inclusions(self, versions):
893 by Martin Pool
- Refactor weave calculation of inclusions
339
        """Return set of all ancestors of given version(s)."""
928 by Martin Pool
- go back to using plain builtin set()
340
        i = set(versions)
893 by Martin Pool
- Refactor weave calculation of inclusions
341
        v = max(versions)
892 by Martin Pool
- weave stores only direct parents, and calculates and memoizes expansion as needed
342
        try:
893 by Martin Pool
- Refactor weave calculation of inclusions
343
            while v >= 0:
344
                if v in i:
345
                    # include all its parents
944 by Martin Pool
- refactor member names in Weave code
346
                    i.update(self._parents[v])
893 by Martin Pool
- Refactor weave calculation of inclusions
347
                v -= 1
348
            return i
892 by Martin Pool
- weave stores only direct parents, and calculates and memoizes expansion as needed
349
        except IndexError:
350
            raise ValueError("version %d not present in weave" % v)
0.1.77 by Martin Pool
New Weave.get_included() does transitive expansion
351
352
890 by Martin Pool
- weave info should show minimal expression of parents
353
    def minimal_parents(self, version):
354
        """Find the minimal set of parents for the version."""
944 by Martin Pool
- refactor member names in Weave code
355
        included = self._parents[version]
890 by Martin Pool
- weave info should show minimal expression of parents
356
        if not included:
357
            return []
358
        
359
        li = list(included)
893 by Martin Pool
- Refactor weave calculation of inclusions
360
        li.sort(reverse=True)
890 by Martin Pool
- weave info should show minimal expression of parents
361
362
        mininc = []
928 by Martin Pool
- go back to using plain builtin set()
363
        gotit = set()
890 by Martin Pool
- weave info should show minimal expression of parents
364
365
        for pv in li:
366
            if pv not in gotit:
367
                mininc.append(pv)
893 by Martin Pool
- Refactor weave calculation of inclusions
368
                gotit.update(self.inclusions(pv))
890 by Martin Pool
- weave info should show minimal expression of parents
369
370
        assert mininc[0] >= 0
371
        assert mininc[-1] < version
372
        return mininc
373
374
0.1.75 by Martin Pool
Remove VerInfo class; just store sets directly in the list of
375
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
376
    def _check_lines(self, text):
377
        if not isinstance(text, list):
378
            raise ValueError("text should be a list, not %s" % type(text))
379
380
        for l in text:
381
            if not isinstance(l, basestring):
869 by Martin Pool
- more weave.py command line options
382
                raise ValueError("text line should be a string or unicode, not %s"
383
                                 % type(l))
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
384
        
385
386
0.1.27 by Martin Pool
Check that version numbers passed in are reasonable
387
    def _check_versions(self, indexes):
388
        """Check everything in the sequence of indexes is valid"""
389
        for i in indexes:
390
            try:
944 by Martin Pool
- refactor member names in Weave code
391
                self._parents[i]
0.1.27 by Martin Pool
Check that version numbers passed in are reasonable
392
            except IndexError:
393
                raise IndexError("invalid version number %r" % i)
394
0.1.2 by Martin Pool
Import testsweet module adapted from bzr.
395
    
0.1.7 by Martin Pool
Add trivial annotate text
396
    def annotate(self, index):
397
        return list(self.annotate_iter(index))
398
399
0.1.78 by Martin Pool
Rename Weave.get_included to inclusions and getiter to get_iter
400
    def annotate_iter(self, version):
0.1.7 by Martin Pool
Add trivial annotate text
401
        """Yield list of (index-id, line) pairs for the specified version.
402
403
        The index indicates when the line originated in the weave."""
893 by Martin Pool
- Refactor weave calculation of inclusions
404
        for origin, lineno, text in self._extract([version]):
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
405
            yield origin, text
0.1.22 by Martin Pool
Calculate delta for new versions relative to a set of parent versions.
406
407
918 by Martin Pool
- start doing new weave-merge algorithm
408
    def _walk(self):
409
        """Walk the weave.
410
411
        Yields sequence of
412
        (lineno, insert, deletes, text)
413
        for each literal line.
414
        """
415
        
416
        istack = []
928 by Martin Pool
- go back to using plain builtin set()
417
        dset = set()
918 by Martin Pool
- start doing new weave-merge algorithm
418
419
        lineno = 0         # line of weave, 0-based
420
944 by Martin Pool
- refactor member names in Weave code
421
        for l in self._weave:
918 by Martin Pool
- start doing new weave-merge algorithm
422
            if isinstance(l, tuple):
423
                c, v = l
424
                isactive = None
425
                if c == '{':
426
                    istack.append(v)
427
                elif c == '}':
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
428
                    istack.pop()
918 by Martin Pool
- start doing new weave-merge algorithm
429
                elif c == '[':
926 by Martin Pool
- update more weave code to use intsets
430
                    assert v not in dset
431
                    dset.add(v)
918 by Martin Pool
- start doing new weave-merge algorithm
432
                elif c == ']':
926 by Martin Pool
- update more weave code to use intsets
433
                    dset.remove(v)
918 by Martin Pool
- start doing new weave-merge algorithm
434
                else:
435
                    raise WeaveFormatError('unexpected instruction %r'
436
                                           % v)
437
            else:
438
                assert isinstance(l, basestring)
439
                assert istack
440
                yield lineno, istack[-1], dset, l
441
            lineno += 1
442
443
444
893 by Martin Pool
- Refactor weave calculation of inclusions
445
    def _extract(self, versions):
0.1.20 by Martin Pool
Factor out Knit.extract() method
446
        """Yield annotation of lines in included set.
447
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
448
        Yields a sequence of tuples (origin, lineno, text), where
449
        origin is the origin version, lineno the index in the weave,
450
        and text the text of the line.
451
0.1.20 by Martin Pool
Factor out Knit.extract() method
452
        The set typically but not necessarily corresponds to a version.
453
        """
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
454
        for i in versions:
455
            if not isinstance(i, int):
456
                raise ValueError(i)
457
            
893 by Martin Pool
- Refactor weave calculation of inclusions
458
        included = self.inclusions(versions)
881 by Martin Pool
- faster weave extraction
459
460
        istack = []
928 by Martin Pool
- go back to using plain builtin set()
461
        dset = set()
0.1.48 by Martin Pool
Basic parsing of delete instructions.
462
463
        lineno = 0         # line of weave, 0-based
891 by Martin Pool
- fix up refactoring of weave
464
894 by Martin Pool
- small optimization for weave extract
465
        isactive = None
0.1.85 by Martin Pool
doc
466
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
467
        result = []
468
0.1.63 by Martin Pool
Abbreviate WeaveFormatError in some code
469
        WFE = WeaveFormatError
0.1.95 by Martin Pool
- preliminary merge conflict detection
470
944 by Martin Pool
- refactor member names in Weave code
471
        for l in self._weave:
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
472
            if isinstance(l, tuple):
473
                c, v = l
894 by Martin Pool
- small optimization for weave extract
474
                isactive = None
891 by Martin Pool
- fix up refactoring of weave
475
                if c == '{':
476
                    assert v not in istack
477
                    istack.append(v)
478
                elif c == '}':
1075 by Martin Pool
- don't store redundant version number at end of insert blocks
479
                    istack.pop()
891 by Martin Pool
- fix up refactoring of weave
480
                elif c == '[':
481
                    if v in included:
881 by Martin Pool
- faster weave extraction
482
                        assert v not in dset
0.1.48 by Martin Pool
Basic parsing of delete instructions.
483
                        dset.add(v)
891 by Martin Pool
- fix up refactoring of weave
484
                else:
485
                    assert c == ']'
486
                    if v in included:
881 by Martin Pool
- faster weave extraction
487
                        assert v in dset
0.1.48 by Martin Pool
Basic parsing of delete instructions.
488
                        dset.remove(v)
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
489
            else:
490
                assert isinstance(l, basestring)
894 by Martin Pool
- small optimization for weave extract
491
                if isactive is None:
492
                    isactive = (not dset) and istack and (istack[-1] in included)
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
493
                if isactive:
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
494
                    result.append((istack[-1], lineno, l))
0.1.39 by Martin Pool
Change to a more realistic weave structure which can represent insertions and
495
            lineno += 1
0.1.7 by Martin Pool
Add trivial annotate text
496
0.1.46 by Martin Pool
More constraints on structure of weave, and checks that they work
497
        if istack:
0.1.63 by Martin Pool
Abbreviate WeaveFormatError in some code
498
            raise WFE("unclosed insertion blocks at end of weave",
0.1.47 by Martin Pool
New WeaveError and WeaveFormatError rather than assertions.
499
                                   istack)
0.1.48 by Martin Pool
Basic parsing of delete instructions.
500
        if dset:
0.1.63 by Martin Pool
Abbreviate WeaveFormatError in some code
501
            raise WFE("unclosed deletion blocks at end of weave",
0.1.48 by Martin Pool
Basic parsing of delete instructions.
502
                                   dset)
0.1.40 by Martin Pool
Add test for extracting from weave with nested insertions
503
931 by Martin Pool
- experiment with making Weave._extract() return a list, not a generator - slightly faster
504
        return result
505
    
506
0.1.7 by Martin Pool
Add trivial annotate text
507
0.1.78 by Martin Pool
Rename Weave.get_included to inclusions and getiter to get_iter
508
    def get_iter(self, version):
0.1.5 by Martin Pool
Add test for storing two text versions.
509
        """Yield lines for the specified version."""
893 by Martin Pool
- Refactor weave calculation of inclusions
510
        for origin, lineno, line in self._extract([version]):
0.1.8 by Martin Pool
Unify get/annotate code
511
            yield line
0.1.5 by Martin Pool
Add test for storing two text versions.
512
513
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
514
    def get_text(self, version):
515
        assert isinstance(version, int)
516
        s = StringIO()
517
        s.writelines(self.get_iter(version))
518
        return s.getvalue()
519
520
0.1.4 by Martin Pool
Start indexing knits by both integer and version string.
521
    def get(self, index):
0.1.78 by Martin Pool
Rename Weave.get_included to inclusions and getiter to get_iter
522
        return list(self.get_iter(index))
0.1.1 by Martin Pool
Check in old existing knit code.
523
524
0.1.95 by Martin Pool
- preliminary merge conflict detection
525
    def mash_iter(self, included):
0.1.65 by Martin Pool
Add Weave.merge_iter to get automerged lines
526
        """Return composed version of multiple included versions."""
893 by Martin Pool
- Refactor weave calculation of inclusions
527
        for origin, lineno, text in self._extract(included):
0.1.65 by Martin Pool
Add Weave.merge_iter to get automerged lines
528
            yield text
529
530
0.1.11 by Martin Pool
Add Knit.dump method
531
    def dump(self, to_file):
532
        from pprint import pprint
944 by Martin Pool
- refactor member names in Weave code
533
        print >>to_file, "Weave._weave = ",
534
        pprint(self._weave, to_file)
535
        print >>to_file, "Weave._parents = ",
536
        pprint(self._parents, to_file)
0.1.11 by Martin Pool
Add Knit.dump method
537
538
0.1.91 by Martin Pool
Update Weave.check
539
540
    def numversions(self):
944 by Martin Pool
- refactor member names in Weave code
541
        l = len(self._parents)
0.1.91 by Martin Pool
Update Weave.check
542
        assert l == len(self._sha1s)
543
        return l
544
545
946 by Martin Pool
- weave info only shows the weave headers, doesn't extract every version:
546
    def __len__(self):
547
        return self.numversions()
548
549
894 by Martin Pool
- small optimization for weave extract
550
    def check(self, progress_bar=None):
0.1.91 by Martin Pool
Update Weave.check
551
        # check no circular inclusions
552
        for version in range(self.numversions()):
944 by Martin Pool
- refactor member names in Weave code
553
            inclusions = list(self._parents[version])
0.1.91 by Martin Pool
Update Weave.check
554
            if inclusions:
555
                inclusions.sort()
556
                if inclusions[-1] >= version:
0.1.47 by Martin Pool
New WeaveError and WeaveFormatError rather than assertions.
557
                    raise WeaveFormatError("invalid included version %d for index %d"
0.1.91 by Martin Pool
Update Weave.check
558
                                           % (inclusions[-1], version))
559
560
        # try extracting all versions; this is a bit slow and parallel
561
        # extraction could be used
894 by Martin Pool
- small optimization for weave extract
562
        nv = self.numversions()
563
        for version in range(nv):
564
            if progress_bar:
565
                progress_bar.update('checking text', version, nv)
0.1.91 by Martin Pool
Update Weave.check
566
            s = sha.new()
567
            for l in self.get_iter(version):
568
                s.update(l)
569
            hd = s.hexdigest()
570
            expected = self._sha1s[version]
571
            if hd != expected:
572
                raise WeaveError("mismatched sha1 for version %d; "
573
                                 "got %s, expected %s"
574
                                 % (version, hd, expected))
0.1.18 by Martin Pool
Better Knit.dump method
575
881 by Martin Pool
- faster weave extraction
576
        # TODO: check insertions are properly nested, that there are
577
        # no lines outside of insertion blocks, that deletions are
578
        # properly paired, etc.
579
0.1.13 by Martin Pool
Knit structure now allows for versions to include the lines present in other
580
581
0.1.95 by Martin Pool
- preliminary merge conflict detection
582
    def merge(self, merge_versions):
583
        """Automerge and mark conflicts between versions.
584
585
        This returns a sequence, each entry describing alternatives
586
        for a chunk of the file.  Each of the alternatives is given as
587
        a list of lines.
588
589
        If there is a chunk of the file where there's no diagreement,
590
        only one alternative is given.
591
        """
592
593
        # approach: find the included versions common to all the
594
        # merged versions
595
        raise NotImplementedError()
596
597
598
0.1.21 by Martin Pool
Start computing a delta to insert a new revision
599
    def _delta(self, included, lines):
600
        """Return changes from basis to new revision.
601
602
        The old text for comparison is the union of included revisions.
603
604
        This is used in inserting a new text.
0.1.22 by Martin Pool
Calculate delta for new versions relative to a set of parent versions.
605
0.1.55 by Martin Pool
doc
606
        Delta is returned as a sequence of
607
        (weave1, weave2, newlines).
608
609
        This indicates that weave1:weave2 of the old weave should be
0.1.22 by Martin Pool
Calculate delta for new versions relative to a set of parent versions.
610
        replaced by the sequence of lines in newlines.  Note that
611
        these line numbers are positions in the total weave and don't
612
        correspond to the lines in any extracted version, or even the
613
        extracted union of included versions.
614
615
        If line1=line2, this is a pure insert; if newlines=[] this is a
616
        pure delete.  (Similar to difflib.)
0.1.21 by Martin Pool
Start computing a delta to insert a new revision
617
        """
618
0.1.1 by Martin Pool
Check in old existing knit code.
619
918 by Martin Pool
- start doing new weave-merge algorithm
620
            
621
    def plan_merge(self, ver_a, ver_b):
622
        """Return pseudo-annotation indicating how the two versions merge.
623
624
        This is computed between versions a and b and their common
625
        base.
626
627
        Weave lines present in none of them are skipped entirely.
628
        """
926 by Martin Pool
- update more weave code to use intsets
629
        inc_a = self.inclusions([ver_a])
630
        inc_b = self.inclusions([ver_b])
918 by Martin Pool
- start doing new weave-merge algorithm
631
        inc_c = inc_a & inc_b
632
633
        for lineno, insert, deleteset, line in self._walk():
634
            if deleteset & inc_c:
635
                # killed in parent; can't be in either a or b
636
                # not relevant to our work
637
                yield 'killed-base', line
926 by Martin Pool
- update more weave code to use intsets
638
            elif insert in inc_c:
918 by Martin Pool
- start doing new weave-merge algorithm
639
                # was inserted in base
640
                killed_a = bool(deleteset & inc_a)
641
                killed_b = bool(deleteset & inc_b)
642
                if killed_a and killed_b:
643
                    yield 'killed-both', line
644
                elif killed_a:
645
                    yield 'killed-a', line
646
                elif killed_b:
647
                    yield 'killed-b', line
648
                else:
649
                    yield 'unchanged', line
926 by Martin Pool
- update more weave code to use intsets
650
            elif insert in inc_a:
918 by Martin Pool
- start doing new weave-merge algorithm
651
                if deleteset & inc_a:
652
                    yield 'ghost-a', line
653
                else:
654
                    # new in A; not in B
655
                    yield 'new-a', line
926 by Martin Pool
- update more weave code to use intsets
656
            elif insert in inc_b:
918 by Martin Pool
- start doing new weave-merge algorithm
657
                if deleteset & inc_b:
658
                    yield 'ghost-b', line
659
                else:
660
                    yield 'new-b', line
661
            else:
662
                # not in either revision
663
                yield 'irrelevant', line
664
919 by Martin Pool
- more development of weave-merge
665
        yield 'unchanged', ''           # terminator
666
667
668
669
    def weave_merge(self, plan):
670
        lines_a = []
671
        lines_b = []
672
        ch_a = ch_b = False
673
674
        for state, line in plan:
675
            if state == 'unchanged' or state == 'killed-both':
676
                # resync and flush queued conflicts changes if any
677
                if not lines_a and not lines_b:
678
                    pass
679
                elif ch_a and not ch_b:
680
                    # one-sided change:                    
681
                    for l in lines_a: yield l
682
                elif ch_b and not ch_a:
683
                    for l in lines_b: yield l
684
                elif lines_a == lines_b:
685
                    for l in lines_a: yield l
686
                else:
687
                    yield '<<<<\n'
688
                    for l in lines_a: yield l
689
                    yield '====\n'
690
                    for l in lines_b: yield l
691
                    yield '>>>>\n'
692
693
                del lines_a[:]
694
                del lines_b[:]
695
                ch_a = ch_b = False
696
                
697
            if state == 'unchanged':
698
                if line:
699
                    yield line
700
            elif state == 'killed-a':
701
                ch_a = True
702
                lines_b.append(line)
703
            elif state == 'killed-b':
704
                ch_b = True
705
                lines_a.append(line)
706
            elif state == 'new-a':
707
                ch_a = True
708
                lines_a.append(line)
709
            elif state == 'new-b':
710
                ch_b = True
711
                lines_b.append(line)
712
            else:
920 by Martin Pool
- add more test cases for weave_merge
713
                assert state in ('irrelevant', 'ghost-a', 'ghost-b', 'killed-base',
714
                                 'killed-both'), \
919 by Martin Pool
- more development of weave-merge
715
                       state
716
717
                
718
719
918 by Martin Pool
- start doing new weave-merge algorithm
720
721
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
722
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
723
def weave_toc(w):
724
    """Show the weave's table-of-contents"""
1083 by Martin Pool
- add space to store revision-id in weave files
725
    print '%6s %50s %10s %10s' % ('ver', 'name', 'sha1', 'parents')
726
    for i in (6, 50, 10, 10):
870 by Martin Pool
- better weave info display
727
        print '-' * i,
728
    print
946 by Martin Pool
- weave info only shows the weave headers, doesn't extract every version:
729
    for i in range(w.numversions()):
0.1.91 by Martin Pool
Update Weave.check
730
        sha1 = w._sha1s[i]
1083 by Martin Pool
- add space to store revision-id in weave files
731
        name = w._names[i]
732
        parent_str = ' '.join(map(str, w._parents[i]))
733
        print '%6d %-50.50s %10.10s %s' % (i, name, sha1, parent_str)
0.1.88 by Martin Pool
Add weave info command.
734
869 by Martin Pool
- more weave.py command line options
735
736
947 by Martin Pool
- new 'weave stats' command
737
def weave_stats(weave_file):
738
    from bzrlib.progress import ProgressBar
739
    from bzrlib.weavefile import read_weave
740
741
    pb = ProgressBar()
742
743
    wf = file(weave_file, 'rb')
744
    w = read_weave(wf)
745
    # FIXME: doesn't work on pipes
746
    weave_size = wf.tell()
747
748
    total = 0
749
    vers = len(w)
750
    for i in range(vers):
751
        pb.update('checking sizes', i, vers)
752
        for line in w.get_iter(i):
753
            total += len(line)
754
755
    pb.clear()
756
757
    print 'versions          %9d' % vers
758
    print 'weave file        %9d bytes' % weave_size
759
    print 'total contents    %9d bytes' % total
760
    print 'compression ratio %9.2fx' % (float(total) / float(weave_size))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
761
    if vers:
762
        avg = total/vers
763
        print 'average size      %9d bytes' % avg
764
        print 'relative size     %9.2fx' % (float(weave_size) / float(avg))
947 by Martin Pool
- new 'weave stats' command
765
766
869 by Martin Pool
- more weave.py command line options
767
def usage():
871 by Martin Pool
- add command for merge-based weave
768
    print """bzr weave tool
769
770
Experimental tool for weave algorithm.
771
869 by Martin Pool
- more weave.py command line options
772
usage:
773
    weave init WEAVEFILE
774
        Create an empty weave file
775
    weave get WEAVEFILE VERSION
776
        Write out specified version.
777
    weave check WEAVEFILE
778
        Check consistency of all versions.
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
779
    weave toc WEAVEFILE
869 by Martin Pool
- more weave.py command line options
780
        Display table of contents.
1084 by Martin Pool
- weave add command needs to take a symbolic name too
781
    weave add WEAVEFILE NAME [BASE...] < NEWTEXT
869 by Martin Pool
- more weave.py command line options
782
        Add NEWTEXT, with specified parent versions.
783
    weave annotate WEAVEFILE VERSION
784
        Display origin of each line.
785
    weave mash WEAVEFILE VERSION...
786
        Display composite of all selected versions.
787
    weave merge WEAVEFILE VERSION1 VERSION2 > OUT
788
        Auto-merge two versions and display conflicts.
871 by Martin Pool
- add command for merge-based weave
789
790
example:
791
792
    % weave init foo.weave
793
    % vi foo.txt
1084 by Martin Pool
- weave add command needs to take a symbolic name too
794
    % weave add foo.weave ver0 < foo.txt
871 by Martin Pool
- add command for merge-based weave
795
    added version 0
796
797
    (create updated version)
798
    % vi foo.txt
799
    % weave get foo.weave 0 | diff -u - foo.txt
1084 by Martin Pool
- weave add command needs to take a symbolic name too
800
    % weave add foo.weave ver1 0 < foo.txt
871 by Martin Pool
- add command for merge-based weave
801
    added version 1
802
803
    % weave get foo.weave 0 > foo.txt       (create forked version)
804
    % vi foo.txt
1084 by Martin Pool
- weave add command needs to take a symbolic name too
805
    % weave add foo.weave ver2 0 < foo.txt
871 by Martin Pool
- add command for merge-based weave
806
    added version 2
807
808
    % weave merge foo.weave 1 2 > foo.txt   (merge them)
809
    % vi foo.txt                            (resolve conflicts)
1084 by Martin Pool
- weave add command needs to take a symbolic name too
810
    % weave add foo.weave merged 1 2 < foo.txt     (commit merged version)     
871 by Martin Pool
- add command for merge-based weave
811
    
869 by Martin Pool
- more weave.py command line options
812
"""
0.1.88 by Martin Pool
Add weave info command.
813
    
814
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
815
816
def main(argv):
817
    import sys
818
    import os
869 by Martin Pool
- more weave.py command line options
819
    from weavefile import write_weave, read_weave
894 by Martin Pool
- small optimization for weave extract
820
    from bzrlib.progress import ProgressBar
821
1078 by Martin Pool
- use psyco for weave if possible
822
    try:
823
        import psyco
824
        psyco.full()
825
    except ImportError:
826
        pass
894 by Martin Pool
- small optimization for weave extract
827
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
828
    if len(argv) < 2:
829
        usage()
830
        return 0
831
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
832
    cmd = argv[1]
869 by Martin Pool
- more weave.py command line options
833
834
    def readit():
835
        return read_weave(file(argv[2], 'rb'))
836
    
837
    if cmd == 'help':
838
        usage()
839
    elif cmd == 'add':
840
        w = readit()
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
841
        # at the moment, based on everything in the file
1084 by Martin Pool
- weave add command needs to take a symbolic name too
842
        name = argv[3]
843
        parents = map(int, argv[4:])
0.1.72 by Martin Pool
Go back to weave lines normally having newlines at the end.
844
        lines = sys.stdin.readlines()
1084 by Martin Pool
- weave add command needs to take a symbolic name too
845
        ver = w.add(name, parents, lines)
869 by Martin Pool
- more weave.py command line options
846
        write_weave(w, file(argv[2], 'wb'))
1084 by Martin Pool
- weave add command needs to take a symbolic name too
847
        print 'added version %r %d' % (name, ver)
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
848
    elif cmd == 'init':
849
        fn = argv[2]
850
        if os.path.exists(fn):
851
            raise IOError("file exists")
852
        w = Weave()
869 by Martin Pool
- more weave.py command line options
853
        write_weave(w, file(fn, 'wb'))
854
    elif cmd == 'get': # get one version
855
        w = readit()
0.1.94 by Martin Pool
Fix get_iter call
856
        sys.stdout.writelines(w.get_iter(int(argv[3])))
869 by Martin Pool
- more weave.py command line options
857
        
858
    elif cmd == 'mash': # get composite
859
        w = readit()
860
        sys.stdout.writelines(w.mash_iter(map(int, argv[3:])))
861
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
862
    elif cmd == 'annotate':
869 by Martin Pool
- more weave.py command line options
863
        w = readit()
0.1.72 by Martin Pool
Go back to weave lines normally having newlines at the end.
864
        # newline is added to all lines regardless; too hard to get
865
        # reasonable formatting otherwise
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
866
        lasto = None
867
        for origin, text in w.annotate(int(argv[3])):
0.1.72 by Martin Pool
Go back to weave lines normally having newlines at the end.
868
            text = text.rstrip('\r\n')
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
869
            if origin == lasto:
870
                print '      | %s' % (text)
871
            else:
872
                print '%5d | %s' % (origin, text)
873
                lasto = origin
871 by Martin Pool
- add command for merge-based weave
874
                
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
875
    elif cmd == 'toc':
876
        weave_toc(readit())
947 by Martin Pool
- new 'weave stats' command
877
878
    elif cmd == 'stats':
879
        weave_stats(argv[2])
871 by Martin Pool
- add command for merge-based weave
880
        
0.1.91 by Martin Pool
Update Weave.check
881
    elif cmd == 'check':
869 by Martin Pool
- more weave.py command line options
882
        w = readit()
894 by Martin Pool
- small optimization for weave extract
883
        pb = ProgressBar()
884
        w.check(pb)
885
        pb.clear()
938 by Martin Pool
- various optimizations to weave add code
886
        print '%d versions ok' % w.numversions()
871 by Martin Pool
- add command for merge-based weave
887
892 by Martin Pool
- weave stores only direct parents, and calculates and memoizes expansion as needed
888
    elif cmd == 'inclusions':
889
        w = readit()
890
        print ' '.join(map(str, w.inclusions([int(argv[3])])))
891
892
    elif cmd == 'parents':
893
        w = readit()
944 by Martin Pool
- refactor member names in Weave code
894
        print ' '.join(map(str, w._parents[int(argv[3])]))
892 by Martin Pool
- weave stores only direct parents, and calculates and memoizes expansion as needed
895
918 by Martin Pool
- start doing new weave-merge algorithm
896
    elif cmd == 'plan-merge':
897
        w = readit()
898
        for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
919 by Martin Pool
- more development of weave-merge
899
            if line:
900
                print '%14s | %s' % (state, line),
918 by Martin Pool
- start doing new weave-merge algorithm
901
871 by Martin Pool
- add command for merge-based weave
902
    elif cmd == 'merge':
919 by Martin Pool
- more development of weave-merge
903
        w = readit()
904
        p = w.plan_merge(int(argv[3]), int(argv[4]))
905
        sys.stdout.writelines(w.weave_merge(p))
906
            
907
    elif cmd == 'mash-merge':
871 by Martin Pool
- add command for merge-based weave
908
        if len(argv) != 5:
909
            usage()
910
            return 1
911
912
        w = readit()
913
        v1, v2 = map(int, argv[3:5])
914
915
        basis = w.inclusions([v1]).intersection(w.inclusions([v2]))
916
917
        base_lines = list(w.mash_iter(basis))
918
        a_lines = list(w.get(v1))
919
        b_lines = list(w.get(v2))
920
921
        from bzrlib.merge3 import Merge3
922
        m3 = Merge3(base_lines, a_lines, b_lines)
923
924
        name_a = 'version %d' % v1
925
        name_b = 'version %d' % v2
926
        sys.stdout.writelines(m3.merge_lines(name_a=name_a, name_b=name_b))
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
927
    else:
928
        raise ValueError('unknown command %r' % cmd)
929
    
930
1076 by Martin Pool
- add code to run weave utility under profiler
931
932
def profile_main(argv): 
933
    import tempfile, hotshot, hotshot.stats
934
935
    prof_f = tempfile.NamedTemporaryFile()
936
937
    prof = hotshot.Profile(prof_f.name)
938
939
    ret = prof.runcall(main, argv)
940
    prof.close()
941
942
    stats = hotshot.stats.load(prof_f.name)
943
    #stats.strip_dirs()
1079 by Martin Pool
- weavefile can just use lists for read-in ancestry, not frozensets
944
    stats.sort_stats('cumulative')
1076 by Martin Pool
- add code to run weave utility under profiler
945
    ## XXX: Might like to write to stderr or the trace file instead but
946
    ## print_stats seems hardcoded to stdout
947
    stats.print_stats(20)
948
            
949
    return ret
950
951
0.1.62 by Martin Pool
Lame command-line client for reading and writing weaves.
952
if __name__ == '__main__':
953
    import sys
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
954
    if '--profile' in sys.argv:
1078 by Martin Pool
- use psyco for weave if possible
955
        args = sys.argv[:]
1081 by Martin Pool
- if weave tool is invoked with no arguments, show help
956
        args.remove('--profile')
1078 by Martin Pool
- use psyco for weave if possible
957
        sys.exit(profile_main(args))
958
    else:
959
        sys.exit(main(sys.argv))
1076 by Martin Pool
- add code to run weave utility under profiler
960