diff --git a/mercurial/commands.py b/mercurial/commands.py index f4bed9b5785857a45ec34951e0302ad0908aa770_bWVyY3VyaWFsL2NvbW1hbmRzLnB5..aa0647830fd9a3816cb3948676c3258626023ee6_bWVyY3VyaWFsL2NvbW1hbmRzLnB5 100644 --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -833,7 +833,7 @@ raise util.Abort( _("a bookmark cannot have the name of an existing branch")) if rev: - marks[mark] = repo.lookup(rev) + marks[mark] = scmutil.revsingle(repo, rev).node() else: marks[mark] = cur if not inactive and cur == marks[mark]: diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt index f4bed9b5785857a45ec34951e0302ad0908aa770_bWVyY3VyaWFsL2hlbHAvY29uZmlnLnR4dA==..aa0647830fd9a3816cb3948676c3258626023ee6_bWVyY3VyaWFsL2hlbHAvY29uZmlnLnR4dA== 100644 --- a/mercurial/help/config.txt +++ b/mercurial/help/config.txt @@ -923,6 +923,17 @@ Optional. Directory or URL to use when pushing if no destination is specified. +Custom paths can be defined by assigning the path to a name that later can be +used from the command line. Example:: + + [paths] + my_path = http://example.com/path + +To push to the path defined in ``my_path`` run the command:: + + hg push my_path + + ``phases`` ---------- diff --git a/tests/test-bookmarks.t b/tests/test-bookmarks.t index f4bed9b5785857a45ec34951e0302ad0908aa770_dGVzdHMvdGVzdC1ib29rbWFya3MudA==..aa0647830fd9a3816cb3948676c3258626023ee6_dGVzdHMvdGVzdC1ib29rbWFya3MudA== 100644 --- a/tests/test-bookmarks.t +++ b/tests/test-bookmarks.t @@ -154,6 +154,19 @@ * Y 2:db815d6d32e6 Z 0:f7b1eb17ad24 +bookmarks from a revset + $ hg bookmark -r '.^1' REVSET + $ hg bookmark -r ':tip' TIP + $ hg bookmarks + REVSET 0:f7b1eb17ad24 + * TIP 2:db815d6d32e6 + X2 1:925d80f479bb + Y 2:db815d6d32e6 + Z 0:f7b1eb17ad24 + + $ hg bookmark -d REVSET + $ hg bookmark -d TIP + rename without new name $ hg bookmark -m Y