| 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/scmutil.py (10 lines) | |||
| M | tests/test-bookmarks.t (12 lines) | |||
| M | tests/test-branch-change.t (6 lines) | |||
| M | tests/test-branches.t (10 lines) | |||
| M | tests/test-tag.t (10 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| else: | else: | ||||
| return coarse_exit_code | return coarse_exit_code | ||||
| def checknewlabel(repo, lbl, kind): | def checknewlabel(repo, lbl, kind): | ||||
| # Do not use the "kind" parameter in ui output. | # Do not use the "kind" parameter in ui output. | ||||
| # It makes strings difficult to translate. | # It makes strings difficult to translate. | ||||
| if lbl in [b'tip', b'.', b'null']: | if lbl in [b'tip', b'.', b'null']: | ||||
| raise error.Abort(_(b"the name '%s' is reserved") % lbl) | raise error.InputError(_(b"the name '%s' is reserved") % lbl) | ||||
| for c in (b':', b'\0', b'\n', b'\r'): | for c in (b':', b'\0', b'\n', b'\r'): | ||||
| if c in lbl: | if c in lbl: | ||||
| raise error.Abort( | raise error.InputError( | ||||
| _(b"%r cannot be used in a name") % pycompat.bytestr(c) | _(b"%r cannot be used in a name") % pycompat.bytestr(c) | ||||
| ) | ) | ||||
| try: | try: | ||||
| int(lbl) | int(lbl) | ||||
| raise error.Abort(_(b"cannot use an integer as a name")) | raise error.InputError(_(b"cannot use an integer as a name")) | ||||
| except ValueError: | except ValueError: | ||||
| pass | pass | ||||
| if lbl.strip() != lbl: | if lbl.strip() != lbl: | ||||
| raise error.Abort(_(b"leading or trailing whitespace in name %r") % lbl) | raise error.InputError( | ||||
| _(b"leading or trailing whitespace in name %r") % lbl | |||||
| ) | |||||
| def checkfilename(f): | def checkfilename(f): | ||||
| '''Check that the filename f is an acceptable filename for a tracked file''' | '''Check that the filename f is an acceptable filename for a tracked file''' | ||||
| if b'\r' in f or b'\n' in f: | if b'\r' in f or b'\n' in f: | ||||
| raise error.InputError( | raise error.InputError( | ||||
| _(b"'\\n' and '\\r' disallowed in filenames: %r") | _(b"'\\n' and '\\r' disallowed in filenames: %r") | ||||
| % pycompat.bytestr(f) | % pycompat.bytestr(f) | ||||
| > ' | > ' | ||||
| abort: bookmark names cannot consist entirely of whitespace | abort: bookmark names cannot consist entirely of whitespace | ||||
| [255] | [255] | ||||
| 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 | ||||
| [255] | [10] | ||||
| $ hg bookmark . | $ hg bookmark . | ||||
| abort: the name '.' is reserved | abort: the name '.' is reserved | ||||
| [255] | [10] | ||||
| $ hg bookmark null | $ hg bookmark null | ||||
| abort: the name 'null' is reserved | abort: the name 'null' is reserved | ||||
| [255] | [10] | ||||
| bookmark with existing name | bookmark with existing name | ||||
| $ hg bookmark X2 | $ hg bookmark X2 | ||||
| abort: bookmark 'X2' already exists (use -f to force) | abort: bookmark 'X2' already exists (use -f to force) | ||||
| [255] | [255] | ||||
| $ hg bookmark -m Y default | $ hg bookmark -m Y default | ||||
| abort: a bookmark cannot have the name of an existing branch | abort: a bookmark cannot have the name of an existing branch | ||||
| [255] | [255] | ||||
| bookmark with integer name | bookmark with integer name | ||||
| $ hg bookmark 10 | $ hg bookmark 10 | ||||
| abort: cannot use an integer as a name | abort: cannot use an integer as a name | ||||
| [255] | [10] | ||||
| bookmark with a name that matches a node id | bookmark with a name that matches a node id | ||||
| $ hg bookmark 925d80f479bb db815d6d32e6 --config "$TESTHOOK" | $ hg bookmark 925d80f479bb db815d6d32e6 --config "$TESTHOOK" | ||||
| bookmark 925d80f479bb matches a changeset hash | bookmark 925d80f479bb matches a changeset hash | ||||
| (did you leave a -r out of an 'hg bookmark' command?) | (did you leave a -r out of an 'hg bookmark' command?) | ||||
| bookmark db815d6d32e6 matches a changeset hash | bookmark db815d6d32e6 matches a changeset hash | ||||
| (did you leave a -r out of an 'hg bookmark' command?) | (did you leave a -r out of an 'hg bookmark' command?) | ||||
| test-hook-bookmark: 925d80f479bb: -> db815d6d32e69058eadefc8cffbad37675707975 | test-hook-bookmark: 925d80f479bb: -> db815d6d32e69058eadefc8cffbad37675707975 | ||||
| $ 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] | [255] | ||||
| 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 | ||||
| [255] | [10] | ||||
| $ hg bookmark 'foo | $ hg bookmark 'foo | ||||
| > bar' | > bar' | ||||
| abort: '\n' cannot be used in a name | abort: '\n' cannot be used in a name | ||||
| [255] | [10] | ||||
| the bookmark extension should be ignored now that it is part of core | the bookmark extension should be ignored now that it is part of core | ||||
| $ echo "[extensions]" >> $HGRCPATH | $ echo "[extensions]" >> $HGRCPATH | ||||
| $ echo "bookmarks=" >> $HGRCPATH | $ echo "bookmarks=" >> $HGRCPATH | ||||
| $ hg bookmarks | $ hg bookmarks | ||||
| X2 1:925d80f479bb | X2 1:925d80f479bb | ||||
| Y 2:db815d6d32e6 | Y 2:db815d6d32e6 | ||||
| $ hg branch -r . | $ hg branch -r . | ||||
| abort: no branch name specified for the revisions | abort: no branch name specified for the revisions | ||||
| [10] | [10] | ||||
| Setting an invalid branch name | Setting an invalid branch name | ||||
| $ hg branch -r . a:b | $ hg branch -r . a:b | ||||
| abort: ':' cannot be used in a name | abort: ':' cannot be used in a name | ||||
| [255] | [10] | ||||
| $ hg branch -r . tip | $ hg branch -r . tip | ||||
| abort: the name 'tip' is reserved | abort: the name 'tip' is reserved | ||||
| [255] | [10] | ||||
| $ hg branch -r . 1234 | $ hg branch -r . 1234 | ||||
| abort: cannot use an integer as a name | abort: cannot use an integer as a name | ||||
| [255] | [10] | ||||
| Change on non-linear set of commits | Change on non-linear set of commits | ||||
| $ hg branch -r 2 -r 4 foo | $ hg branch -r 2 -r 4 foo | ||||
| abort: cannot change branch of non-linear revisions | abort: cannot change branch of non-linear revisions | ||||
| [10] | [10] | ||||
| Change in middle of the stack (linear commits) | Change in middle of the stack (linear commits) | ||||
| $ hg branch c | $ hg branch c | ||||
| marked working directory as branch c | marked working directory as branch c | ||||
| $ hg commit -d '5 0' -m "Adding c branch" | $ hg commit -d '5 0' -m "Adding c branch" | ||||
| reserved names | reserved names | ||||
| $ hg branch tip | $ hg branch tip | ||||
| abort: the name 'tip' is reserved | abort: the name 'tip' is reserved | ||||
| [255] | [10] | ||||
| $ hg branch null | $ hg branch null | ||||
| abort: the name 'null' is reserved | abort: the name 'null' is reserved | ||||
| [255] | [10] | ||||
| $ hg branch . | $ hg branch . | ||||
| abort: the name '.' is reserved | abort: the name '.' is reserved | ||||
| [255] | [10] | ||||
| invalid characters | invalid characters | ||||
| $ hg branch 'foo:bar' | $ hg branch 'foo:bar' | ||||
| abort: ':' cannot be used in a name | abort: ':' cannot be used in a name | ||||
| [255] | [10] | ||||
| $ hg branch 'foo | $ hg branch 'foo | ||||
| > bar' | > bar' | ||||
| abort: '\n' cannot be used in a name | abort: '\n' cannot be used in a name | ||||
| [255] | [10] | ||||
| trailing or leading spaces should be stripped before testing duplicates | trailing or leading spaces should be stripped before testing duplicates | ||||
| $ hg branch 'b ' | $ hg branch 'b ' | ||||
| abort: a branch of the same name already exists | abort: a branch of the same name already exists | ||||
| (use 'hg update' to switch to it) | (use 'hg update' to switch to it) | ||||
| [10] | [10] | ||||
| [255] | [255] | ||||
| $ hg revert .hgtags | $ hg revert .hgtags | ||||
| $ hg tag -r 0 x y z y y z | $ hg tag -r 0 x y z y y z | ||||
| abort: tag names must be unique | abort: tag names must be unique | ||||
| [10] | [10] | ||||
| $ hg tag tap nada dot tip | $ hg tag tap nada dot tip | ||||
| abort: the name 'tip' is reserved | abort: the name 'tip' is reserved | ||||
| [255] | [10] | ||||
| $ hg tag . | $ hg tag . | ||||
| abort: the name '.' is reserved | abort: the name '.' is reserved | ||||
| [255] | [10] | ||||
| $ hg tag null | $ hg tag null | ||||
| abort: the name 'null' is reserved | abort: the name 'null' is reserved | ||||
| [255] | [10] | ||||
| $ hg tag "bleah" | $ hg tag "bleah" | ||||
| abort: tag 'bleah' already exists (use -f to force) | abort: tag 'bleah' already exists (use -f to force) | ||||
| [10] | [10] | ||||
| $ hg tag "blecch" "bleah" | $ hg tag "blecch" "bleah" | ||||
| abort: tag 'bleah' already exists (use -f to force) | abort: tag 'bleah' already exists (use -f to force) | ||||
| [10] | [10] | ||||
| $ hg tag --remove "blecch" | $ hg tag --remove "blecch" | ||||
| acb14030fe0a21b60322c440ad2d20cf7685a376 foobar | acb14030fe0a21b60322c440ad2d20cf7685a376 foobar | ||||
| $ cat .hg/localtags | $ cat .hg/localtags | ||||
| d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1 | d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1 | ||||
| acb14030fe0a21b60322c440ad2d20cf7685a376 localblah | acb14030fe0a21b60322c440ad2d20cf7685a376 localblah | ||||
| $ hg tag -l 'xx | $ hg tag -l 'xx | ||||
| > newline' | > newline' | ||||
| abort: '\n' cannot be used in a name | abort: '\n' cannot be used in a name | ||||
| [255] | [10] | ||||
| $ hg tag -l 'xx:xx' | $ hg tag -l 'xx:xx' | ||||
| abort: ':' cannot be used in a name | abort: ':' cannot be used in a name | ||||
| [255] | [10] | ||||
| cloning local tags | cloning local tags | ||||
| $ cd .. | $ cd .. | ||||
| $ hg -R test log -r0:5 | $ hg -R test log -r0:5 | ||||
| changeset: 0:acb14030fe0a | changeset: 0:acb14030fe0a | ||||
| tag: bleah | tag: bleah | ||||
| tag: bleah bleah | tag: bleah bleah | ||||