comparison mercurial/copies.py @ 43117:8ff1ecfadcd1

cleanup: join string literals that are already on one line Thanks to Kyle for noticing this and for providing the regular expression to run on the codebase. This patch has been reviewed by the test suite and they approved of it. # skip-blame: fallout from mass reformatting Differential Revision: https://phab.mercurial-scm.org/D7028
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 08 Oct 2019 15:06:18 -0700
parents d783f945a701
children 0171483b082f
comparison
equal deleted inserted replaced
43116:defabf63e969 43117:8ff1ecfadcd1
675 # new file added in a directory that was moved, move it 675 # new file added in a directory that was moved, move it
676 df = dirmove[d] + f[len(d) :] 676 df = dirmove[d] + f[len(d) :]
677 if df not in copy: 677 if df not in copy:
678 movewithdir[f] = df 678 movewithdir[f] = df
679 repo.ui.debug( 679 repo.ui.debug(
680 (b" pending file src: '%s' -> " b"dst: '%s'\n") 680 b" pending file src: '%s' -> dst: '%s'\n"
681 % (f, df) 681 % (f, df)
682 ) 682 )
683 break 683 break
684 684
685 return copy, movewithdir, diverge, renamedelete, dirmove 685 return copy, movewithdir, diverge, renamedelete, dirmove