Show More
@@ -454,6 +454,8 b' def bookmark(repo, subset, x):' | |||||
454 | kind, pattern, matcher = stringutil.stringmatcher(bm) |
|
454 | kind, pattern, matcher = stringutil.stringmatcher(bm) | |
455 | bms = set() |
|
455 | bms = set() | |
456 | if kind == 'literal': |
|
456 | if kind == 'literal': | |
|
457 | if bm == pattern: | |||
|
458 | pattern = repo._bookmarks.expandname(pattern) | |||
457 | bmrev = repo._bookmarks.get(pattern, None) |
|
459 | bmrev = repo._bookmarks.get(pattern, None) | |
458 | if not bmrev: |
|
460 | if not bmrev: | |
459 | raise error.RepoLookupError(_("bookmark '%s' does not exist") |
|
461 | raise error.RepoLookupError(_("bookmark '%s' does not exist") |
@@ -151,6 +151,34 b' bookmarks revset' | |||||
151 | summary: 0 |
|
151 | summary: 0 | |
152 |
|
152 | |||
153 |
|
153 | |||
|
154 | "." is expanded to the active bookmark: | |||
|
155 | ||||
|
156 | $ hg log -r 'bookmark(.)' | |||
|
157 | changeset: 1:925d80f479bb | |||
|
158 | bookmark: X2 | |||
|
159 | tag: tip | |||
|
160 | user: test | |||
|
161 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
162 | summary: 1 | |||
|
163 | ||||
|
164 | ||||
|
165 | but "literal:." is not since "." seems not a literal bookmark: | |||
|
166 | ||||
|
167 | $ hg log -r 'bookmark("literal:.")' | |||
|
168 | abort: bookmark '.' does not exist! | |||
|
169 | [255] | |||
|
170 | ||||
|
171 | "." should fail if there's no active bookmark: | |||
|
172 | ||||
|
173 | $ hg bookmark --inactive | |||
|
174 | $ hg log -r 'bookmark(.)' | |||
|
175 | abort: no active bookmark | |||
|
176 | [255] | |||
|
177 | BUG: this should be resolved to an empty set: | |||
|
178 | $ hg log -r 'present(bookmark(.))' | |||
|
179 | abort: no active bookmark | |||
|
180 | [255] | |||
|
181 | ||||
154 | $ hg log -r 'bookmark(unknown)' |
|
182 | $ hg log -r 'bookmark(unknown)' | |
155 | abort: bookmark 'unknown' does not exist! |
|
183 | abort: bookmark 'unknown' does not exist! | |
156 | [255] |
|
184 | [255] | |
@@ -166,6 +194,12 b' bookmarks revset' | |||||
166 | $ hg help revsets | grep 'bookmark(' |
|
194 | $ hg help revsets | grep 'bookmark(' | |
167 | "bookmark([name])" |
|
195 | "bookmark([name])" | |
168 |
|
196 | |||
|
197 | reactivate "X2" | |||
|
198 | ||||
|
199 | $ hg update X2 | |||
|
200 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
201 | (activating bookmark X2) | |||
|
202 | ||||
169 | bookmarks X and X2 moved to rev 1, Y at rev -1 |
|
203 | bookmarks X and X2 moved to rev 1, Y at rev -1 | |
170 |
|
204 | |||
171 | $ hg bookmarks |
|
205 | $ hg bookmarks |
General Comments 0
You need to be logged in to leave comments.
Login now