Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmdutil.py @ 30620:bb77654dc7ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: replace os.sep with pycompat.ossep (part 3 of 4)
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 17 Dec 2016 20:14:24 +0530
parents c01033fb9864
children 5289fd78017a
comparison
equal deleted inserted replaced
30619:cfe66dcf45c0 30620:bb77654dc7ae
729 if destdirexists: 729 if destdirexists:
730 striplen = len(os.path.split(abspfx)[0]) 730 striplen = len(os.path.split(abspfx)[0])
731 else: 731 else:
732 striplen = len(abspfx) 732 striplen = len(abspfx)
733 if striplen: 733 if striplen:
734 striplen += len(os.sep) 734 striplen += len(pycompat.ossep)
735 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:]) 735 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
736 elif destdirexists: 736 elif destdirexists:
737 res = lambda p: os.path.join(dest, 737 res = lambda p: os.path.join(dest,
738 os.path.basename(util.localpath(p))) 738 os.path.basename(util.localpath(p)))
739 else: 739 else:
763 return score 763 return score
764 764
765 abspfx = util.localpath(abspfx) 765 abspfx = util.localpath(abspfx)
766 striplen = len(abspfx) 766 striplen = len(abspfx)
767 if striplen: 767 if striplen:
768 striplen += len(os.sep) 768 striplen += len(pycompat.ossep)
769 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])): 769 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
770 score = evalpath(striplen) 770 score = evalpath(striplen)
771 striplen1 = len(os.path.split(abspfx)[0]) 771 striplen1 = len(os.path.split(abspfx)[0])
772 if striplen1: 772 if striplen1:
773 striplen1 += len(os.sep) 773 striplen1 += len(pycompat.ossep)
774 if evalpath(striplen1) > score: 774 if evalpath(striplen1) > score:
775 striplen = striplen1 775 striplen = striplen1
776 res = lambda p: os.path.join(dest, 776 res = lambda p: os.path.join(dest,
777 util.localpath(p)[striplen:]) 777 util.localpath(p)[striplen:])
778 else: 778 else: