← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
1959
1959
                new_entry_key = (new_dirname, new_basename, new_id)
1960
1960
                current_new_minikind = \
1961
1961
                    DirState._kind_to_minikind[current_new[1].kind]
 
1962
                if current_new_minikind == 't':
 
1963
                    fingerprint = current_new[1].reference_revision
 
1964
                else:
 
1965
                    fingerprint = ''
1962
1966
            else:
1963
1967
                # for safety disable variables
1964
1968
                new_path_utf8 = new_dirname = new_basename = new_id = new_entry_key = None
1968
1972
                # old is finished: insert current_new into the state.
1969
1973
                self.update_minimal(new_entry_key, current_new_minikind,
1970
1974
                    executable=current_new[1].executable,
1971
 
                    path_utf8=new_path_utf8)
 
1975
                    path_utf8=new_path_utf8, fingerprint=fingerprint)
1972
1976
                current_new = advance(new_iterator)
1973
1977
            elif not current_new:
1974
1978
                # new is finished
1983
1987
                    current_old[1][0][0] != current_new_minikind):
1984
1988
                    self.update_minimal(current_old[0], current_new_minikind,
1985
1989
                        executable=current_new[1].executable,
1986
 
                        path_utf8=new_path_utf8)
 
1990
                        path_utf8=new_path_utf8, fingerprint=fingerprint)
1987
1991
                # both sides are dealt with, move on
1988
1992
                current_old = advance(old_iterator)
1989
1993
                current_new = advance(new_iterator)
1992
1996
                # add a entry for this and advance new
1993
1997
                self.update_minimal(new_entry_key, current_new_minikind,
1994
1998
                    executable=current_new[1].executable,
1995
 
                    path_utf8=new_path_utf8)
 
1999
                    path_utf8=new_path_utf8, fingerprint=fingerprint)
1996
2000
                current_new = advance(new_iterator)
1997
2001
            else:
1998
2002
                # old comes before: