| durin42 | |
| martinvonz | |
| Alphare |
| hg-reviewers |
Even if the parents does not changes, the parents' content we consider is
changed. So this seems legitimate.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/narrow/narrowcommands.py (11 lines) |
| repo.setnarrowpats(newincludes, newexcludes) | repo.setnarrowpats(newincludes, newexcludes) | ||||
| for f in todelete: | for f in todelete: | ||||
| ui.status(_(b'deleting %s\n') % f) | ui.status(_(b'deleting %s\n') % f) | ||||
| util.unlinkpath(repo.svfs.join(f)) | util.unlinkpath(repo.svfs.join(f)) | ||||
| repo.store.markremoved(f) | repo.store.markremoved(f) | ||||
| ui.status(_(b'deleting unwanted files from working copy\n')) | ui.status(_(b'deleting unwanted files from working copy\n')) | ||||
| with repo.dirstate.parentchange(): | |||||
| narrowspec.updateworkingcopy(repo, assumeclean=True) | narrowspec.updateworkingcopy(repo, assumeclean=True) | ||||
| narrowspec.copytoworkingcopy(repo) | narrowspec.copytoworkingcopy(repo) | ||||
| repo.destroyed() | repo.destroyed() | ||||
| def _widen( | def _widen( | ||||
| ui, | ui, | ||||
| repo, | repo, | ||||
| remote, | remote, | ||||
| ) | ) | ||||
| # TODO: we should catch error.Abort here | # TODO: we should catch error.Abort here | ||||
| bundle2.processbundle(repo, bundle, op=op) | bundle2.processbundle(repo, bundle, op=op) | ||||
| if ellipsesremote: | if ellipsesremote: | ||||
| with ds.parentchange(): | with ds.parentchange(): | ||||
| ds.setparents(p1, p2) | ds.setparents(p1, p2) | ||||
| with repo.transaction(b'widening'): | with repo.transaction(b'widening'), repo.dirstate.parentchange(): | ||||
| repo.setnewnarrowpats() | repo.setnewnarrowpats() | ||||
| narrowspec.updateworkingcopy(repo) | narrowspec.updateworkingcopy(repo) | ||||
| narrowspec.copytoworkingcopy(repo) | narrowspec.copytoworkingcopy(repo) | ||||
| # TODO(rdamazio): Make new matcher format and update description | # TODO(rdamazio): Make new matcher format and update description | ||||
| @command( | @command( | ||||
| b'tracked', | b'tracked', | ||||
| for i in sorted(oldexcludes): | for i in sorted(oldexcludes): | ||||
| fm.startitem() | fm.startitem() | ||||
| fm.write(b'status', b'%s ', b'X', label=b'narrow.excluded') | fm.write(b'status', b'%s ', b'X', label=b'narrow.excluded') | ||||
| fm.write(b'pat', b'%s\n', i, label=b'narrow.excluded') | fm.write(b'pat', b'%s\n', i, label=b'narrow.excluded') | ||||
| fm.end() | fm.end() | ||||
| return 0 | return 0 | ||||
| if update_working_copy: | if update_working_copy: | ||||
| with repo.wlock(), repo.lock(), repo.transaction(b'narrow-wc'): | with repo.wlock(), repo.lock(), repo.transaction( | ||||
| b'narrow-wc' | |||||
| ), repo.dirstate.parentchange(): | |||||
| narrowspec.updateworkingcopy(repo) | narrowspec.updateworkingcopy(repo) | ||||
| narrowspec.copytoworkingcopy(repo) | narrowspec.copytoworkingcopy(repo) | ||||
| return 0 | return 0 | ||||
| if not (widening or narrowing or autoremoveincludes): | if not (widening or narrowing or autoremoveincludes): | ||||
| ui.status(_(b"nothing to widen or narrow\n")) | ui.status(_(b"nothing to widen or narrow\n")) | ||||
| return 0 | return 0 | ||||