Mercurial > hg > hg-git

changeset 1010:e810b2e186f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
githandler: replace ref with bookmark Mercurial users are using bookmarks to represent git refs, so when we are unable to push a git ref to remote, we need to tell the hg user to add a bookmark (something they understand), instead of mentioning a ref (which is a foreign concept to them).
author timeless@gmail.com
date Tue, 01 Nov 2016 22:20:03 +0000
parents 4fa1812d1f24
children dd5afdfef35d
files hggit/git_handler.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hggit/git_handler.py
+++ b/hggit/git_handler.py
@@ -1032,7 +1032,7 @@
                 for rev in (hex(r) for r in revs):
                     if rev not in all_exportable:
                         raise hgutil.Abort("revision %s cannot be pushed since"
-                                           " it doesn't have a ref" %
+                                           " it doesn't have a bookmark" %
                                            self.repo[rev])
                     exportable[rev] = all_exportable[rev]
             return self.get_changed_refs(refs, exportable, force)
@@ -1120,7 +1120,7 @@
             ctx = self.repo[rev]
             if not rev_refs:
                 raise hgutil.Abort("revision %s cannot be pushed since"
-                                   " it doesn't have a ref" % ctx)
+                                   " it doesn't have a bookmark" % ctx)
 
             # Check if the tags the server is advertising are annotated tags,
             # by attempting to retrieve it from the our git repo, and building