view mercurial/mergeutil.py @ 35510:2062f7c2ac83

win32: implement util.getfstype()

This will allow NTFS to be added to the hardlink whitelist, and resume creating
hardlinks in transactions (which was disabled globally in 07a92bbd02e5; see also
e5ce49a30146).  I opted to report "cifs" for remote volumes because this shows
in `hg debugfs`, which also reports that hardlinks are supported for these
volumes.  So being able to distinguish it from "unknown" seems useful.

The documentation [1] seems to indicate that SMB isn't supported by these
functions, but experimenting shows that mapped drives are reported as "NTFS" on
Windows 7.  I don't have a second Windows machine, but instead shared a temp
directory on C:\.  In this setup, both of the following were detected as 'cifs'
with the explicit GetDriveType() check:

  Z:\repo>hg ci -A

  C:\>hg -R \\hostname\temp\repo ci -A   # (without Z:\ being mapped)

It looks like this is called 6 times to add and commit a single new file, so I'm
a little surprised this isn't cached.

[1] https://msdn.microsoft.com/en-us/library/windows/desktop/aa364993(v=vs.85).aspx

# mergeutil.py - help for merge processing in mercurial
#
# Copyright 2005-2007 Matt Mackall <[e-mail]>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

from __future__ import absolute_import

from .i18n import _

from . import (
    error,
)

def checkunresolved(ms):
    if list(ms.unresolved()):
        raise error.Abort(_("unresolved merge conflicts "
                            "(see 'hg help resolve')"))
    if ms.mdstate() != 's' or list(ms.driverresolved()):
        raise error.Abort(_('driver-resolved merge conflicts'),
                          hint=_('run "hg resolve --all" to resolve'))