hgext3rd/__init__.py
author Pulkit Goyal <7895pulkit@gmail.com>
Sun, 03 Jun 2018 02:37:13 +0530
branchstable
changeset 3782 27cf636b2f4d
parent 2020 143c8e4dc22d
permissions -rw-r--r--
next: respect `commands.update.check` config option in `hg next` (issue5808) `commands.update.check` config option determines what level of checking should be done when we update to another revision. When we set this config option to `noconflict`, it updates your working directory to a specified revision only when there will be no conflicts which is a very nice behavior. This patch adds logic to respect the config option so that we can have that nice behavior with `hg next` too. It turns out, we just needed to use hg.updatetotally() and add some cases to check config option. Right now, we only respect the config if value is set to `noconflict`. Otherwise we fallback to the default behavior. This is a part of fixing issue5808. Test changes demonstrate the fix.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1806
9f42f819267b evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     1
# name space package to host third party extensions
1901
85390446f8c1 packaging: fix setup.py and install as hgext3rd.topic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     2
from __future__ import absolute_import
85390446f8c1 packaging: fix setup.py and install as hgext3rd.topic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     3
import pkgutil
85390446f8c1 packaging: fix setup.py and install as hgext3rd.topic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     4
__path__ = pkgutil.extend_path(__path__, __name__)