Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 32489:bce5ebe72859
bookmarks: warn about bookmark names that unambiguously resolve to a node (BC)
I just burned myself on this today because I left out the -r in my `hg
bookmark` command, which then left me confused because I didn't notice
the bookmark I created in the wrong place that was silently shadowing
the revision I was trying to check out. Let's warn the user.
This patch only enforces the check on bookmark names 4 characters long
or longer. We can tweak that if we'd like, I selected that since
that's the fewest characters shortest will use in the templater
output.
A previous version of this patch rejected such bookmarks. It was
proposed during review (and I agree) that the behavior change for a
bookmark named "cafe" or similar as history accumulated was a little
too weird, but that the warning definitely has merit.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 22 May 2017 19:18:12 -0400 |
| parents | 9fd9f91b0c43 |
| children | 579df5aaa425 |
comparison
equal
deleted
inserted
replaced
| 32488:548478efc46c | 32489:bce5ebe72859 |
|---|---|
| 966 "(use -f to force)") % mark) | 966 "(use -f to force)") % mark) |
| 967 if ((mark in repo.branchmap() or mark == repo.dirstate.branch()) | 967 if ((mark in repo.branchmap() or mark == repo.dirstate.branch()) |
| 968 and not force): | 968 and not force): |
| 969 raise error.Abort( | 969 raise error.Abort( |
| 970 _("a bookmark cannot have the name of an existing branch")) | 970 _("a bookmark cannot have the name of an existing branch")) |
| 971 if len(mark) > 3 and mark in repo and not force: | |
| 972 repo.ui.warn( | |
| 973 _("bookmark %s matches a changeset hash\n" | |
| 974 "(did you leave a -r out of an 'hg bookmark' command?)\n") % | |
| 975 mark) | |
| 971 | 976 |
| 972 if delete and rename: | 977 if delete and rename: |
| 973 raise error.Abort(_("--delete and --rename are incompatible")) | 978 raise error.Abort(_("--delete and --rename are incompatible")) |
| 974 if delete and rev: | 979 if delete and rev: |
| 975 raise error.Abort(_("--rev is incompatible with --delete")) | 980 raise error.Abort(_("--rev is incompatible with --delete")) |