| hg-reviewers |
Display the same message we added recently to the filtered error message when
try to do a write operation to a hidden obsolete changeset.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/scmutil.py (16 lines) | |||
| M | tests/test-directaccess.t (5 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Abandoned | lothiraldan | ||
| Abandoned | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan |
| revs = _getrevsfromsymbols(repo, symbols) | revs = _getrevsfromsymbols(repo, symbols) | ||||
| if not revs: | if not revs: | ||||
| return repo | return repo | ||||
| if hiddentype == 'warn': | if hiddentype == 'warn': | ||||
| unfi = repo.unfiltered() | unfi = repo.unfiltered() | ||||
| revstr = ", ".join([pycompat.bytestr(unfi[l]) for l in revs]) | |||||
| revstr = [] | |||||
| obsfatemsgs = [] | |||||
| for revision in revs: | |||||
| ctx = unfi[revision] | |||||
| revstring = pycompat.bytestr(ctx) | |||||
| revstr.append(revstring) | |||||
| obsfatemsgs.append(obsutil._getfilteredreason(repo, revstring, ctx)) | |||||
| repo.ui.warn(_("warning: accessing hidden changesets for write " | repo.ui.warn(_("warning: accessing hidden changesets for write " | ||||
| "operation: %s\n") % revstr) | "operation: %s\n") % ", ".join(revstr)) | ||||
| for obsfatemsg in obsfatemsgs: | |||||
| repo.ui.warn(obsfatemsg + "\n") | |||||
| # we have to use new filtername to separate branch/tags cache until we can | # we have to use new filtername to separate branch/tags cache until we can | ||||
| # disbale these cache when revisions are dynamically pinned. | # disbale these cache when revisions are dynamically pinned. | ||||
| return repo.filtered('visible-hidden', revs) | return repo.filtered('visible-hidden', revs) | ||||
| def _getrevsfromsymbols(repo, symbols): | def _getrevsfromsymbols(repo, symbols): | ||||
| """parse the list of symbols and returns a set of revision numbers of hidden | """parse the list of symbols and returns a set of revision numbers of hidden | ||||
| changesets present in symbols""" | changesets present in symbols""" | ||||
| o changeset: 0:18d04c59bb5d | o changeset: 0:18d04c59bb5d | ||||
| user: test | user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: Added a | summary: Added a | ||||
| $ hg writedirectaccess -r 28ad74 | $ hg writedirectaccess -r 28ad74 | ||||
| warning: accessing hidden changesets for write operation: 28ad74487de9 | warning: accessing hidden changesets for write operation: 28ad74487de9 | ||||
| hidden revision '28ad74487de9' was rewritten as: d716de383093 | |||||
| RANGE [2] | RANGE [2] | ||||
| $ hg writedirectaccess -r 2443a0 | $ hg writedirectaccess -r 2443a0 | ||||
| warning: accessing hidden changesets for write operation: 2443a0e66469 | warning: accessing hidden changesets for write operation: 2443a0e66469 | ||||
| hidden revision '2443a0e66469' was rewritten as: d716de383093 | |||||
| RANGE [3] | RANGE [3] | ||||
| $ hg writedirectaccess -r "28ad74:2443a0" | $ hg writedirectaccess -r "28ad74:2443a0" | ||||
| warning: accessing hidden changesets for write operation: 28ad74487de9, 2443a0e66469 | warning: accessing hidden changesets for write operation: 28ad74487de9, 2443a0e66469 | ||||
| hidden revision '28ad74487de9' was rewritten as: d716de383093 | |||||
| hidden revision '2443a0e66469' was rewritten as: d716de383093 | |||||
| RANGE [2, 3] | RANGE [2, 3] | ||||
| $ hg writedirectaccess -r "28ad74 + 2443a0" | $ hg writedirectaccess -r "28ad74 + 2443a0" | ||||
| abort: hidden revision '28ad74' was rewritten as: d716de383093! | abort: hidden revision '28ad74' was rewritten as: d716de383093! | ||||
| (use --hidden to access hidden revisions) | (use --hidden to access hidden revisions) | ||||
| [255] | [255] | ||||
| $ hg writedirectaccess -r "28ad74:d716de" | $ hg writedirectaccess -r "28ad74:d716de" | ||||
| warning: accessing hidden changesets for write operation: 28ad74487de9 | warning: accessing hidden changesets for write operation: 28ad74487de9 | ||||
| hidden revision '28ad74487de9' was rewritten as: d716de383093 | |||||
| RANGE [2, 3, 4] | RANGE [2, 3, 4] | ||||
| Setting a bookmark will make that changeset unhidden, so this should come in end | Setting a bookmark will make that changeset unhidden, so this should come in end | ||||
| $ hg bookmarks -r 28ad74 book | $ hg bookmarks -r 28ad74 book | ||||
| bookmarking hidden changeset 28ad74487de9 | bookmarking hidden changeset 28ad74487de9 | ||||
| (hidden revision '28ad74487de9' was rewritten as: d716de383093) | (hidden revision '28ad74487de9' was rewritten as: d716de383093) | ||||
| $ hg bookmarks | $ hg bookmarks | ||||
| book 2:28ad74487de9 | book 2:28ad74487de9 | ||||