mercurial/merge.py
changeset 49306 2e726c934fcd
parent 48946 642e31cb55f0
child 49365 79b2c98ab7b4
equal deleted inserted replaced
49305:53e9422a9b45 49306:2e726c934fcd
     5 # This software may be used and distributed according to the terms of the
     5 # This software may be used and distributed according to the terms of the
     6 # GNU General Public License version 2 or any later version.
     6 # GNU General Public License version 2 or any later version.
     7 
     7 
     8 
     8 
     9 import collections
     9 import collections
    10 import errno
       
    11 import struct
    10 import struct
    12 
    11 
    13 from .i18n import _
    12 from .i18n import _
    14 from .node import nullrev
    13 from .node import nullrev
    15 from .thirdparty import attr
    14 from .thirdparty import attr
  1304 
  1303 
  1305 
  1304 
  1306 def _getcwd():
  1305 def _getcwd():
  1307     try:
  1306     try:
  1308         return encoding.getcwd()
  1307         return encoding.getcwd()
  1309     except OSError as err:
  1308     except FileNotFoundError:
  1310         if err.errno == errno.ENOENT:
  1309         return None
  1311             return None
       
  1312         raise
       
  1313 
  1310 
  1314 
  1311 
  1315 def batchremove(repo, wctx, actions):
  1312 def batchremove(repo, wctx, actions):
  1316     """apply removes to the working directory
  1313     """apply removes to the working directory
  1317 
  1314