equal
deleted
inserted
replaced
1311 except OSError as e: |
1311 except OSError as e: |
1312 genericerror = _("error executing git for subrepo '%s': %s") |
1312 genericerror = _("error executing git for subrepo '%s': %s") |
1313 notfoundhint = _("check git is installed and in your PATH") |
1313 notfoundhint = _("check git is installed and in your PATH") |
1314 if e.errno != errno.ENOENT: |
1314 if e.errno != errno.ENOENT: |
1315 raise error.Abort(genericerror % (self._path, e.strerror)) |
1315 raise error.Abort(genericerror % (self._path, e.strerror)) |
1316 elif os.name == 'nt': |
1316 elif pycompat.osname == 'nt': |
1317 try: |
1317 try: |
1318 self._gitexecutable = 'git.cmd' |
1318 self._gitexecutable = 'git.cmd' |
1319 out, err = self._gitnodir(['--version']) |
1319 out, err = self._gitnodir(['--version']) |
1320 except OSError as e2: |
1320 except OSError as e2: |
1321 if e2.errno == errno.ENOENT: |
1321 if e2.errno == errno.ENOENT: |