← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

2-parent case working.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
125
125
                    s = os.readlink(abspath)
126
126
 
127
127
                parent_info = []
128
 
                if num_parents >= 1:
129
 
                    parent_entry = parent_trees[0].inventory[fileid]
 
128
                for count in xrange(num_parents):
 
129
                    parent_entry = parent_trees[count].inventory[fileid]
130
130
                    parent_info.append(
131
131
                        '\0'.join((
132
132
                            parent_entry.revision,
137
137
                            to_yesno[parent_entry.executable],
138
138
                            parent_entry.text_sha1,
139
139
                            )))
140
 
                if num_parents >= 2:
141
 
                    parent_info.append(
142
 
                        '\0'.join((
143
 
                            parent_ids[0]
144
 
                            , to_minikind[kind]
145
 
                            , dirname, basename
146
 
                            , str(st.st_size)
147
 
                            , 'n' # Not executable
148
 
                            , s
149
 
                            )))
150
 
                for count in xrange(2,num_parents):
151
 
                    parent_info.append(null_parent_info)
152
140
                lines.append('\0'.join([
153
141
                    dirname, basename
154
142
                    , to_minikind[kind]