Show More
@@ -603,7 +603,7 b' def overridecopy(orig, ui, repo, pats, o' | |||||
603 |
|
603 | |||
604 | def makestandin(relpath): |
|
604 | def makestandin(relpath): | |
605 | path = pathutil.canonpath(repo.root, repo.getcwd(), relpath) |
|
605 | path = pathutil.canonpath(repo.root, repo.getcwd(), relpath) | |
606 |
return o |
|
606 | return repo.wvfs.join(lfutil.standin(path)) | |
607 |
|
607 | |||
608 | fullpats = scmutil.expandpats(pats) |
|
608 | fullpats = scmutil.expandpats(pats) | |
609 | dest = fullpats[-1] |
|
609 | dest = fullpats[-1] | |
@@ -673,7 +673,7 b' def overridecopy(orig, ui, repo, pats, o' | |||||
673 | dest.startswith(repo.wjoin(lfutil.shortname))): |
|
673 | dest.startswith(repo.wjoin(lfutil.shortname))): | |
674 | srclfile = src.replace(repo.wjoin(lfutil.standin('')), '') |
|
674 | srclfile = src.replace(repo.wjoin(lfutil.standin('')), '') | |
675 | destlfile = dest.replace(repo.wjoin(lfutil.standin('')), '') |
|
675 | destlfile = dest.replace(repo.wjoin(lfutil.standin('')), '') | |
676 |
destlfiledir = o |
|
676 | destlfiledir = repo.wvfs.dirname(repo.wjoin(destlfile)) or '.' | |
677 | if not os.path.isdir(destlfiledir): |
|
677 | if not os.path.isdir(destlfiledir): | |
678 | os.makedirs(destlfiledir) |
|
678 | os.makedirs(destlfiledir) | |
679 | if rename: |
|
679 | if rename: | |
@@ -723,8 +723,8 b' def overriderevert(orig, ui, repo, ctx, ' | |||||
723 | for lfile in s.modified: |
|
723 | for lfile in s.modified: | |
724 | lfutil.updatestandin(repo, lfutil.standin(lfile)) |
|
724 | lfutil.updatestandin(repo, lfutil.standin(lfile)) | |
725 | for lfile in s.deleted: |
|
725 | for lfile in s.deleted: | |
726 |
if (o |
|
726 | if (repo.wvfs.exists(lfutil.standin(lfile))): | |
727 |
os.unlink |
|
727 | repo.wvfs.unlink(lfutil.standin(lfile)) | |
728 |
|
728 | |||
729 | oldstandins = lfutil.getstandinsstate(repo) |
|
729 | oldstandins = lfutil.getstandinsstate(repo) | |
730 |
|
730 | |||
@@ -1366,7 +1366,7 b' def mergeupdate(orig, repo, node, branch' | |||||
1366 | pctx = repo['.'] |
|
1366 | pctx = repo['.'] | |
1367 | for lfile in unsure + s.modified: |
|
1367 | for lfile in unsure + s.modified: | |
1368 | lfileabs = repo.wvfs.join(lfile) |
|
1368 | lfileabs = repo.wvfs.join(lfile) | |
1369 |
if not o |
|
1369 | if not repo.wvfs.exists(lfileabs): | |
1370 | continue |
|
1370 | continue | |
1371 | lfhash = lfutil.hashrepofile(repo, lfile) |
|
1371 | lfhash = lfutil.hashrepofile(repo, lfile) | |
1372 | standin = lfutil.standin(lfile) |
|
1372 | standin = lfutil.standin(lfile) |
General Comments 0
You need to be logged in to leave comments.
Login now