Mercurial > public > mercurial-scm > hg-stable
diff mercurial/scmutil.py @ 43677:0b7733719d21
utils: move finddirs() to pathutil
This is a follow-up to c21aca51b392 (utils: move the `dirs` definition
in pathutil (API), 2019-11-06). finddirs() is closely related to dirs
and used by it.
Differential Revision: https://phab.mercurial-scm.org/D7388
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 14 Nov 2019 08:03:26 -0800 |
| parents | 9f70512ae2cf |
| children | c5548b0b6847 |
line wrap: on
line diff
--- a/mercurial/scmutil.py Wed Nov 13 21:52:25 2019 -0500 +++ b/mercurial/scmutil.py Thu Nov 14 08:03:26 2019 -0800 @@ -964,7 +964,7 @@ ui.note(_(b'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(filepath))): + for f in reversed(list(pathutil.finddirs(filepath))): if origvfs.isfileorlink(f): ui.note(_(b'removing conflicting file: %s\n') % origvfs.join(f)) origvfs.unlink(f)