Mercurial > hg
view hgext/infinitepush/indexapi.py @ 42130:a362b0b95e42
pull: improved message issued in case of failed update
When running `hg pull --update`, the update step may fail. Nothing in the error
message help to understand the abort is related to the secondary step (update)
instead of the primary step (pull).
We now add some information to the error message to clarify it comes from the
update part. It is useful in various situation (uncommitted changes blocking the
update, update to hidden destination, etc...)
The pull output is updated from:
$ hg pull ../repo-Bob --rev 956063ac4557 --update
pulling from ../repo-Bob
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 0 changes to 2 files (+1 heads)
(2 other changesets obsolete on arrival)
abort: filtered revision '6'!
to:
$ hg pull ../repo-Bob --rev 956063ac4557 --update
pulling from ../repo-Bob
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 0 changes to 2 files (+1 heads)
(2 other changesets obsolete on arrival)
abort: cannot update to target: filtered revision '6'!
(I am not sure why the actual error, "filtered revision '6'", is not using the
more modern format mentioning the obsolescence fate of '6')
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 05 Apr 2019 14:35:33 +0200 |
parents | 03ff17a4bf53 |
children | 2372284d9457 |
line wrap: on
line source
# Infinite push # # Copyright 2016 Facebook, Inc. # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. from __future__ import absolute_import class indexapi(object): """Class that manages access to infinitepush index. This class is a context manager and all write operations (like deletebookmarks, addbookmark etc) should use `with` statement: with index: index.deletebookmarks(...) ... """ def __init__(self): """Initializes the metadata store connection.""" def close(self): """Cleans up the metadata store connection.""" def __enter__(self): return self def __exit__(self, exc_type, exc_val, exc_tb): pass def addbundle(self, bundleid, nodesctx): """Takes a bundleid and a list of node contexts for each node in that bundle and records that.""" raise NotImplementedError() def addbookmark(self, bookmark, node): """Takes a bookmark name and hash, and records mapping in the metadata store.""" raise NotImplementedError() def addmanybookmarks(self, bookmarks): """Takes a dict with mapping from bookmark to hash and records mapping in the metadata store.""" raise NotImplementedError() def deletebookmarks(self, patterns): """Accepts list of bookmarks and deletes them. """ raise NotImplementedError() def getbundle(self, node): """Returns the bundleid for the bundle that contains the given node.""" raise NotImplementedError() def getnode(self, bookmark): """Returns the node for the given bookmark. None if it doesn't exist.""" raise NotImplementedError() def getbookmarks(self, query): """Returns bookmarks that match the query""" raise NotImplementedError() def saveoptionaljsonmetadata(self, node, jsonmetadata): """Saves optional metadata for a given node""" raise NotImplementedError() class indexexception(Exception): pass