This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1311

scmutil: don't try to delete origbackup symlinks to directories (issue5731)
ClosedPublic

Authored by mbthomas on Nov 3 2017, 12:25 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG99ab7bc944d2: scmutil: don't try to delete origbackup symlinks to directories (issue5731)
Summary

When origbackuppath is set, when looking to see if a file we are backing up
conflicts with a directory in the origbackuppath, we incorrectly match on
symlinks to directories. This means we try to call vfs.rmtree on the
symlink, which fails.

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

mbthomas created this revision.Nov 3 2017, 12:25 PM
mbthomas updated this revision to Diff 3265.Nov 3 2017, 12:27 PM
yuja accepted this revision.Nov 9 2017, 8:17 AM
yuja added a subscriber: yuja.

Queued for stable, thanks.

This revision is now accepted and ready to land.Nov 9 2017, 8:17 AM
Closed by commit rHG99ab7bc944d2: scmutil: don't try to delete origbackup symlinks to directories (issue5731) (authored by mbthomas). · Explain WhyNov 9 2017, 8:32 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (2 lines)
Mtests/test-origbackup-conflict.t (10 lines)

Diff 3370

mercurial/scmutil.py

if origvfs.isfileorlink(f): if origvfs.isfileorlink(f):
ui.note(_('removing conflicting file: %s\n') ui.note(_('removing conflicting file: %s\n')
% origvfs.join(f)) % origvfs.join(f))
origvfs.unlink(f) origvfs.unlink(f)
break break
origvfs.makedirs(origbackupdir) origvfs.makedirs(origbackupdir)
if origvfs.isdir(filepathfromroot): if origvfs.isdir(filepathfromroot) and not origvfs.islink(filepathfromroot):
ui.note(_('removing conflicting directory: %s\n') ui.note(_('removing conflicting directory: %s\n')
% origvfs.join(filepathfromroot)) % origvfs.join(filepathfromroot))
origvfs.rmtree(filepathfromroot, forcibly=True) origvfs.rmtree(filepathfromroot, forcibly=True)
return origvfs.join(filepathfromroot) 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"""

tests/test-origbackup-conflict.t

$ hg up --verbose c1 $ hg up --verbose c1
resolving manifests resolving manifests
b/c: replacing untracked file b/c: replacing untracked file
d: replacing untracked file d: replacing untracked file
getting b/c getting b/c
creating directory: $TESTTMP/repo/.hg/origbackups/b (glob) creating directory: $TESTTMP/repo/.hg/origbackups/b (glob)
removing conflicting file: $TESTTMP/repo/.hg/origbackups/b (glob) removing conflicting file: $TESTTMP/repo/.hg/origbackups/b (glob)
getting d getting d
removing conflicting directory: $TESTTMP/repo/.hg/origbackups/d (glob)
abort: None
[255]
Workaround issue by deleting d:
$ rm d
$ hg up c1
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark c1) (activating bookmark c1)
$ cat .hg/origbackups/b/c $ cat .hg/origbackups/b/c
c4 c4
$ cat .hg/origbackups/d
d3
$ ls ../sym-link-target $ ls ../sym-link-target
Incorrectly configure origbackuppath to be under a file Incorrectly configure origbackuppath to be under a file
$ echo data > .hg/badorigbackups $ echo data > .hg/badorigbackups
$ hg up -q 0 $ hg up -q 0
$ mkdir b $ mkdir b
$ echo c5 > b/c $ echo c5 > b/c