← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf.py

  • Committer: Andrew Bennetts
  • Date: 2010-03-11 04:33:41 UTC
  • mfrom: (4797.33.4 2.1)
  • mto: This revision was merged to the branch mainline in revision 5082.
  • Revision ID: andrew.bennetts@canonical.com-20100311043341-rzdik83fnactjsxs
Merge lp:bzr/2.1, including fixes for #496813, #526211, #526353.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008 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
18
18
import errno
19
19
import re
20
20
 
21
 
from bzrlib.lazy_import import lazy_import
22
 
lazy_import(globals(), """
23
21
from bzrlib import (
24
22
    bencode,
25
23
    errors,
26
24
    merge,
27
25
    merge3,
 
26
    osutils,
28
27
    pack,
29
28
    transform,
 
29
    ui,
 
30
    workingtree,
30
31
)
31
 
""")
32
32
 
33
33
 
34
34
class ShelfCreator(object):
65
65
        """Iterable of tuples describing shelvable changes.
66
66
 
67
67
        As well as generating the tuples, this updates several members.
68
 
        Tuples may be::
69
 
 
 
68
        Tuples may be:
70
69
           ('add file', file_id, work_kind, work_path)
71
70
           ('delete file', file_id, target_kind, target_path)
72
71
           ('rename', file_id, target_path, work_path)