/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 breezy/shelf.py

  • Committer: Jelmer Vernooij
  • Date: 2019-03-04 05:10:44 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7294.
  • Revision ID: jelmer@jelmer.uk-20190304051044-vph4s8p9qvpy2qe9
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/shelf.py
109
109
            # Also don't shelve deletion of tree root.
110
110
            if kind[1] is None and names[0] == '':
111
111
                continue
112
 
            if kind[0] is None or versioned[0] == False:
 
112
            if kind[0] is None or versioned[0] is False:
113
113
                self.creation[file_id] = (kind[1], names[1], parents[1],
114
114
                                          versioned)
115
115
                yield ('add file', file_id, kind[1], paths[1])
116
 
            elif kind[1] is None or versioned[0] == False:
 
116
            elif kind[1] is None or versioned[0] is False:
117
117
                self.deletion[file_id] = (kind[0], names[0], parents[0],
118
118
                                          versioned)
119
119
                yield ('delete file', file_id, kind[0], paths[0])
150
150
    def shelve_all(self):
151
151
        """Shelve all changes.
152
152
 
153
 
        :return: True if changes were shelved, False if there were no changes.
 
153
        :return: ``True`` if changes were shelved, otherwise ``False``.
154
154
        """
155
155
        change = None
156
156
        for change in self.iter_shelvable():