equal
deleted
inserted
replaced
25 from .thirdparty import ( |
25 from .thirdparty import ( |
26 attr, |
26 attr, |
27 ) |
27 ) |
28 from . import ( |
28 from . import ( |
29 copies, |
29 copies, |
|
30 encoding, |
30 error, |
31 error, |
31 filemerge, |
32 filemerge, |
32 match as matchmod, |
33 match as matchmod, |
33 obsutil, |
34 obsutil, |
34 pycompat, |
35 pycompat, |
1434 |
1435 |
1435 return prunedactions, diverge, renamedelete |
1436 return prunedactions, diverge, renamedelete |
1436 |
1437 |
1437 def _getcwd(): |
1438 def _getcwd(): |
1438 try: |
1439 try: |
1439 return pycompat.getcwd() |
1440 return encoding.getcwd() |
1440 except OSError as err: |
1441 except OSError as err: |
1441 if err.errno == errno.ENOENT: |
1442 if err.errno == errno.ENOENT: |
1442 return None |
1443 return None |
1443 raise |
1444 raise |
1444 |
1445 |