| mharbison72 |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/bookmarks.py (8 lines) | |||
| M | tests/test-bookmarks.t (14 lines) | |||
| M | tests/test-http-permissions.t (4 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| def checkformat(repo, mark): | def checkformat(repo, mark): | ||||
| """return a valid version of a potential bookmark name | """return a valid version of a potential bookmark name | ||||
| Raises an abort error if the bookmark name is not valid. | Raises an abort error if the bookmark name is not valid. | ||||
| """ | """ | ||||
| mark = mark.strip() | mark = mark.strip() | ||||
| if not mark: | if not mark: | ||||
| raise error.Abort( | raise error.InputError( | ||||
| _(b"bookmark names cannot consist entirely of whitespace") | _(b"bookmark names cannot consist entirely of whitespace") | ||||
| ) | ) | ||||
| scmutil.checknewlabel(repo, mark, b'bookmark') | scmutil.checknewlabel(repo, mark, b'bookmark') | ||||
| return mark | return mark | ||||
| def delete(repo, tr, names): | def delete(repo, tr, names): | ||||
| """remove a mark from the bookmark store | """remove a mark from the bookmark store | ||||
| Raises an abort error if mark does not exist. | Raises an abort error if mark does not exist. | ||||
| """ | """ | ||||
| marks = repo._bookmarks | marks = repo._bookmarks | ||||
| changes = [] | changes = [] | ||||
| for mark in names: | for mark in names: | ||||
| if mark not in marks: | if mark not in marks: | ||||
| raise error.Abort(_(b"bookmark '%s' does not exist") % mark) | raise error.InputError(_(b"bookmark '%s' does not exist") % mark) | ||||
| if mark == repo._activebookmark: | if mark == repo._activebookmark: | ||||
| deactivate(repo) | deactivate(repo) | ||||
| changes.append((mark, None)) | changes.append((mark, None)) | ||||
| marks.applychanges(repo, tr, changes) | marks.applychanges(repo, tr, changes) | ||||
| def rename(repo, tr, old, new, force=False, inactive=False): | def rename(repo, tr, old, new, force=False, inactive=False): | ||||
| """rename a bookmark from old to new | """rename a bookmark from old to new | ||||
| If force is specified, then the new name can overwrite an existing | If force is specified, then the new name can overwrite an existing | ||||
| bookmark. | bookmark. | ||||
| If inactive is specified, then do not activate the new bookmark. | If inactive is specified, then do not activate the new bookmark. | ||||
| Raises an abort error if old is not in the bookmark store. | Raises an abort error if old is not in the bookmark store. | ||||
| """ | """ | ||||
| marks = repo._bookmarks | marks = repo._bookmarks | ||||
| mark = checkformat(repo, new) | mark = checkformat(repo, new) | ||||
| if old not in marks: | if old not in marks: | ||||
| raise error.Abort(_(b"bookmark '%s' does not exist") % old) | raise error.InputError(_(b"bookmark '%s' does not exist") % old) | ||||
| changes = [] | changes = [] | ||||
| for bm in marks.checkconflict(mark, force): | for bm in marks.checkconflict(mark, force): | ||||
| changes.append((bm, None)) | changes.append((bm, None)) | ||||
| changes.extend([(mark, marks[old]), (old, None)]) | changes.extend([(mark, marks[old]), (old, None)]) | ||||
| marks.applychanges(repo, tr, changes) | marks.applychanges(repo, tr, changes) | ||||
| if repo._activebookmark == old and not inactive: | if repo._activebookmark == old and not inactive: | ||||
| activate(repo, mark) | activate(repo, mark) | ||||
| """print bookmarks by the given formatter | """print bookmarks by the given formatter | ||||
| Provides a way for extensions to control how bookmarks are printed. | Provides a way for extensions to control how bookmarks are printed. | ||||
| """ | """ | ||||
| marks = repo._bookmarks | marks = repo._bookmarks | ||||
| bmarks = {} | bmarks = {} | ||||
| for bmark in names or marks: | for bmark in names or marks: | ||||
| if bmark not in marks: | if bmark not in marks: | ||||
| raise error.Abort(_(b"bookmark '%s' does not exist") % bmark) | raise error.InputError(_(b"bookmark '%s' does not exist") % bmark) | ||||
| active = repo._activebookmark | active = repo._activebookmark | ||||
| if bmark == active: | if bmark == active: | ||||
| prefix, label = b'*', activebookmarklabel | prefix, label = b'*', activebookmarklabel | ||||
| else: | else: | ||||
| prefix, label = b' ', b'' | prefix, label = b' ', b'' | ||||
| bmarks[bmark] = (marks[bmark], prefix, label) | bmarks[bmark] = (marks[bmark], prefix, label) | ||||
| _printbookmarks(ui, repo, fm, bmarks) | _printbookmarks(ui, repo, fm, bmarks) | ||||
| def preparehookargs(name, old, new): | def preparehookargs(name, old, new): | ||||
| if new is None: | if new is None: | ||||
| new = b'' | new = b'' | ||||
| if old is None: | if old is None: | ||||
| old = b'' | old = b'' | ||||
| return {b'bookmark': name, b'node': hex(new), b'oldnode': hex(old)} | return {b'bookmark': name, b'node': hex(new), b'oldnode': hex(old)} | ||||
| Y -1:000000000000 | Y -1:000000000000 | ||||
| $ hg bookmarks -l X Y | $ hg bookmarks -l X Y | ||||
| X 0:f7b1eb17ad24 | X 0:f7b1eb17ad24 | ||||
| Y -1:000000000000 | Y -1:000000000000 | ||||
| $ hg bookmarks -l . | $ hg bookmarks -l . | ||||
| * X2 0:f7b1eb17ad24 | * X2 0:f7b1eb17ad24 | ||||
| $ hg bookmarks -l X A Y | $ hg bookmarks -l X A Y | ||||
| abort: bookmark 'A' does not exist | abort: bookmark 'A' does not exist | ||||
| [255] | [10] | ||||
| $ hg bookmarks -l -r0 | $ hg bookmarks -l -r0 | ||||
| abort: cannot specify both --list and --rev | abort: cannot specify both --list and --rev | ||||
| [10] | [10] | ||||
| $ hg bookmarks -l --inactive | $ hg bookmarks -l --inactive | ||||
| abort: cannot specify both --inactive and --list | abort: cannot specify both --inactive and --list | ||||
| [10] | [10] | ||||
| $ hg log -T '{bookmarks % "{rev} {bookmark}\n"}' | $ hg log -T '{bookmarks % "{rev} {bookmark}\n"}' | ||||
| X2 1:925d80f479bb | X2 1:925d80f479bb | ||||
| Y -1:000000000000 | Y -1:000000000000 | ||||
| Z 0:f7b1eb17ad24 | Z 0:f7b1eb17ad24 | ||||
| rename nonexistent bookmark | rename nonexistent bookmark | ||||
| $ hg bookmark -m A B | $ hg bookmark -m A B | ||||
| abort: bookmark 'A' does not exist | abort: bookmark 'A' does not exist | ||||
| [255] | [10] | ||||
| rename to existent bookmark | rename to existent bookmark | ||||
| $ hg bookmark -m X Y | $ hg bookmark -m X Y | ||||
| abort: bookmark 'Y' already exists (use -f to force) | abort: bookmark 'Y' already exists (use -f to force) | ||||
| [255] | [255] | ||||
| force rename to existent bookmark | force rename to existent bookmark | ||||
| $ hg bookmark -d | $ hg bookmark -d | ||||
| abort: bookmark name required | abort: bookmark name required | ||||
| [10] | [10] | ||||
| delete nonexistent bookmark | delete nonexistent bookmark | ||||
| $ hg bookmark -d A | $ hg bookmark -d A | ||||
| abort: bookmark 'A' does not exist | abort: bookmark 'A' does not exist | ||||
| [255] | [10] | ||||
| delete with --inactive | delete with --inactive | ||||
| $ hg bookmark -d --inactive Y | $ hg bookmark -d --inactive Y | ||||
| abort: cannot specify both --inactive and --delete | abort: cannot specify both --inactive and --delete | ||||
| [10] | [10] | ||||
| bookmark name with spaces should be stripped | bookmark name with spaces should be stripped | ||||
| summary: 2 | summary: 2 | ||||
| reject bookmark name with newline | reject bookmark name with newline | ||||
| $ hg bookmark ' | $ hg bookmark ' | ||||
| > ' | > ' | ||||
| abort: bookmark names cannot consist entirely of whitespace | abort: bookmark names cannot consist entirely of whitespace | ||||
| [255] | [10] | ||||
| $ hg bookmark -m Z ' | $ hg bookmark -m Z ' | ||||
| > ' | > ' | ||||
| abort: bookmark names cannot consist entirely of whitespace | abort: bookmark names cannot consist entirely of whitespace | ||||
| [255] | [10] | ||||
| bookmark with reserved name | bookmark with reserved name | ||||
| $ hg bookmark tip | $ hg bookmark tip | ||||
| abort: the name 'tip' is reserved | abort: the name 'tip' is reserved | ||||
| [10] | [10] | ||||
| $ hg bookmark . | $ hg bookmark . | ||||
| $ hg bookmark -r . | $ hg bookmark -r . | ||||
| abort: bookmark name required | abort: bookmark name required | ||||
| [10] | [10] | ||||
| bookmark name with whitespace only | bookmark name with whitespace only | ||||
| $ hg bookmark ' ' | $ hg bookmark ' ' | ||||
| abort: bookmark names cannot consist entirely of whitespace | abort: bookmark names cannot consist entirely of whitespace | ||||
| [255] | [10] | ||||
| $ hg bookmark -m Y ' ' | $ hg bookmark -m Y ' ' | ||||
| abort: bookmark names cannot consist entirely of whitespace | abort: bookmark names cannot consist entirely of whitespace | ||||
| [255] | [10] | ||||
| invalid bookmark | invalid bookmark | ||||
| $ hg bookmark 'foo:bar' | $ hg bookmark 'foo:bar' | ||||
| abort: ':' cannot be used in a name | abort: ':' cannot be used in a name | ||||
| [10] | [10] | ||||
| $ hg bookmark 'foo | $ hg bookmark 'foo | ||||
| 0 | 0 | ||||
| push requires POST request | push requires POST request | ||||
| [1] | [1] | ||||
| $ hg bookmarks | $ hg bookmarks | ||||
| no bookmarks set | no bookmarks set | ||||
| $ hg bookmark -d bm | $ hg bookmark -d bm | ||||
| abort: bookmark 'bm' does not exist | abort: bookmark 'bm' does not exist | ||||
| [255] | [10] | ||||
| $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=customwritenoperm' | $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=customwritenoperm' | ||||
| 405 push requires POST request | 405 push requires POST request | ||||
| 0 | 0 | ||||
| push requires POST request | push requires POST request | ||||
| [1] | [1] | ||||
| 0 | 0 | ||||
| push requires POST request | push requires POST request | ||||
| [1] | [1] | ||||
| $ hg bookmarks | $ hg bookmarks | ||||
| no bookmarks set | no bookmarks set | ||||
| $ hg bookmark -d bm | $ hg bookmark -d bm | ||||
| abort: bookmark 'bm' does not exist | abort: bookmark 'bm' does not exist | ||||
| [255] | [10] | ||||
| $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=customwritenoperm' | $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=customwritenoperm' | ||||
| 405 push requires POST request | 405 push requires POST request | ||||
| 0 | 0 | ||||
| push requires POST request | push requires POST request | ||||
| [1] | [1] | ||||