/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Vincent Ladeuil
  • Date: 2009-07-15 07:32:26 UTC
  • mfrom: (4536 +trunk)
  • mto: (4536.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4537.
  • Revision ID: v.ladeuil+lp@free.fr-20090715073226-a7ylxd6ctbzeu0o6
Merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1
 
# Copyright (C) 2006, 2007, 2008 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
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
1962
1962
            return old_annotation
1963
1963
        if not changed_content:
1964
1964
            return old_annotation
 
1965
        # TODO: This is doing something similar to what WT.annotate_iter is
 
1966
        #       doing, however it fails slightly because it doesn't know what
 
1967
        #       the *other* revision_id is, so it doesn't know how to give the
 
1968
        #       other as the origin for some lines, they all get
 
1969
        #       'default_revision'
 
1970
        #       It would be nice to be able to use the new Annotator based
 
1971
        #       approach, as well.
1965
1972
        return annotate.reannotate([old_annotation],
1966
1973
                                   self.get_file(file_id).readlines(),
1967
1974
                                   default_revision)