Suggest Mercurial bookmarks

[Peter Suter]

wikiautocomplete/web_ui.py

@@ -147 +147 @@
                                 rev = repos.short_rev(r[1])
                                 if str(rev).startswith(search_rev):
                                     completions.append('%s%s@%s' % (reponame, path, rev))
+
+                        if type(repos).__name__ == 'MercurialRepository':
+                            from mercurial.bookmarks import listbookmarks
+                            for rev in listbookmarks(repos.repo):
+                                if str(rev).startswith(search_rev):
+                                    completions.append('%s%s@%s' % (reponame, path, rev))
+
                     else:
                         dir, filename = path.rsplit('/', 1)
                         if dir == '':

[Jun Omae]

We could use repos.get_quickjump_entries() for branches, tags and bookmarks in Git and Mercurial.

wikiautocomplete/web_ui.py

@@ -163 +162 @@
                         path, search_rev = path.rsplit('@', 1)
                         node = repos.get_node(path, repos.youngest_rev)
                         if node.can_view(req.perm):
+                            for category, name_, path_, rev in repos.get_quickjump_entries(None):
+                                if path_ and path_ != '/':
+                                    # skip 'trunk', 'branches/...', 'tags/...'
+                                    continue
+                                if ' ' in name_:
+                                    # use first token, e.g. '1.0' from '1.0 (tip)'
+                                    name_ = name_.split(' ', 1)[0]
+                                if name_.startswith(search_rev):
+                                    completions.append('%s/%s@%s' % (reponame, path, name_))
                             for r in node.get_history(10):
                                 if str(r[1]).startswith(search_rev):
                                     completions.append('%s/%s@%s' % (reponame, path, r[1]))

Also, I use - character in repository name. In this case, completion doesn't work.

wikiautocomplete/htdocs/js/wikiautocomplete.js

@@ -63 +63 @@
         },
 
         { // Source
-            match: /\b(source:|log:)([\w/.]*(?:@\w*)?)$/,
+            match: /\b(source:|log:)([^@\s]*(?:@\S*)?)$/,
             search: function (term, callback) {
                 $.getJSON(wikiautocomplete_url + '/source', { q: term })
                     .done(function (resp) { callback(resp); })

[Peter Suter]

Also, I use - character in repository name. In this case, completion doesn't work.

Fixed in #12938, thanks!

[Peter Suter]

Replying to jun66j5:

We could use repos.get_quickjump_entries() for branches, tags and bookmarks in Git and Mercurial.

Sounds nice. The entry names are a bit fragile:

• Categories are translated in ​Mercurial (but not in ​Git or ​SVN).
• Mercurial tags are ​joined so name == "FirstTag, SecondTag". (If one revision has multiple tags.)

Also there can be a lot of unimportant entries (e.g. due to old tags). I think the current revision number is much more useful. So maybe only suggest the names if at least one character is given? (Not a great solution.)

[Peter Suter]

In 15956:

WikiAutoCompletePlugin: Suggest bookmarks etc.
Only if at least one character is already given, so by default the latest rev is shown first.
(see #12928)

[Peter Suter]

(Better ideas welcome.)

[Peter Suter]

Somehow not all Mercurial bookmarks are shown.

Maybe because of ​t:ticket:12177?