/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/weave.py

  • Committer: Robert Collins
  • Date: 2009-05-23 20:57:12 UTC
  • mfrom: (4371 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4441.
  • Revision ID: robertc@robertcollins.net-20090523205712-lcwbfqk6vwavinuv
Merge .dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
14
14
#
15
15
# You should have received a copy of the GNU General Public License
16
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
 
17
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
18
 
19
19
# Author: Martin Pool <mbp@canonical.com>
20
20
 
410
410
        version_id
411
411
            Symbolic name for this version.
412
412
            (Typically the revision-id of the revision that added it.)
 
413
            If None, a name will be allocated based on the hash. (sha1:SHAHASH)
413
414
 
414
415
        parents
415
416
            List or set of direct parent version numbers.
425
426
            sha1 = sha_strings(lines)
426
427
        if sha1 == nostore_sha:
427
428
            raise errors.ExistingContent
 
429
        if version_id is None:
 
430
            version_id = "sha1:" + sha1
428
431
        if version_id in self._name_map:
429
432
            return self._check_repeated_add(version_id, parents, lines, sha1)
430
433
 
972
975
        super(WeaveFile, self).insert_record_stream(stream)
973
976
        self._save()
974
977
 
975
 
    @deprecated_method(one_five)
976
 
    def join(self, other, pb=None, msg=None, version_ids=None,
977
 
             ignore_missing=False):
978
 
        """Join other into self and save."""
979
 
        super(WeaveFile, self).join(other, pb, msg, version_ids, ignore_missing)
980
 
        self._save()
981
 
 
982
978
 
983
979
def _reweave(wa, wb, pb=None, msg=None):
984
980
    """Combine two weaves and return the result.