/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: Breezy landing bot
  • Author(s): Martin
  • Date: 2017-06-11 01:56:34 UTC
  • mfrom: (6684.1.5 py3_bootstrap2)
  • Revision ID: breezy.the.bot@gmail.com-20170611015634-9eeh86thh073hcko
More progress towards Python 3 support

Merged from https://code.launchpad.net/~gz/brz/py3_bootstrap2/+merge/325452

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/dirstate.py
3541
3541
            source_details = DirState.NULL_PARENT_DETAILS
3542
3542
        else:
3543
3543
            source_details = entry[1][self.source_index]
 
3544
        # GZ 2017-06-09: Eck, more sets.
 
3545
        _fdltr = {b'f', b'd', b'l', b't', b'r'}
 
3546
        _fdlt = {b'f', b'd', b'l', b't'}
 
3547
        _ra = (b'r', b'a')
3544
3548
        target_details = entry[1][self.target_index]
3545
3549
        target_minikind = target_details[0]
3546
 
        if path_info is not None and target_minikind in 'fdlt':
 
3550
        if path_info is not None and target_minikind in _fdlt:
3547
3551
            if not (self.target_index == 0):
3548
3552
                raise AssertionError()
3549
3553
            link_or_sha1 = update_entry(self.state, entry,
3555
3559
            link_or_sha1 = None
3556
3560
        file_id = entry[0][2]
3557
3561
        source_minikind = source_details[0]
3558
 
        # GZ 2017-06-09: Eck, more sets.
3559
 
        _fdltr = {b'f', b'd', b'l', b't', b'r'}
3560
 
        _fdlt = {b'f', b'd', b'l', b't'}
3561
 
        _ra = (b'r', b'a')
3562
3562
        if source_minikind in _fdltr and target_minikind in _fdlt:
3563
3563
            # claimed content in both: diff
3564
3564
            #   r    | fdlt   |      | add source to search, add id path move and perform