equal
deleted
inserted
replaced
118 source = opts['source'] |
118 source = opts['source'] |
119 if not rev: |
119 if not rev: |
120 raise error.InputError(_(b'specify a target revision with --rev')) |
120 raise error.InputError(_(b'specify a target revision with --rev')) |
121 if not source: |
121 if not source: |
122 raise error.InputError(_(b'specify a pull path with --source')) |
122 raise error.InputError(_(b'specify a pull path with --source')) |
123 ui.status(_(b'breaking locks, if any\n')) |
123 if repo.svfs.tryunlink(b'lock'): |
124 repo.svfs.tryunlink(b'lock') |
124 ui.status(_(b'had to break store lock\n')) |
125 repo.vfs.tryunlink(b'wlock') |
125 if repo.vfs.tryunlink(b'wlock'): |
|
126 ui.status(_(b'had to break working copy lock\n')) |
126 |
127 |
127 ui.status(_(b'recovering after interrupted transaction, if any\n')) |
128 ui.status(_(b'recovering after interrupted transaction, if any\n')) |
128 repo.recover() |
129 repo.recover() |
129 |
130 |
130 ui.status(_(b'pulling from %s\n') % source) |
131 ui.status(_(b'pulling from %s\n') % source) |