equal
deleted
inserted
replaced
163 b'allow_dirty_working_copy' |
163 b'allow_dirty_working_copy' |
164 ] or repo.ui.configbool(b'experimental', b'uncommitondirtywdir') |
164 ] or repo.ui.configbool(b'experimental', b'uncommitondirtywdir') |
165 if not allowdirtywcopy and (not pats or isdirtypath): |
165 if not allowdirtywcopy and (not pats or isdirtypath): |
166 cmdutil.bailifchanged( |
166 cmdutil.bailifchanged( |
167 repo, |
167 repo, |
168 hint=_(b'requires ' b'--allow-dirty-working-copy to uncommit'), |
168 hint=_(b'requires --allow-dirty-working-copy to uncommit'), |
169 ) |
169 ) |
170 old = repo[b'.'] |
170 old = repo[b'.'] |
171 rewriteutil.precheck(repo, [old.rev()], b'uncommit') |
171 rewriteutil.precheck(repo, [old.rev()], b'uncommit') |
172 if len(old.parents()) > 1: |
172 if len(old.parents()) > 1: |
173 raise error.Abort(_(b"cannot uncommit merge changeset")) |
173 raise error.Abort(_(b"cannot uncommit merge changeset")) |
188 badfiles -= {f for f in util.dirs(eligible)} |
188 badfiles -= {f for f in util.dirs(eligible)} |
189 |
189 |
190 for f in sorted(badfiles): |
190 for f in sorted(badfiles): |
191 if f in s.clean: |
191 if f in s.clean: |
192 hint = _( |
192 hint = _( |
193 b"file was not changed in working directory " b"parent" |
193 b"file was not changed in working directory parent" |
194 ) |
194 ) |
195 elif repo.wvfs.exists(f): |
195 elif repo.wvfs.exists(f): |
196 hint = _(b"file was untracked in working directory parent") |
196 hint = _(b"file was untracked in working directory parent") |
197 else: |
197 else: |
198 hint = _(b"file does not exist") |
198 hint = _(b"file does not exist") |