# HG changeset patch # User Pierre-Yves David # Date 2017-03-09 00:53:09 # Node ID 1b0db28dadf1cdc5f2a362fe142ac90374e8c9b4 # Parent 42a7195541a1f7e1288abc24806d0b6c76b262fc cmdutil: directly use repo.vfs.join The 'repo.join' method is about to be deprecated. diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -201,7 +201,7 @@ def dorecord(ui, repo, commitfunc, cmdsu newlyaddedandmodifiedfiles] backups = {} if tobackup: - backupdir = repo.join('record-backups') + backupdir = repo.vfs.join('record-backups') try: os.mkdir(backupdir) except OSError as err: @@ -3412,7 +3412,7 @@ def clearunfinished(repo): raise error.Abort(msg, hint=hint) for f, clearable, allowcommit, msg, hint in unfinishedstates: if clearable and repo.vfs.exists(f): - util.unlink(repo.join(f)) + util.unlink(repo.vfs.join(f)) afterresolvedstates = [ ('graftstate',