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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-30 19:32:13 UTC
  • mfrom: (6637 work)
  • mto: This revision was merged to the branch mainline in revision 6639.
  • Revision ID: jelmer@jelmer.uk-20170530193213-qm21s6dc7dln237t
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/dirstate.py
1953
1953
        lines = []
1954
1954
        lines.append(self._get_parents_line(self.get_parent_ids()))
1955
1955
        lines.append(self._get_ghosts_line(self._ghosts))
1956
 
        lines.extend(self._get_entry_lines())
 
1956
        lines.extend(self._iter_entry_lines())
1957
1957
        return self._get_output_lines(lines)
1958
1958
 
1959
1959
    def _get_ghosts_line(self, ghost_ids):
1964
1964
        """Create a line for the state file for parents information."""
1965
1965
        return '\0'.join([str(len(parent_ids))] + parent_ids)
1966
1966
 
1967
 
    def _get_entry_lines(self):
 
1967
    def _iter_entry_lines(self):
1968
1968
        """Create lines for entries."""
1969
1969
        return map(self._entry_to_line, self._iter_entries())
1970
1970
 
2703
2703
                            new_details.append(DirState.NULL_PARENT_DETAILS)
2704
2704
                        else:
2705
2705
                            # grab any one entry, use it to find the right path.
2706
 
                            a_key = iter(entry_keys).next()
 
2706
                            a_key = next(iter(entry_keys))
2707
2707
                            if by_path[a_key][lookup_index][0] in ('r', 'a'):
2708
2708
                                # its a pointer or missing statement, use it as
2709
2709
                                # is.
2783
2783
        # underlying dirstate.
2784
2784
        old_iterator = iter(list(self._iter_entries()))
2785
2785
        # both must have roots so this is safe:
2786
 
        current_new = new_iterator.next()
2787
 
        current_old = old_iterator.next()
 
2786
        current_new = next(new_iterator)
 
2787
        current_old = next(old_iterator)
2788
2788
        def advance(iterator):
2789
2789
            try:
2790
 
                return iterator.next()
 
2790
                return next(iterator)
2791
2791
            except StopIteration:
2792
2792
                return None
2793
2793
        while current_new or current_old:
3906
3906
            else:
3907
3907
                dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
3908
3908
                try:
3909
 
                    current_dir_info = dir_iterator.next()
 
3909
                    current_dir_info = next(dir_iterator)
3910
3910
                except OSError as e:
3911
3911
                    # on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
3912
3912
                    # python 2.5 has e.errno == EINVAL,
3982
3982
 
3983
3983
                        # This dir info has been handled, go to the next
3984
3984
                        try:
3985
 
                            current_dir_info = dir_iterator.next()
 
3985
                            current_dir_info = next(dir_iterator)
3986
3986
                        except StopIteration:
3987
3987
                            current_dir_info = None
3988
3988
                    else:
4134
4134
                        current_block = None
4135
4135
                if current_dir_info is not None:
4136
4136
                    try:
4137
 
                        current_dir_info = dir_iterator.next()
 
4137
                        current_dir_info = next(dir_iterator)
4138
4138
                    except StopIteration:
4139
4139
                        current_dir_info = None
4140
4140
        for result in self._iter_specific_file_parents():