This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5849

merge: don't unnecessarily calculate absolute path
ClosedPublic

Authored by martinvonz on Feb 5 2019, 12:26 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1f2714052d7e: merge: don't unnecessarily calculate absolute path
Summary

I think this also makes the code clearer (and prepares for a later
patch that replaces origpath()).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Feb 5 2019, 12:26 PM
pulkit accepted this revision.Feb 5 2019, 12:39 PM
pulkit added a subscriber: pulkit.

I think this also makes the code clearer (and prepares for the next
patch).

I don't see a next patch.

martinvonz added a comment.Feb 5 2019, 12:40 PM
In D5849#85665, @pulkit wrote:

I think this also makes the code clearer (and prepares for the next
patch).

I don't see a next patch.

Oops, true. I'll rephase to be more vague :)

martinvonz edited the summary of this revision. (Show Details)Feb 5 2019, 12:41 PM
Closed by commit rHG1f2714052d7e: merge: don't unnecessarily calculate absolute path (authored by martinvonz). · Explain WhyFeb 5 2019, 1:13 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (7 lines)

Diff 13827

mercurial/merge.py

repo.ui.debug(" %s: %s -> g\n" % (f, msg)) repo.ui.debug(" %s: %s -> g\n" % (f, msg))
if verbose: if verbose:
repo.ui.note(_("getting %s\n") % f) repo.ui.note(_("getting %s\n") % f)
if backup: if backup:
# If a file or directory exists with the same name, back that # If a file or directory exists with the same name, back that
# up. Otherwise, look to see if there is a file that conflicts # up. Otherwise, look to see if there is a file that conflicts
# with a directory this file is in, and if so, back that up. # with a directory this file is in, and if so, back that up.
absf = repo.wjoin(f) conflicting = f
if not repo.wvfs.lexists(f): if not repo.wvfs.lexists(f):
for p in util.finddirs(f): for p in util.finddirs(f):
if repo.wvfs.isfileorlink(p): if repo.wvfs.isfileorlink(p):
absf = repo.wjoin(p) conflicting = p
break break
if repo.wvfs.lexists(absf): if repo.wvfs.lexists(conflicting):
absf = repo.wjoin(conflicting)
orig = scmutil.origpath(ui, repo, absf) orig = scmutil.origpath(ui, repo, absf)
util.rename(absf, orig) util.rename(absf, orig)
wctx[f].clearunknown() wctx[f].clearunknown()
atomictemp = ui.configbool("experimental", "update.atomic-file") atomictemp = ui.configbool("experimental", "update.atomic-file")
wctx[f].write(fctx(f).data(), flags, backgroundclose=True, wctx[f].write(fctx(f).data(), flags, backgroundclose=True,
atomictemp=atomictemp) atomictemp=atomictemp)
if i == 100: if i == 100:
yield i, f yield i, f