← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-03-22 12:17:00 UTC
  • mfrom: (1616.1.10 bzr.mbp.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060322121700-79ce0be81013aba1
(mbp) pycurl fixes, other fixes, weave commands, verbose commit changes from robert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
863
863
 
864
864
    def check(self, progress_bar=None):
865
865
        # TODO evaluate performance hit of using string sets in this routine.
866
 
        # check no circular inclusions
 
866
        # TODO: check no circular inclusions
 
867
        # TODO: create a nested progress bar
867
868
        for version in range(self.num_versions()):
868
869
            inclusions = list(self._parents[version])
869
870
            if inclusions:
1366
1367
        w = readit()
1367
1368
        p = w.plan_merge(int(argv[3]), int(argv[4]))
1368
1369
        sys.stdout.writelines(w.weave_merge(p))
1369
 
            
1370
1370
    else:
1371
1371
        raise ValueError('unknown command %r' % cmd)
1372
1372
    
1373
1373
 
1374
1374
 
1375
 
def profile_main(argv): 
 
1375
def profile_main(argv):
1376
1376
    import tempfile, hotshot, hotshot.stats
1377
1377
 
1378
1378
    prof_f = tempfile.NamedTemporaryFile()