Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/localrepo.py @ 3687:d5dd0a2a44bc
Handle locking exceptions if streaming clone can't lock the repo. (Issue324)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 20 Nov 2006 19:41:49 +0100 |
parents | 975c2469c316 |
children | d92dad355000 |
comparison
equal
deleted
inserted
replaced
3686:4308f4cdc07b | 3687:d5dd0a2a44bc |
---|---|
1823 try: | 1823 try: |
1824 resp = int(l) | 1824 resp = int(l) |
1825 except ValueError: | 1825 except ValueError: |
1826 raise util.UnexpectedOutput( | 1826 raise util.UnexpectedOutput( |
1827 _('Unexpected response from remote server:'), l) | 1827 _('Unexpected response from remote server:'), l) |
1828 if resp != 0: | 1828 if resp == 1: |
1829 raise util.Abort(_('operation forbidden by server')) | 1829 raise util.Abort(_('operation forbidden by server')) |
1830 elif resp == 2: | |
1831 raise util.Abort(_('locking the remote repository failed')) | |
1832 elif resp != 0: | |
1833 raise util.Abort(_('the server sent an unknown error code')) | |
1830 self.ui.status(_('streaming all changes\n')) | 1834 self.ui.status(_('streaming all changes\n')) |
1831 l = fp.readline() | 1835 l = fp.readline() |
1832 try: | 1836 try: |
1833 total_files, total_bytes = map(int, l.split(' ', 1)) | 1837 total_files, total_bytes = map(int, l.split(' ', 1)) |
1834 except ValueError, TypeError: | 1838 except ValueError, TypeError: |