This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5860

scmutil: delete now-unused origpath() (API)
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe944cf4ce1a8: scmutil: delete now-unused origpath() (API)
rHG9a2956af4495: scmutil: delete now-unused origpath() (API)
Summary

It has been replaced by backuppath().

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:52 PM
pulkit added a subscriber: pulkit.Feb 5 2019, 1:06 PM

This should be marked as API IIUC, right?

martinvonz added a comment.Feb 5 2019, 1:07 PM
In D5860#85771, @pulkit wrote:

This should be marked as API IIUC, right?

Yes, good point, I'll do that.

martinvonz retitled this revision from scmutil: delete now-unused origpath() to scmutil: delete now-unused origpath() (API).Feb 5 2019, 1:08 PM
martinvonz updated this revision to Diff 13865.Feb 6 2019, 6:59 PM
Closed by commit rHG9a2956af4495: scmutil: delete now-unused origpath() (API) (authored by martinvonz). · Explain WhyFeb 6 2019, 9:04 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (35 lines)

Diff 13882

mercurial/scmutil.py

if origvfs.isdir(filepath) and not origvfs.islink(filepath): if origvfs.isdir(filepath) and not origvfs.islink(filepath):
ui.note(_('removing conflicting directory: %s\n') ui.note(_('removing conflicting directory: %s\n')
% origvfs.join(filepath)) % origvfs.join(filepath))
origvfs.rmtree(filepath, forcibly=True) origvfs.rmtree(filepath, forcibly=True)
return origvfs.join(filepath) return origvfs.join(filepath)
def origpath(ui, repo, filepath):
'''customize where .orig files are created
Fetch user defined path from config file: [ui] origbackuppath = <path>
Fall back to default (filepath with .orig suffix) if not specified
'''
origvfs = getorigvfs(ui, repo)
if origvfs is None:
return filepath + ".orig"
# Convert filepath from an absolute path into a path inside the repo.
filepathfromroot = util.normpath(os.path.relpath(filepath,
start=repo.root))
origbackupdir = origvfs.dirname(filepathfromroot)
if not origvfs.isdir(origbackupdir) or origvfs.islink(origbackupdir):
ui.note(_('creating directory: %s\n') % origvfs.join(origbackupdir))
# Remove any files that conflict with the backup file's path
for f in reversed(list(util.finddirs(filepathfromroot))):
if origvfs.isfileorlink(f):
ui.note(_('removing conflicting file: %s\n')
% origvfs.join(f))
origvfs.unlink(f)
break
origvfs.makedirs(origbackupdir)
if origvfs.isdir(filepathfromroot) and not origvfs.islink(filepathfromroot):
ui.note(_('removing conflicting directory: %s\n')
% origvfs.join(filepathfromroot))
origvfs.rmtree(filepathfromroot, forcibly=True)
return origvfs.join(filepathfromroot)
class _containsnode(object): class _containsnode(object):
"""proxy __contains__(node) to container.__contains__ which accepts revs""" """proxy __contains__(node) to container.__contains__ which accepts revs"""
def __init__(self, repo, revcontainer): def __init__(self, repo, revcontainer):
self._torev = repo.changelog.rev self._torev = repo.changelog.rev
self._revcontains = revcontainer.__contains__ self._revcontains = revcontainer.__contains__
def __contains__(self, node): def __contains__(self, node):